From 972130f22f19b133f3bb0b95c2cc935618e7b341 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 9 Dec 2020 16:34:00 +0100
Subject: [PATCH] Code cleanup

---
 src/chmod.c  |  2 ++
 src/chown.c  |  2 ++
 src/cp.c     |  2 ++
 src/df.c     |  4 +++-
 src/du.c     |  4 +++-
 src/file.c   |  4 +++-
 src/find.c   |  5 ++++-
 src/locale.c | 10 +++++++++-
 src/ls.c     |  7 ++++---
 src/mv.c     | 30 ++++++++++++++++++------------
 src/rm.c     | 25 +++++++++++++++++--------
 src/uniq.c   | 26 ++++++++++++++++++--------
 12 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/src/chmod.c b/src/chmod.c
index 51bb18a..c0f6566 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -32,11 +32,13 @@
 #endif
 
 
+/* chmod */
 /* types */
 typedef unsigned int Prefs;
 #define CHMOD_PREFS_R 1
 
 
+/* functions */
 /* chmod */
 static int _chmod_error(char const * message, int ret);
 static int _chmod_do(mode_t mode, char * file);
diff --git a/src/chown.c b/src/chown.c
index c01ae30..77f3df2 100644
--- a/src/chown.c
+++ b/src/chown.c
@@ -33,6 +33,7 @@
 #endif
 
 
+/* chown */
 /* types */
 typedef unsigned int Prefs;
 #define CHOWN_PREFS_h 0x1
@@ -42,6 +43,7 @@ typedef unsigned int Prefs;
 #define CHOWN_PREFS_P 0xc
 
 
+/* functions */
 /* chown */
 static int _chown_error(char * message, int ret);
 static int _chown_owner(char * owner, uid_t * uid, gid_t * gid);
diff --git a/src/cp.c b/src/cp.c
index 4ed4294..4949dc9 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -34,6 +34,7 @@
 #endif
 
 
+/* cp */
 /* types */
 typedef unsigned int Prefs;
 #define CP_PREFS_f 0x01
@@ -45,6 +46,7 @@ typedef unsigned int Prefs;
 #define CP_PREFS_P 0x40
 
 
+/* functions */
 /* cp */
 static int _cp_error(char const * message, int ret);
 static int _cp_single(Prefs * prefs, char const * src, char const * dst);
diff --git a/src/df.c b/src/df.c
index caa582f..51d29e1 100644
--- a/src/df.c
+++ b/src/df.c
@@ -29,12 +29,14 @@
 #endif
 
 
-/* Prefs */
+/* df */
+/* types */
 typedef unsigned int Prefs;
 #define DF_PREFS_k 1
 #define DF_PREFS_P 2
 
 
+/* functions */
 /* df */
 static int _df_error(char const * message, int ret);
 static int _df_mtab(Prefs * prefs);
diff --git a/src/du.c b/src/du.c
index c300c70..9b084d5 100644
--- a/src/du.c
+++ b/src/du.c
@@ -29,7 +29,8 @@
 #endif
 
 
-/* Prefs */
+/* du */
+/* types */
 typedef unsigned int Prefs;
 #define DU_PREFS_a 0x01
 #define DU_PREFS_s 0x02 
@@ -39,6 +40,7 @@ typedef unsigned int Prefs;
 #define DU_PREFS_L 0x30
 
 
+/* functions */
 /* du */
 static int _du_do(Prefs * prefs, char const * filename);
 
diff --git a/src/file.c b/src/file.c
index e4d1dc1..30ea4fc 100644
--- a/src/file.c
+++ b/src/file.c
@@ -26,7 +26,8 @@
 #endif
 
 
-/* prefs */
+/* file */
+/* types */
 typedef unsigned int Prefs;
 #define FILE_PREFS_h	1
 #define FILE_PREFS_m	2
@@ -35,6 +36,7 @@ typedef unsigned int Prefs;
 #define FILE_PREFS_i	8
 
 
+/* functions */
 /* file */
 static int _file_do(Prefs * p, char const * filename);
 static int _file(Prefs * p, int argc, char * argv[])
