Refactoring / code cleanup.

See:

* https://en.wikipedia.org/wiki/Code_refactoring

* https://www.refactoring.com/

* https://www.joelonsoftware.com/2002/01/23/rub-a-dub-dub/

Some small optimisations may have slipped in as well.

diff --git a/fortune-mod/fortune/fortune.c b/fortune-mod/fortune/fortune.c
index 15525760e2b116b49c9cddc1cec059dfee9f978f..28328f318f6a017cba095279229e57e887a9ff16 100644 (file)
--- a/fortune-mod/fortune/fortune.c
+++ b/fortune-mod/fortune/fortune.c
@@ -215,7 +215,7 @@ static RECODE_REQUEST request;
 static RECODE_OUTER outer;
 #endif
 
-int add_dir(register FILEDESC *);
+int add_dir(FILEDESC *);
 
 static unsigned long my_random(unsigned long base)
 {
@@ -298,7 +298,7 @@ static void calc_equal_probs(void)
  * print_list:
  *      Print out the actual list, recursively.
  */
-static void print_list(register FILEDESC *list, int lev)
+static void print_list(FILEDESC *list, int lev)
 {
     while (list != NULL)
     {
@@ -331,11 +331,11 @@ static void print_list(register FILEDESC *list, int lev)
  * conv_pat:
  *      Convert the pattern to an ignore-case equivalent.
  */
-static char *conv_pat(register char *orig)
+static char *conv_pat(char *orig)
 {
-    register char *sp;
-    register unsigned int cnt;
-    register char *new;
+    char *sp;
+    unsigned int cnt;
+    char *new;
 
     cnt = 1; /* allow for '\0' */
     for (sp = orig; *sp != '\0'; sp++)
@@ -422,7 +422,7 @@ static char *copy(char *str, unsigned int len)
  */
 static FILEDESC *new_fp(void)
 {
-    register FILEDESC *fp;
+    FILEDESC *fp;
 
     fp = (FILEDESC *)do_malloc(sizeof *fp);
     fp->datfd = -1;
@@ -470,7 +470,7 @@ static inline void debugprint(const char *msg, ...)
  */
 static int is_dir(const char *const file)
 {
-    auto struct stat sbuf;
+    struct stat sbuf;
 
     if (stat(file, &sbuf) < 0)
     {
@@ -512,9 +512,9 @@ static int is_existant(char *file)
  */
 static int is_fortfile(char *file, char **datp)
 {
-    register int i;
-    register char *sp;
-    register char *datfile;
+    int i;
+    char *sp;
+    char *datfile;
     static const char *suflist[] = {/* list of "illegal" suffixes" */
         "dat", "pos", "c", "h", "p", "i", "f", "pas", "ftn", "ins.c", "ins,pas",
         "ins.ftn", "sml", NULL};
@@ -575,15 +575,15 @@ static bool path_is_absolute(const char *const path)
  * add_file:
  *      Add a file to the file list.
  */
-static int add_file(int percent, register const char *file, const char *dir,
+static int add_file(int percent, const char *file, const char *dir,
     FILEDESC **head, FILEDESC **tail, FILEDESC *parent)
 {
-    register FILEDESC *fp;
-    register int fd = -1;
-    register char *path, *testpath;
-    register bool was_malloc;
-    auto char *sp;
-    auto bool found;
+    FILEDESC *fp;
+    int fd = -1;
+    char *path, *testpath;
+    bool was_malloc;
+    char *sp;
+    bool found;
     struct stat statbuf;
 
     if (dir == NULL)
@@ -1320,7 +1320,7 @@ static void zero_tbl(STRFILE *tp)
  * sum_tbl:
  *      Merge the tbl data of t2 into t1.
  */
-static void sum_tbl(register STRFILE *t1, register STRFILE *t2)
+static void sum_tbl(STRFILE *t1, STRFILE *t2)
 {
     t1->str_numstr += t2->str_numstr;
     if (t1->str_longlen < t2->str_longlen)

diff --git a/fortune-mod/util/randstr.c b/fortune-mod/util/randstr.c
index 1aeb4b2bd8e154d5048079d359609017dda1aea2..a7c062d1860482523e545f9f5ffe344e2b3cfe16 100644 (file)
--- a/fortune-mod/util/randstr.c
+++ b/fortune-mod/util/randstr.c
@@ -161,7 +161,7 @@ static void get_fort(STRFILE fp)
 
 static void display(FILE *fp, STRFILE table)
 {
-    register char *p, ch;
+    char *p, ch;
     char line[BUFSIZ];
     int i;
 

diff --git a/fortune-mod/util/strfile.c b/fortune-mod/util/strfile.c
index 8b6feedb16de7e87d1fc9d8991f9953924c85fbd..d749f823078919ea1a372cafb0468a6d38a298c5 100644 (file)
--- a/fortune-mod/util/strfile.c
+++ b/fortune-mod/util/strfile.c
@@ -254,9 +254,9 @@ static void fix_last_offset(FILE *fp, int32_t off)
  */
 static int cmp_str(const void *v1, const void *v2)
 {
-    register int c1, c2;
-    register int n1, n2;
-    register const STR *p1, *p2;
+    int c1, c2;
+    int n1, n2;
+    const STR *p1, *p2;
 
 #define SET_N(nf, ch) (nf = (ch == '\n'))
 #define IS_END(ch, nf) (ch == Delimch && nf)
@@ -307,9 +307,9 @@ static int cmp_str(const void *v1, const void *v2)
  */
 static void do_order(void)
 {
-    register long i;
-    register int32_t *lp;
-    register STR *fp;
+    long i;
+    int32_t *lp;
+    STR *fp;
 
     Sort_1 = fopen(Infile, "r");
     Sort_2 = fopen(Infile, "r");
@@ -362,9 +362,9 @@ static char *
  */
 static void randomize(void)
 {
-    register int cnt, i;
-    register int32_t tmp;
-    register int32_t *sp;
+    int cnt, i;
+    int32_t tmp;
+    int32_t *sp;
 
     srandom((unsigned int)(time((time_t *)NULL) + getpid()));
 
@@ -399,12 +399,12 @@ static void randomize(void)
  */
 int main(int ac, char **av)
 {
-    register char *sp;
-    register FILE *inf, *outf;
-    register int32_t last_off, length, pos, *p;
-    register int first, cnt;
-    register char *nsp;
-    register STR *fp;
+    char *sp;
+    FILE *inf, *outf;
+    int32_t last_off, length, pos, *p;
+    int first, cnt;
+    char *nsp;
+    STR *fp;
     static char string[257];
     bool len_was_set = false;
 

diff --git a/fortune-mod/util/unstr.c b/fortune-mod/util/unstr.c
index b710e1afd3226903a6ccf7fdfbc30113b41ca36c..165ba56d8ce6cf118dd63b6c24c55c96d6f9873f 100644 (file)
--- a/fortune-mod/util/unstr.c
+++ b/fortune-mod/util/unstr.c
@@ -163,11 +163,11 @@ static void getargs(int ac, char *av[])
     }
 }
 
-static void order_unstr(register STRFILE *tbl)
+static void order_unstr(STRFILE *tbl)
 {
-    register uint32_t i;
-    register char *sp;
-    auto int32_t pos;
+    uint32_t i;
+    char *sp;
+    int32_t pos;
     char buf[BUFSIZ];
     int printedsome;