From 2d5aaaa3355ca3c85d3d4e7fdd3233af0d9e11f5 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 16 Apr 2021 22:30:53 +0200
Subject: [PATCH] conversion fixes

---
 armsrc/string.c | 15 ++++++++-------
 armsrc/string.h |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/armsrc/string.c b/armsrc/string.c
index a3b49dcb1..d65cb6839 100644
--- a/armsrc/string.c
+++ b/armsrc/string.c
@@ -35,7 +35,7 @@ void *memmove(void *dest, const void *src, size_t len) {
     return dest;
 }
 
-void *memset(void *dest, int c, int len) {
+void *memset(void *dest, uint8_t c, int len) {
     uint8_t *d = dest;
     while ((len--) > 0) {
         *d = c;
@@ -70,18 +70,19 @@ int strlen(const char *str) {
 }
 
 char *strncat(char *dest, const char *src, unsigned int n) {
-    unsigned int dest_len = strlen(dest);
+    int dest_len = strlen(dest);
     unsigned int i;
 
     for (i = 0 ; i < n && src[i] != '\0' ; i++)
         dest[dest_len + i] = src[i];
+
     dest[dest_len + i] = '\0';
 
     return dest;
 }
 
 char *strcat(char *dest, const char *src) {
-    unsigned int dest_len = strlen(dest);
+    int dest_len = strlen(dest);
     unsigned int i;
 
     for (i = 0 ; src[i] != '\0' ; i++)
@@ -97,7 +98,7 @@ void strreverse(char s[]) {
     int j = strlen(s) - 1;
 
     for (int i = 0; i < j; i++, j--) {
-        int c = s[i];
+        char c = s[i];
         s[i] = s[j];
         s[j] = c;
     }
@@ -105,11 +106,11 @@ void strreverse(char s[]) {
 
 /* itoa:  convert n to characters in s */
 void itoa(int n, char s[]) {
-    int i, sign;
-
+    int sign;
     if ((sign = n) < 0)  /* record sign */
         n = -n;          /* make n positive */
-    i = 0;
+
+    int i = 0;
     do {       /* generate digits in reverse order */
         s[i++] = n % 10 + '0';   /* get next digit */
     } while ((n /= 10) > 0);     /* delete it */
diff --git a/armsrc/string.h b/armsrc/string.h
index f4d6e3fc1..9232508dd 100644
--- a/armsrc/string.h
+++ b/armsrc/string.h
@@ -17,7 +17,7 @@
 int strlen(const char *str);
 void *memcpy(void *dest, const void *src, int len);
 void *memmove(void *dest, const void *src, size_t len);
-void *memset(void *dest, int c, int len);
+void *memset(void *dest, uint8_t c, int len);
 int memcmp(const void *av, const void *bv, int len);
 void memxor(uint8_t *dest, uint8_t *src, size_t len);
 char *strncat(char *dest, const char *src, unsigned int n);