Changeset 3573 for trunk

Timestamp:

Dec 14, 2022, 10:17:38 AM (3 years ago)

Author:

bird

Message:

kash: addressed some pedantic warnings

Location:

trunk/src/kash

Files:

• eval.c (modified) (2 diffs)
• memalloc.h (modified) (2 diffs)
• output.c (modified) (1 diff)
• parser.c (modified) (3 diffs)

trunk/src/kash/eval.c

@@ -1068 +1068 @@
 }
 
+#ifdef KASH_USE_FORKSHELL2
 /* Copies data in the argument structure from parent to child. */
 static void evalcommand_setup_child(shinstance *pshchild, shinstance *pshparent, void *argp)
@@ -1116 +1117 @@
                 args->cmdentry.u.func = copyparsetree(pshchild, args->cmdentry.u.func); /** @todo isn't this duplicated already? */
 }
+#endif /* KASH_USE_FORKSHELL2 */
 
 /*

trunk/src/kash/memalloc.h

@@ -127 +127 @@
 # define PSTPUTSTRN(psh, str, n, p) do { \
         pstack_block *pstmacro = (psh)->curpstack; \
-        if (pstmacro->strleft >= (n)) {/*likely?*/} \
+        if (pstmacro->strleft >= (size_t)(n)) {/*likely?*/} \
         else (p) = pstmakestrspace(psh, (n), (p)); \
         pstmacro->strleft -= (n); \
@@ -140 +140 @@
 # define PSTUPUTC(psh, c, p)         do { kHlpAssert((psh)->sstrnleft > 0); --(psh)->sstrnleft; *(p)++ = (c); } while (0)
 # define PSTPUTC(psh, c, p)          do { if (--(psh)->sstrnleft >= 0) *(p)++ = (c); else (p) = pstputcgrow(psh, (p), (c)); } while (0)
-# define PSTPUTSTRN(psh, str, n, p)  do { if ((psh)->sstrnleft >= (n)) {/*likely?*/} else (p) = pstmakestrspace(psh, (n), (p)); \
+# define PSTPUTSTRN(psh, str, n, p)  do { if ((psh)->sstrnleft >= (size_t)(n)) {/*likely?*/} else (p) = pstmakestrspace(psh, (n), (p)); \
                                          memcpy((p), (str), (n)); (psh)->sstrnleft -= (n); (p) += (n); } while (0)
 #endif

trunk/src/kash/output.c

@@ -394 +394 @@
                         /* we don't implement 'x'; treat like 'X' */
                         digit = digit_lower;
+                        /*FALLTHROUGH*/
                 case 'X':
                         base = 16;

trunk/src/kash/parser.c

@@ -393 +393 @@
                                 synexpect(psh, -1);
                 } else {
-                        static char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE,
+                        static char argvars[5] = {CTLVAR, (char)(unsigned char)(VSNORMAL|VSQUOTE),
                                                                    '@', '=', '\0'};
                         n2 = pstallocnode(psh, sizeof (struct narg));
@@ -497 +497 @@
                 if (!redir)
                         synexpect(psh, -1);
+                /* FALLTHROUGH */
         case TAND:
         case TOR:
@@ -1642 +1643 @@
         const char *tmp;
 
-    /* skip the path */
-    for (tmp = strpbrk(argv0, "\\/:"); tmp; tmp = strpbrk(argv0, "\\/:"))
-        argv0 = tmp + 1;
+        /* skip the path */
+        for (tmp = strpbrk(argv0, "\\/:"); tmp; tmp = strpbrk(argv0, "\\/:"))
+                argv0 = tmp + 1;
 
         if (lenp) {