Skip to content

Conversation

alejandro-colomar
Copy link
Collaborator

@alejandro-colomar alejandro-colomar commented Dec 3, 2024

I applied a similar patch in liba2i, where I've tested it.


Revisions:

v1b
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  c2c3495c = 1:  dc458930 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1c
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  dc458930 = 1:  b07b5b62 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1d
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  b07b5b62 = 1:  3f55095a lib/atoi/a2i/: Simplify these macros by calling a2i()
v1e
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  3f55095a = 1:  4048fbc4 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1f
  • Rebase
$ git range-diff alx/master..gh/a2i master..a2i 
1:  4048fbc4 = 1:  5b614be3 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1g
  • Rebase
$ git range-diff alx/master..gh/a2i master..a2i 
1:  5b614be3 = 1:  b44b6226 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1h
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  9988f60e = 1:  25bd5172 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1i
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  25bd5172 = 1:  3b4072a8 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1j
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  3b4072a8 = 1:  78703afb lib/atoi/a2i/: Simplify these macros by calling a2i()
v1k
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  78703afb = 1:  6e2f27b3 lib/atoi/a2i/: Simplify these macros by calling a2i()
v1l
  • Rebase
$ git range-diff master..gh/a2i shadow/master..a2i 
1:  6e2f27b3 = 1:  362b148a lib/atoi/a2i/: Simplify these macros by calling a2i()
v2
  • Simplify more APIs.
$ git range-diff shadow/master gh/a2i a2i 
1:  362b148a = 1:  362b148a lib/atoi/a2i/: Simplify these macros by calling a2i()
-:  -------- > 2:  cd03e049 lib/atoi/str2i/, *: Simplify implementations
v2b
  • Rebase
$ git range-diff db/master..gh/a2i shadow/master..a2i 
1:  362b148a = 1:  f7cee1c6 lib/atoi/a2i/: Simplify these macros by calling a2i()
2:  cd03e049 = 2:  790bc8c6 lib/atoi/str2i/, *: Simplify implementations
v2c
  • Rebase
$ git rd
1:  f7cee1c6 = 1:  3d53eae5 lib/atoi/a2i/: Simplify these macros by calling a2i()
2:  790bc8c6 = 2:  1e28a504 lib/atoi/str2i/, *: Simplify implementations
v2d
  • Rebase
$ git rd
1:  3d53eae5 = 1:  d5f04f5e lib/atoi/a2i/: Simplify these macros by calling a2i()
2:  1e28a504 ! 2:  2b12ad43 lib/atoi/str2i/, *: Simplify implementations
    @@ lib/limits.c
     +#include "atoi/str2i.h"
      #include "string/memset/memzero.h"
      #include "string/strcmp/streq.h"
    - #include "string/strspn/stpspn.h"
    + #include "string/strcmp/strprefix.h"
     
      ## lib/sgetspent.c ##
     @@
    @@ src/check_subid_range.c
     -#include "atoi/str2i/str2u.h"
     +#include "atoi/str2i.h"
      #include "defines.h"
    + #include "idmapping.h"
      #include "prototypes.h"
    - #include "subordinateio.h"
     
      ## src/chgpasswd.c ##
     @@
v2e
  • Rebase
$ git rd
1:  d5f04f5e = 1:  37aa0212 lib/atoi/a2i/: Simplify these macros by calling a2i()
2:  2b12ad43 ! 2:  a33dbdb8 lib/atoi/str2i/, *: Simplify implementations
    @@ lib/sgetspent.c
      #include "prototypes.h"
      #include "shadowlog_internal.h"
     
    - ## lib/shadow.c ##
    -@@
    - #include <sys/types.h>
    - 
    - #include "atoi/a2i/a2s.h"
    --#include "atoi/str2i/str2u.h"
    -+#include "atoi/str2i.h"
    - #include "defines.h"
    - #include "prototypes.h"
    - #include "string/strcmp/streq.h"
    -
      ## lib/strtoday.c ##
     @@
      

@alejandro-colomar
Copy link
Collaborator Author

Queued after the release of 4.17.0.

I applied a similar patch in liba2i, where I've tested it.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
@alejandro-colomar
Copy link
Collaborator Author

@hallyn Thanks for merging the other PRs. I've rebased the remaining ones (including this one) to fix the merge conflicts.

@hallyn hallyn merged commit 4fed009 into shadow-maint:master May 30, 2025
10 checks passed
@alejandro-colomar alejandro-colomar deleted the a2i branch May 30, 2025 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Simpler A good issue for a new beginner
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants