Changeset 7258c6a in buchla-68k for libcio/scan.c

Timestamp:

07/09/2017 04:45:34 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8618599

Parents:

0292fbb

Message:

Use standard integer types.

File:

• libcio/scan.c (modified) (9 diffs)

libcio/scan.c

@@ -10 +10 @@
 #include "ctype.h"
 
-static int maxwide;
-static int (*gsub)();
-
-extern char *index(char *str, char c);
-
-static char *scnstr;
-static char quit;
-
-/* 
-
-*/
-
-static long getnum(char *list, char *values, int base)
-{
-        register long val;
-        register char *cp;
-        int c;
-        int sign;
+static int16_t maxwide;
+static int16_t (*gsub)();
+
+extern int8_t *index(int8_t *str, int8_t c);
+
+static int8_t *scnstr;
+static int8_t quit;
+
+/* 
+
+*/
+
+static int32_t getnum(int8_t *list, int8_t *values, int16_t base)
+{
+        register int32_t val;
+        register int8_t *cp;
+        int16_t c;
+        int16_t sign;
 
         if (maxwide LE 0)
@@ -53 +53 @@
 
                 val *= base;
-                val += values[(long)cp - (long)list];
+                val += values[(int32_t)cp - (int32_t)list];
         }
 
@@ -66 +66 @@
 */
 
-static int skipblk(void)
+static int16_t skipblk(void)
 {
         while (isspace((*gsub)(0)))
@@ -77 +77 @@
 }
 
-static int sgetc(int what)
+static int16_t sgetc(int16_t what)
 {
         if (what EQ 0) {
@@ -99 +99 @@
 */
 
-int scanfmt(int (*getsub)(), char *fmt, int **args)
+int16_t scanfmt(int16_t (*getsub)(), int8_t *fmt, int16_t **args)
 {
 
@@ -106 +106 @@
 #endif
 
-        long lv;
-        int c, count, dontdo, lflag, base;
-        char *cp;
-        char tlist[130];
-
-        static char list[] = "ABCDEFabcdef9876543210";
-
-        static char vals[] = {
+        int32_t lv;
+        int16_t c, count, dontdo, lflag, base;
+        int8_t *cp;
+        int8_t tlist[130];
+
+        static int8_t list[] = "ABCDEFabcdef9876543210";
+
+        static int8_t vals[] = {
 
                 10,11,12,13,14,15,10,11,12,13,14,15,9,8,7,6,5,4,3,2,1,0
@@ -198 +198 @@
 
                                         if (lflag)
-                                                *(long *)(*args++) = lv;
+                                                *(int32_t *)(*args++) = lv;
                                         else
                                                 **args++ = lv;
@@ -298 +298 @@
                                 if (!dontdo) {
 
-                                        *(char *)(*args++) = c;
+                                        *(int8_t *)(*args++) = c;
                                         ++count;
                                 }
@@ -379 +379 @@
 */
 
-int sscanf(char *string, char *fmt, int *args)
+int16_t sscanf(int8_t *string, int8_t *fmt, int16_t *args)
 {
         scnstr = string;