Partial splint cleanup.

diff --git a/src/feh.h b/src/feh.h
index 1876fb00c9e963172c32e9e21d47972f623521fe..ad4f9d2b58579841759297f800495573ecaadbc4 100644 (file)
--- a/src/feh.h
+++ b/src/feh.h
@@ -11,7 +11,7 @@ extern void ppinit(int); /* AIS */
 extern void typecast(node *np);
 extern void codecheck(void);
 extern void optimize(node *np);
-/*@observer@*/ extern const char *nameof(int value, const assoc table[]);
+/*@observer@*/ /*@null@*/ extern const char *nameof(int value, const assoc table[]);
 extern void emit(tuple *tn, FILE *fp);
 extern void emittextlines(FILE *fp);
 extern void emitslatproto(FILE *fp); /* AIS: emit prototypes for /-functions */

diff --git a/src/feh2.c b/src/feh2.c
index 5134a106e4eaa199ed0fdc726b837835acb77999..53a70a9a81062a90121a385738200175dd3c3fd0 100644 (file)
--- a/src/feh2.c
+++ b/src/feh2.c
@@ -228,9 +228,9 @@ void treset(void)
   {
     tuplecount += ALLOC_CHUNK;
     if (tuples)
-      tuples = realloc(tuples, tuplecount * sizeof(tuple));
+       tuples = (tuple *)realloc(tuples, tuplecount * sizeof(tuple));
     else
-      tuples = malloc(tuplecount * sizeof(tuple));
+       tuples = (tuple *)malloc(tuplecount * sizeof(tuple));
     if (!tuples)
       ick_lose(IE666, iyylineno, (const char *)NULL);
     memset(tuples + ick_lineno, 0, (tuplecount - ick_lineno) * sizeof(tuple));
@@ -544,7 +544,7 @@ static const assoc typedefs[] =
     { 0,       (const char *)NULL }
 };
 
-/*@observer@*/ const char *nameof(int value, const assoc table[])
+/*@observer@*/ /*@null@*/ const char *nameof(int value, const assoc table[])
 /* return string corresponding to value in table */
 {
     const assoc        *ap;
@@ -1006,6 +1006,7 @@ static unsigned long meshval(unsigned long x)
    are so many false positives, disabling the true positives doesn't make them
    any harder to find by eye. */
 /*@-temptrans@*/ /*@-kepttrans@*/ /*@-compdestroy@*/ /*@-branchstate@*/
+ /*@-nullpass@*/
 static void revprexpr(node *np, FILE *fp, node *target)
 {
   node* temp;
@@ -1257,7 +1258,7 @@ void prexpr(node *np, FILE *fp, int freenode)
       /* We need to do the same as UNKNOWN statements, but as an expression.
         This is achieved with the helper function ick_dounop in ick_ec.c. */
       (void) fprintf(fp, "ick_dounop(\"");
-      prunknownstr(np->lval, fp);
+      (void) prunknownstr(np->lval, fp);
       if(freenode) free(np->lval);
       (void) fprintf(fp, "\", ");
       prexpr(np->rval->lval, fp, 0);
@@ -1662,8 +1663,8 @@ static void prunknown(node *np, FILE* fp)
       (void) fprintf(fp, "\t\t""ICKSTASH(ick_TWOSPOT, %lu, "
                     "ick_twospots, ick_oo_twospots);\n"
                     "\t\t""ick_oo_twospots[%lu]=icd[%d].accessors;\n",
-                    intern(ick_TWOSPOT,1601+j),
-                    intern(ick_TWOSPOT,1601+j),j);
+                    intern(ick_TWOSPOT,(unsigned long)(1601+j)),
+                    intern(ick_TWOSPOT,(unsigned long)(1601+j)),j);
   }
   if(useickec)
   {
@@ -1682,7 +1683,7 @@ static void prunknown(node *np, FILE* fp)
     while(j--)
       (void) fprintf(fp, "\t\t""ICKRETRIEVE(ick_twospots, %lu, "
                     "ick_TWOSPOT, ick_twoforget, ick_oo_twospots);\n",
-                    intern(ick_TWOSPOT,1601+j));
+                    intern(ick_TWOSPOT,(unsigned long)(1601+j)));
 
   }
   fprintf(fp, "\t} else\n");

diff --git a/src/ick.h b/src/ick.h
index e45231df8db2ddc10a69a77a95674d170a2aa74b..578513c4a42cb190a74e3135777a4b09af306f16 100644 (file)
--- a/src/ick.h
+++ b/src/ick.h
@@ -114,7 +114,7 @@ atom;
 typedef struct
 {
     int        value;
-    const char *name;
+    /*@null@*/const char *name;
 }
 assoc;