From 56d15c0d31d1332673e52225e7aaf37d43033317 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Wed, 29 Apr 2020 11:30:11 +0300
Subject: [PATCH] Avoid predeclaring variables and localize their decl.

See:

* http://perl-begin.org/tutorials/bad-elements/#declaring_all_vars_at_top

* https://en.wikipedia.org/wiki/Perl_Best_Practices
---
 fortune-mod/util/strfile.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/fortune-mod/util/strfile.c b/fortune-mod/util/strfile.c
index 9c091ad..6c31816 100644
--- a/fortune-mod/util/strfile.c
+++ b/fortune-mod/util/strfile.c
@@ -357,11 +357,8 @@ int main(int ac, char **av)
 {
     char *sp;
     FILE *inf, *outf;
-    int32_t last_off, length, pos, *p;
-    int cnt;
-    char *nsp;
+    int32_t *p;
     STR *fp;
-    static char string[257];
     bool len_was_set = false;
 
     getargs(ac, av); /* evalute arguments */
@@ -391,14 +388,16 @@ int main(int ac, char **av)
     Tbl.str_version = STRFILE_VERSION;
     bool first = Oflag;
     add_offset(outf, (int32_t)ftell(inf));
-    last_off = 0;
+    int32_t last_off = 0;
     do
     {
+        char string[257];
         sp = fgets(string, 256, inf);
         if (sp == NULL || STR_ENDSTRING(sp, Tbl))
         {
-            pos = (int32_t)ftell(inf);
-            length = pos - last_off - (int32_t)(sp ? strlen(sp) : 0);
+            const int32_t pos = (int32_t)ftell(inf);
+            const int32_t length =
+                pos - last_off - (int32_t)(sp ? strlen(sp) : 0);
             if (!length)
             /* Here's where we go back and fix things, if the
              * 'fortune' just read was the null string.
@@ -436,7 +435,8 @@ int main(int ac, char **av)
         }
         else if (first)
         {
-            for (nsp = sp; !isalnum(*nsp); nsp++)
+            char *nsp = sp;
+            for (; !isalnum(*nsp); ++nsp)
             {
             }
             ALLOC(Firstch, Num_pts);
@@ -511,7 +511,8 @@ int main(int ac, char **av)
     fwrite(Tbl.stuff, sizeof Tbl.stuff, 1, outf);
     if (storing_ptrs())
     {
-        for (p = Seekpts, cnt = (int)Num_pts; cnt--; ++p)
+        int cnt = (int)Num_pts;
+        for (p = Seekpts; cnt--; ++p)
         {
             *p = (int32_t)htonl((uint32_t)*p);
             fwrite(p, sizeof *p, 1, outf);
-- 
2.40.0