Changeset 2312 for trunk/src

Timestamp:

Mar 2, 2009, 2:14:43 AM (16 years ago)

Author:

bird

Message:

kash: eliminating warnings (gcc/darwin).

Location:

trunk/src/kash

Files:

• bltin/kill.c (modified) (1 diff)
• mail.c (modified) (1 diff)
• memalloc.c (modified) (1 diff)
• parser.c (modified) (1 diff)
• setmode.c (modified) (1 diff)
• shfile.c (modified) (2 diffs)
• shthread.c (modified) (1 diff)

trunk/src/kash/bltin/kill.c

@@ -197 +197 @@
         size_t len, nl;
         const char *name;
-        int termwidth = 80;
+        unsigned termwidth = 80;
 
         if (shfile_isatty(&psh->fdtab, out->fd)) {

trunk/src/kash/mail.c

@@ -60 +60 @@
 
 
-/*STATIC int nmboxes;                   /* number of mailboxes */
+/*STATIC int nmboxes;*/                 /* number of mailboxes */
 /*STATIC time_t mailtime[MAXMBOXES];*/  /* times of mailboxes */
 

trunk/src/kash/memalloc.c

@@ -127 +127 @@
 
         nbytes = SHELL_ALIGN(nbytes);
-        if (nbytes > psh->stacknleft) {
+        if (nbytes > (size_t)psh->stacknleft || psh->stacknleft < 0) {
                 size_t blocksize;
                 struct stack_block *sp;

trunk/src/kash/parser.c

@@ -1346 +1346 @@
                 if (subtype != VSNORMAL) {
                         varnest++;
-                        if (varnest >= maxnest) {
+                        if (varnest >= (int)maxnest) {
                                 dblquotep = ckrealloc(psh, dblquotep, maxnest / 8);
                                 dblquotep[(maxnest / 32) - 1] = 0;

trunk/src/kash/setmode.c

@@ -368 +368 @@
         case 'X':
                 set->cmd = op;
-                set->bits = (who ? who : mask) & oparg;
+                set->bits = (who ? (unsigned int)who : mask) & (unsigned int)oparg;
                 break;
 

trunk/src/kash/shfile.c

@@ -843 +843 @@
 {
     int rc;
-    int s;
 #ifdef SHFILE_IN_USE
 # if K_OS == K_OS_WINDOWS
@@ -879 +878 @@
         }
 # endif
-        s = errno;
         if (fds[1] == -1)
         {
+            int s = errno;
             if (fds[0] != -1)
             {

trunk/src/kash/shthread.c

@@ -48 +48 @@
 #else
 static int sh_tls_inited = 0;
-static int sh_tls;
+static pthread_key_t sh_tls;
 #endif