suckless/sbase
1
0
Fork 0
mirror of git://git.suckless.org/sbase synced 2024-12-23 15:34:38 +00:00
Code Issues Projects Releases Wiki Activity

_brk, _argc and _argv are reserved for the implementation

Browse Source 
Thanks to nsz@port70.net for reporting this, the mail excerpt below.

"actually __.* and _[A-Z].* are reserved for any usage and _.* is
reserved for file scope identifiers"

We just rename them to brk_, argc_ and argv_.
This commit is contained in:
sin 2013-11-14 10:41:38 +00:00
parent 56a62c605f
commit 3b3dffd24f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arg.h
View File

@ -13,21 +13,21 @@ extern char *argv0;
argv[0] && argv[0][1]\ argv[0] && argv[0][1]\
&& argv[0][0] == '-';\ && argv[0][0] == '-';\
argc--, argv++) {\ argc--, argv++) {\
char _argc;\ char argc_;\
char **_argv;\ char **argv_;\
int _brk;\ int brk_;\
if (argv[0][1] == '-' && argv[0][2] == '\0') {\ if (argv[0][1] == '-' && argv[0][2] == '\0') {\
argv++;\ argv++;\
argc--;\ argc--;\
break;\ break;\
}\ }\
for (_brk = 0, argv[0]++, _argv = argv;\ for (brk_ = 0, argv[0]++, argv_ = argv;\
argv[0][0] && !_brk;\ argv[0][0] && !brk_;\
argv[0]++) {\ argv[0]++) {\
if (_argv != argv)\ if (argv_ != argv)\
break;\ break;\
_argc = argv[0][0];\ argc_ = argv[0][0];\
switch (_argc) switch (argc_)
/* Handles obsolete -NUM syntax */ /* Handles obsolete -NUM syntax */
#define ARGNUM case '0':\ #define ARGNUM case '0':\
@ -44,19 +44,19 @@ extern char *argv0;
#define ARGEND }\ #define ARGEND }\
} }
#define ARGC() _argc #define ARGC() argc_
#define ARGNUMF(base) (_brk = 1, estrtol(argv[0], (base))) #define ARGNUMF(base) (brk_ = 1, estrtol(argv[0], (base)))
#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\ #define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
((x), abort(), (char *)0) :\ ((x), abort(), (char *)0) :\
(_brk = 1, (argv[0][1] != '\0')?\ (brk_ = 1, (argv[0][1] != '\0')?\
(&argv[0][1]) :\ (&argv[0][1]) :\
(argc--, argv++, argv[0]))) (argc--, argv++, argv[0])))
#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\ #define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\
(char *)0 :\ (char *)0 :\
(_brk = 1, (argv[0][1] != '\0')?\ (brk_ = 1, (argv[0][1] != '\0')?\
(&argv[0][1]) :\ (&argv[0][1]) :\
(argc--, argv++, argv[0]))) (argc--, argv++, argv[0])))