maint: prefer enums over macros for sources used for multiple programs

* src/chown.h (enum chown_modes): New type.
(CHOWN_CHOWN, CHOWN_CHGRP): Define as an enum instead of a macro.
* src/chown-chgrp.c (chown_mode): Use "enum chown_modes" instead of
"int".
* src/chown-chown.c (chown_mode): Likewise.
* src/ls.h (enum ls_modes): New type.
(LS_LS, LS_MULTI_COL, LS_LONG_FORMAT): Define as an enum instead of a
macro.
* src/ls-dir.c (ls_mode): Use "enum ls_modes" instead of "int".
* src/ls-ls.c (ls_mode): Likewise.
* src/ls-vdir.c (ls_mode): Likewise.
* src/uname.h (enum uname_modes): New type.
(UNAME_UNAME, UNAME_ARCH): Define as an enum instead of a macro.
* src/uname-arch.c (uname_mode): Use "enum uname_modes" instead of
"int".
* src/uname-uname.c (uname_mode): Likewise.

diff --git a/src/chown-chgrp.c b/src/chown-chgrp.c
index aa0b180074d5bb6209c6e6e13fe42d407b6142e5..fb076d136f3b9a56a19a266a7cd030d1581dbab5 100644 (file)
--- a/src/chown-chgrp.c
+++ b/src/chown-chgrp.c
@@ -1,2 +1,2 @@
 #include "chown.h"
-int chown_mode = CHOWN_CHGRP;
+enum chown_modes chown_mode = CHOWN_CHGRP;

diff --git a/src/chown-chown.c b/src/chown-chown.c
index 9531fa260349eaf151223772d9235519b113d16e..b11873a4b7cfee7f4e07ecf4cf7eeb610e43f560 100644 (file)
--- a/src/chown-chown.c
+++ b/src/chown-chown.c
@@ -1,2 +1,2 @@
 #include "chown.h"
-int chown_mode = CHOWN_CHOWN;
+enum chown_modes chown_mode = CHOWN_CHOWN;

diff --git a/src/chown.h b/src/chown.h
index 21f01c405455c4932bf685b8b56d0ae360e0e45d..0f87a8832f3c9853c9c1779d9fc24ac155d9df11 100644 (file)
--- a/src/chown.h
+++ b/src/chown.h
@@ -1,7 +1,10 @@
-/* This is for the 'chown' program. */
-#define CHOWN_CHOWN 1
+enum chown_modes
+{
+  /* This is for the 'chown' program.  */
+  CHOWN_CHOWN,
 
-/* This is for the 'chgrp' program.  */
-#define CHOWN_CHGRP 2
+  /* This is for the 'chgrp' program.  */
+  CHOWN_CHGRP,
+};
 
-extern int chown_mode;
+extern enum chown_modes chown_mode;

diff --git a/src/ls-dir.c b/src/ls-dir.c
index 85fe242ebfde4b16b37ac03e8c002e3055a34e08..18420d23a9db7fa1d8ff8b8dcbf88214ac399861 100644 (file)
--- a/src/ls-dir.c
+++ b/src/ls-dir.c
@@ -1,2 +1,2 @@
 #include "ls.h"
-int ls_mode = LS_MULTI_COL;
+enum ls_modes ls_mode = LS_MULTI_COL;

diff --git a/src/ls-ls.c b/src/ls-ls.c
index f33fbbc0618256b3d5a4b121ff9742aac1b05443..00e5f7ee5f56a468723b8788397f288321c503aa 100644 (file)
--- a/src/ls-ls.c
+++ b/src/ls-ls.c
@@ -1,2 +1,2 @@
 #include "ls.h"
-int ls_mode = LS_LS;
+enum ls_modes ls_mode = LS_LS;

diff --git a/src/ls-vdir.c b/src/ls-vdir.c
index 36ebf913bcf0293fd85003882e504f0ad4c3eaec..24c890fbb33fe07034dd0a5bcf18099947eb3bab 100644 (file)
--- a/src/ls-vdir.c
+++ b/src/ls-vdir.c
@@ -1,2 +1,2 @@
 #include "ls.h"
-int ls_mode = LS_LONG_FORMAT;
+enum ls_modes ls_mode = LS_LONG_FORMAT;

diff --git a/src/ls.h b/src/ls.h
index b35821197308b44705df592549be305190a026c9..23ddb9f5e9f72f5c8c570cd6dc60ec7ec1c3eb4c 100644 (file)
--- a/src/ls.h
+++ b/src/ls.h
@@ -1,10 +1,13 @@
-/* This is for the 'ls' program.  */
-#define LS_LS 1
+enum ls_modes
+{
+  /* This is for the 'ls' program.  */
+  LS_LS,
 
-/* This is for the 'dir' program.  */
-#define LS_MULTI_COL 2
+  /* This is for the 'dir' program.  */
+  LS_MULTI_COL,
 
-/* This is for the 'vdir' program.  */
-#define LS_LONG_FORMAT 3
+  /* This is for the 'vdir' program.  */
+  LS_LONG_FORMAT
+};
 
-extern int ls_mode;
+extern enum ls_modes ls_mode;

diff --git a/src/uname-arch.c b/src/uname-arch.c
index eb429424e71876e786e8551997d63240330f1cf3..c93a0e65e68ee6896af85589c45826c0421f28d1 100644 (file)
--- a/src/uname-arch.c
+++ b/src/uname-arch.c
@@ -1,2 +1,2 @@
 #include "uname.h"
-int uname_mode = UNAME_ARCH;
+enum uname_modes uname_mode = UNAME_ARCH;

diff --git a/src/uname-uname.c b/src/uname-uname.c
index 450245dcc2088f29f4bd42fa1abaa4ecbca38094..f4e0d39ff06dc23a8fcc1a77d996db2d5c59f941 100644 (file)
--- a/src/uname-uname.c
+++ b/src/uname-uname.c
@@ -1,2 +1,2 @@
 #include "uname.h"
-int uname_mode = UNAME_UNAME;
+enum uname_modes uname_mode = UNAME_UNAME;

diff --git a/src/uname.h b/src/uname.h
index f4da9b0c31d97a89f210bc14c3d7bfea124f56a6..428d8f510e4ee4aef9170c2e9ef2a87e14ce8b07 100644 (file)
--- a/src/uname.h
+++ b/src/uname.h
@@ -1,7 +1,10 @@
-/* This is for the 'uname' program. */
-#define UNAME_UNAME 1
+enum uname_modes
+{
+  /* This is for the 'uname' program.  */
+  UNAME_UNAME,
 
-/* This is for the 'arch' program.  */
-#define UNAME_ARCH 2
+  /* This is for the 'arch' program.  */
+  UNAME_ARCH
+};
 
-extern int uname_mode;
+extern enum uname_modes uname_mode;