diff --git a/src/find.c b/src/find.c
index f837b36..7f8475b 100644
--- a/src/find.c
+++ b/src/find.c
@@ -35,12 +35,12 @@
 #endif
 
 
+/* find */
 /* types */
 typedef unsigned int Prefs;
 #define FIND_PREFS_H 1
 #define FIND_PREFS_L 2
 
-
 typedef enum _FindCmd
 {
 	FC_INVALID = -1,
@@ -66,6 +66,9 @@ typedef enum _FindCmd
 } FindCmd;
 #define FC_LAST FC_DEPTH
 
+
+/* functions */
+/* find */
 static int _find_error(char const * message, int ret);
 static int _find_error_user(char const * message, char const * error, int ret);
 static int _find_do(Prefs * prefs, char const * pathname, int cmdc,
diff --git a/src/locale.c b/src/locale.c
index 52aba29..90bcbb9 100644
--- a/src/locale.c
+++ b/src/locale.c
@@ -25,7 +25,8 @@
 #endif
 
 
-/* prefs */
+/* locale */
+/* types */
 typedef unsigned int Prefs;
 #define LOCALE_PREFS_a 0x1
 #define LOCALE_PREFS_m 0x2
@@ -33,6 +34,13 @@ typedef unsigned int Prefs;
 #define LOCALE_PREFS_k 0x8
 
 
+/* prototypes */
+static int _locale(Prefs * p, int argc, char * argv[]);
+
+static int _usage(void);
+
+
+/* functions */
 /* locale */
 static int _locale_locales(void);
 static int _locale_charsets(void);
diff --git a/src/ls.c b/src/ls.c
index d726ff1..374feb1 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -34,10 +34,11 @@
 #endif
 
 /* macros */
-#define max(a, b) ((a) > (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
 
 
-/* Prefs */
+/* ls */
+/* types */
 typedef unsigned int Prefs;
 #define LS_PREFS_C 00001
 #define LS_PREFS_F 00002
@@ -416,7 +417,7 @@ static int _ls_do_files_short(Prefs * prefs, char const * directory,
 		for(cur = *files; cur != NULL; slist_next(&cur))
 		{
 			lencur = strlen(slist_data(&cur));
-			lenmax = max(lenmax, lencur);
+			lenmax = MAX(lenmax, lencur);
 		}
 		if(*prefs & LS_PREFS_F)
 			lenmax++;
diff --git a/src/mv.c b/src/mv.c
index 7bbcea4..5ebcef1 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -33,17 +33,22 @@
 #endif
 
 
+/* mv */
 /* types */
 typedef unsigned int Prefs;
 #define MV_PREFS_f 0x1
 #define MV_PREFS_i 0x2
 
 
-/* mv */
+/* prototypes */
 static int _mv_error(char const * message, int ret);
+
 static int _mv_single(Prefs * prefs, char const * src, char const * dst);
 static int _mv_multiple(Prefs * prefs, int filec, char * const filev[]);
 
+
+/* functions */
+/* mv */
 static int _mv(Prefs * prefs, int filec, char * filev[])
 {
 	struct stat st;
@@ -68,13 +73,6 @@ static int _mv(Prefs * prefs, int filec, char * filev[])
 	return _mv_single(prefs, filev[0], filev[1]);
 }
 
-static int _mv_error(char const * message, int ret)
-{
-	fputs(PROGNAME ": ", stderr);
-	perror(message);
-	return ret;
-}
-
 static int _mv_confirm(char const * message)
 {
 	int c;
@@ -87,9 +85,21 @@ static int _mv_confirm(char const * message)
 	return c == 'y';
 }
 
+
+/* mv_error */
+static int _mv_error(char const * message, int ret)
+{
+	fputs(PROGNAME ": ", stderr);
+	perror(message);
+	return ret;
+}
+
+
 /* mv_single */
 static int _mv_single_dir(Prefs * prefs, char const * src, char const * dst,
 		mode_t mode);
+static int _mv_single_recurse(Prefs * prefs, char const * src, char const * dst,
+		mode_t mode);
 static int _mv_single_fifo(char const * src, char const * dst, mode_t mode);
 static int _mv_single_nod(char const * src, char const * dst, mode_t mode,
 		dev_t rdev);
@@ -136,10 +146,6 @@ static int _mv_single(Prefs * prefs, char const * src, char const * dst)
 	return 0;
 }
 
-/* _mv_single_dir */
-static int _mv_single_recurse(Prefs * prefs, char const * src, char const * dst,
-		mode_t mode);
-
 static int _mv_single_dir(Prefs * prefs, char const * src, char const * dst,
 		mode_t mode)
 {
diff --git a/src/rm.c b/src/rm.c
index 35bc077..866bf82 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -30,6 +30,7 @@
 #endif
 
 
+/* rm */
 /* types */
 typedef unsigned int Prefs;
 #define RM_PREFS_f 0x1
@@ -37,10 +38,16 @@ typedef unsigned int Prefs;
 #define RM_PREFS_R 0x4
 
 
-/* rm */
+/* prototypes */
+static int _rm(Prefs * prefs, int argc, char * argv[]);
+
 static int _rm_error(char const * message, int ret);
 
+
+/* functions */
+/* rm */
 static int _rm_do(Prefs * prefs, char * file);
+
 static int _rm(Prefs * prefs, int argc, char * argv[])
 {
 	int ret = 0;
@@ -51,13 +58,6 @@ static int _rm(Prefs * prefs, int argc, char * argv[])
 	return ret;
 }
 
-static int _rm_error(char const * message, int ret)
-{
-	fputs(PROGNAME ": ", stderr);
-	perror(message);
-	return ret;
-}
-
 static int _rm_confirm(char const * message, char const * type)
 {
 	int c;
@@ -140,6 +140,15 @@ static int _rm_do_recursive(Prefs * prefs, char * filename)
 }
 
 
+/* rm_error */
+static int _rm_error(char const * message, int ret)
+{
+	fputs(PROGNAME ": ", stderr);
+	perror(message);
+	return ret;
+}
+
+
 /* usage */
 static int _usage(void)
 {
diff --git a/src/uniq.c b/src/uniq.c
index e2054e5..7fdcbae 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -26,6 +26,7 @@
 #endif
 
 
+/* uniq */
 /* types */
 typedef unsigned int Prefs;
 #define UNIQ_PREFS_c 1
@@ -33,12 +34,19 @@ typedef unsigned int Prefs;
 #define UNIQ_PREFS_u 4
 
 
+/* prototypes */
+static int _uniq(Prefs prefs, char const * fields, unsigned int skip,
+		char const * in, char const * out);
+
+static int _uniq_error(char const * message, int ret);
+
+
+/* functions */
 /* uniq */
 /* PRE	if in == NULL then out == NULL too
  * POST
  * 	0	success
  * 	else	error(s) occured */
-static int _uniq_error(char const * message, int ret);
 static int _uniq_do(Prefs prefs, char const * fields, unsigned int skip,
 		FILE * infp, FILE * outfp);
 
@@ -67,13 +75,6 @@ static int _uniq(Prefs prefs, char const * fields, unsigned int skip,
 	return ret;
 }
 
-static int _uniq_error(char const * message, int ret)
-{
-	fputs(PROGNAME ": ", stderr);
-	perror(message);
-	return ret;
-}
-
 static void _do_count(Prefs prefs, unsigned int skip, char * line, FILE * fp);
 static int _uniq_do(Prefs prefs, char const * fields, unsigned int skip,
 		FILE * infp, FILE * outfp)
@@ -162,6 +163,15 @@ static int _count_repeated(char * lastline, char * line, unsigned int skip)
 }
 
 
+/* uniq_error */
+static int _uniq_error(char const * message, int ret)
+{
+	fputs(PROGNAME ": ", stderr);
+	perror(message);
+	return ret;
+}
+
+
 /* usage */
 static int _usage(void)
 {