sbase

commit 3b3dffd24f9e84f6bf24d6903366fb588be7480d
parent 56a62c605f1db3076da06bc148a5bca152295209
Author: sin <sin@2f30.org>
Date:   Thu, 14 Nov 2013 10:41:38 +0000

_brk, _argc and _argv are reserved for the implementation

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_.

Diffstat:
M
arg.h
 | 
24
++++++++++++------------

1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/arg.h b/arg.h
@@ -13,21 +13,21 @@ extern char *argv0;
 					argv[0] && argv[0][1]\
 					&& argv[0][0] == '-';\
 					argc--, argv++) {\
-				char _argc;\
-				char **_argv;\
-				int _brk;\
+				char argc_;\
+				char **argv_;\
+				int brk_;\
 				if (argv[0][1] == '-' && argv[0][2] == '\0') {\
 					argv++;\
 					argc--;\
 					break;\
 				}\
-				for (_brk = 0, argv[0]++, _argv = argv;\
-						argv[0][0] && !_brk;\
+				for (brk_ = 0, argv[0]++, argv_ = argv;\
+						argv[0][0] && !brk_;\
 						argv[0]++) {\
-					if (_argv != argv)\
+					if (argv_ != argv)\
 						break;\
-					_argc = argv[0][0];\
-					switch (_argc)
+					argc_ = argv[0][0];\
+					switch (argc_)
 
 /* Handles obsolete -NUM syntax */
 #define ARGNUM				case '0':\
@@ -44,19 +44,19 @@ extern char *argv0;
 #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)?\
 				((x), abort(), (char *)0) :\
-				(_brk = 1, (argv[0][1] != '\0')?\
+				(brk_ = 1, (argv[0][1] != '\0')?\
 					(&argv[0][1]) :\
 					(argc--, argv++, argv[0])))
 
 #define ARGF()		((argv[0][1] == '\0' && argv[1] == NULL)?\
 				(char *)0 :\
-				(_brk = 1, (argv[0][1] != '\0')?\
+				(brk_ = 1, (argv[0][1] != '\0')?\
 					(&argv[0][1]) :\
 					(argc--, argv++, argv[0])))