From 1c5881fad47b815becc14fe097209d8749dc291f Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Sun, 14 Aug 2022 11:40:05 -0700
Subject: [PATCH] Cleanups in uutils.c

    Resolve shadow declarations
    Remove deprecated register attribute
    Simplify for-loop syntax, use C99 style loop var declaration
    Make (not used elsewhere) string functions static
---
 inc/uutilsdefs.h |  3 ---
 src/uutils.c     | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/inc/uutilsdefs.h b/inc/uutilsdefs.h
index 1c1968a..4fb7f29 100644
--- a/inc/uutilsdefs.h
+++ b/inc/uutilsdefs.h
@@ -1,9 +1,6 @@
 #ifndef UUTILSDEFS_H
 #define UUTILSDEFS_H 1
-#include <stddef.h> /* for size_t */
 #include "lispemul.h" /* for LispPTR */
-int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length);
-int c_string_to_lisp_string(char *C, LispPTR Lisp);
 LispPTR check_unix_password(LispPTR *args);
 LispPTR unix_username(LispPTR *args);
 LispPTR unix_getparm(LispPTR *args);
diff --git a/src/uutils.c b/src/uutils.c
index 91dc48f..0de5d5d 100644
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -22,6 +22,7 @@
 #include <pwd.h>         // for getpwuid, passwd
 #endif
 #include <signal.h>      // for killpg, SIGTSTP
+#include <stddef.h>      // for size_t
 #include <stdio.h>       // for printf, NULL, snprintf, size_t
 #include <stdlib.h>      // for getenv
 #include <string.h>      // for strcmp, strcpy, strlen, strncpy
@@ -45,9 +46,9 @@
 /*									*/
 /************************************************************************/
 
-int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) {
-  register OneDArray *arrayp;
-  register char *base;
+static int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) {
+  OneDArray *arrayp;
+  char *base;
 
   if (GetTypeNumber(Lisp) != TYPE_ONED_ARRAY) { return (-1); }
 
@@ -61,9 +62,9 @@ int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) {
       strncpy(C, base, arrayp->fillpointer);
 #else
       {
-        register int i, length;
-        register char *dp;
-        for (i = 0, dp = C, length = arrayp->fillpointer; i < length; i++) {
+        size_t l = arrayp->fillpointer;
+        char *dp = C;
+        for (size_t i = 0; i < l; i++) {
           *dp++ = (char)(GETBYTE(base++));
         }
       }
@@ -87,10 +88,10 @@ int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length) {
 /*									*/
 /************************************************************************/
 
-int c_string_to_lisp_string(char *C, LispPTR Lisp) {
-  register OneDArray *arrayp;
+static int c_string_to_lisp_string(char *C, LispPTR Lisp) {
+  OneDArray *arrayp;
   char *base;
-  register size_t length;
+  size_t length;
 
   length = strlen(C);
   if (GetTypeNumber(Lisp) != TYPE_ONED_ARRAY) { return (-1); }
@@ -106,9 +107,8 @@ int c_string_to_lisp_string(char *C, LispPTR Lisp) {
       strcpy(base, C);
 #else
       {
-        register size_t i;
-        register char *dp;
-        for (i = 0, dp = C; i < length + 1; i++) {
+        char *dp = C;
+        for (size_t i = 0; i < length + 1; i++) {
           char ch = *dp++;
 #ifdef DOS
           if (ch == '\\') dp++; /* skip 2nd \ in \\ in C strings */