From: Robert Pengelly <robertapengelly@hotmail.com>
Date: Fri, 21 Mar 2025 06:08:31 +0000 (+0000)
Subject: Don't hardcode ascii values
X-Git-Url: https://git.candlhat.org/?a=commitdiff_plain;h=d963d0f9ca87885d680f70fa10d988c9772dbbe0;p=sar.git

Don't hardcode ascii values
---

diff --git a/append.c b/append.c
index 8a72a7c..1389010 100644
--- a/append.c
+++ b/append.c
@@ -29,7 +29,7 @@ void append (FILE *ofp, const char *fname) {
     
     }
     
-    memset (temp, 0x20, 16);
+    memset (temp, ' ', 16);
     temp[0] = '0';
     
     if ((p = strrchr (fname, '/'))) {
@@ -45,7 +45,7 @@ void append (FILE *ofp, const char *fname) {
     memcpy (header.name, name, len);
     
     while (len < 16) {
-        header.name[len++] = 0x20;
+        header.name[len++] = ' ';
     }
     
     memcpy (header.mtime, temp, 12);
@@ -57,12 +57,12 @@ void append (FILE *ofp, const char *fname) {
     bytes = ftell (tfp);
     
     len = sprintf (temp, "%ld", bytes);
-    temp[len] = 0x20;
+    temp[len] = ' ';
     
     memcpy (header.size, temp, 10);
     
-    header.endsig[0] = 0x60;
-    header.endsig[1] = 0x0A;
+    header.endsig[0] = '`';
+    header.endsig[1] = '\n';
     
     need_newline = (bytes % 2);
     
@@ -116,7 +116,7 @@ void append (FILE *ofp, const char *fname) {
     
     if (need_newline) {
     
-        temp[0] = 0x0A;
+        temp[0] = '\n';
         
         if (fwrite (temp, 1, 1, ofp) != 1) {
         
diff --git a/delete.c b/delete.c
index d8248fb..1a2a334 100644
--- a/delete.c
+++ b/delete.c
@@ -17,7 +17,7 @@ void delete (FILE *arfp, const char *fname) {
     const char *name;
     char temp[17], *p, *contents;
     
-    if (fwrite ("!<arch>\x0A", 8, 1, tfp) != 1) {
+    if (fwrite ("!<arch>\n", 8, 1, tfp) != 1) {
     
         fclose (tfp);
         
diff --git a/ranlib.c b/ranlib.c
index 992ffbd..415062f 100644
--- a/ranlib.c
+++ b/ranlib.c
@@ -161,9 +161,10 @@ static void elks_get_symbols (void *object, long offset) {
     long sym_start = sizeof (*hdr) + GET_UINT32 (hdr->a_text) + GET_UINT32 (hdr->a_data) + GET_UINT32 (hdr->a_trsize) + GET_UINT32 (hdr->a_drsize);
     long strtab_start = sym_start + GET_UINT32 (hdr->a_syms);
     
+    struct elks_nlist nlist;
+    
     while (sym_start < strtab_start) {
     
-        struct elks_nlist nlist;
         memcpy (&nlist, (char *) object + sym_start, sizeof (nlist));
         
         if (nlist.n_type == 5 || nlist.n_type == 7 || nlist.n_type == 9) {
@@ -273,7 +274,7 @@ void ranlib (FILE *arfp) {
     
     }
     
-    if (fwrite ("!<arch>\x0A", 8, 1, tfp) != 1) {
+    if (fwrite ("!<arch>\n", 8, 1, tfp) != 1) {
     
         fclose (tfp);
         
@@ -303,11 +304,11 @@ void ranlib (FILE *arfp) {
     len = sprintf (temp, "%d", bytes + 4);
 #endif
     
-    temp[len] = 0x20;
+    temp[len] = ' ';
     memcpy (header.size, temp, 10);
     
-    header.endsig[0] = 0x60;
-    header.endsig[1] = 0x0A;
+    header.endsig[0] = '`';
+    header.endsig[1] = '\n';
     
     if (fwrite (&header, sizeof (header), 1, tfp) != 1) {
     
diff --git a/replace.c b/replace.c
index 31e5dc2..ac89d3f 100644
--- a/replace.c
+++ b/replace.c
@@ -17,7 +17,7 @@ void replace (FILE *arfp, const char *fname) {
     const char *name;
     char temp[17], *p, *contents;
     
-    if (fwrite ("!<arch>\x0A", 8, 1, tfp) != 1) {
+    if (fwrite ("!<arch>\n", 8, 1, tfp) != 1) {
     
         fclose (tfp);