Janitor - fix some "value computed is not used" warnings

diff --git a/configure.ac b/configure.ac
index ef2f1fed799bf3818761b9b89cdd8e48467ae5d7..e8c3c13114bf5edc306473d8d3c3c3664bd6afc5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -727,7 +727,11 @@ if test "$HAVE_TCL" = "1"; then
 fi
 
 if test "$HAVE_TCL" = "1"; then
-    TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tclpathplan/pkgIndex.tcl gv/pkgIndex.tcl"
+    if test "$HAVE_LIBGD" = "1"; then
+       TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tclpathplan/pkgIndex.tcl gv/pkgIndex.tcl"
+    else
+       TCL_PKGINDEX="tcldot/pkgIndex.tcl tclpathplan/pkgIndex.tcl gv/pkgIndex.tcl"
+    fi
 else
     TCL_PKGINDEX=""
 fi

diff --git a/lib/common/emit.c b/lib/common/emit.c
index e69fca86f03ea21271374c4c6fb6f350183cc793..b2997adf6726ec5daa19a53bf92fb273c498777b 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -1618,7 +1618,7 @@ static bool is_style_delim(int c)
 static int style_token(char **s, agxbuf * xb)
 {
     char *p = *s;
-    int token;
+    int token, rc;
     char c;
 
     while (*p && (isspace(*p) || (*p == ',')))
@@ -1634,7 +1634,7 @@ static int style_token(char **s, agxbuf * xb)
     default:
        token = SID;
        while (!is_style_delim(c = *p)) {
-           agxbputc(xb, c);
+           rc = agxbputc(xb, c);
            p++;
        }
     }

diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c
index e9f5dd0ea96d884c30451862e06d55300878e2a7..d0f6d53d1380abe1e0bc43b77bf2c521627e8af2 100644 (file)
--- a/lib/common/htmllex.c
+++ b/lib/common/htmllex.c
@@ -574,8 +574,7 @@ static void endElement(void *user, const char *name)
  */
 static void characterData(void *user, const char *s, int length)
 {
-    int i;
-    int cnt = 0;
+    int i, rc, cnt = 0;
     unsigned char c;
 
     if (state.inCell) {
@@ -583,7 +582,7 @@ static void characterData(void *user, const char *s, int length)
            c = *s++;
            if (c >= ' ') {
                cnt++;
-               agxbputc(state.xb, c);
+               rc = agxbputc(state.xb, c);
            }
        }
        if (cnt) state.tok = T_string;
@@ -670,6 +669,7 @@ static char *findNext(char *s, agxbuf* xb)
 {
     char* t = s + 1;
     char c;
+    int rc;
 
     if (*s == '<') {
        if ((*t == '!') && !strncmp(t + 1, "--", 2))
@@ -683,13 +683,13 @@ static char *findNext(char *s, agxbuf* xb)
        } else
            t++;
     } else {
-       agxbputc(xb, *s);
+       rc = agxbputc(xb, *s);
        while ((c = *t) && (c != '<')) {
            if ((c == '&') && (*(t+1) != '#')) {
                t = scanEntity(t + 1, xb);
            }
            else {
-               agxbputc(xb, c);
+               rc = agxbputc(xb, c);
                t++;
            }
        }

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index c523d24641b26dceedd4c08e537212bd30a41efc..15e957418da14e258fe0d17d7ef336f2c4fc4b14 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -338,6 +338,7 @@ char *ps_string(char *ins, int latin)
     char *s;
     char *base;
     static agxbuf  xb;
+    int rc;
 
     if (latin)
        base = utf8ToLatin1 (ins);
@@ -347,13 +348,12 @@ char *ps_string(char *ins, int latin)
     if (xb.buf == NULL)
        agxbinit (&xb, BUFSIZ, psbuf);
 
-    agxbputc (&xb, LPAREN);
+    rc = agxbputc (&xb, LPAREN);
     s = base;
     while (*s) {
-       if ((*s == LPAREN) || (*s == RPAREN) || (*s == '\\')) {
-           agxbputc (&xb, '\\');
-       }
-       agxbputc (&xb, *s++);
+       if ((*s == LPAREN) || (*s == RPAREN) || (*s == '\\'))
+           rc = agxbputc (&xb, '\\');
+       rc = agxbputc (&xb, *s++);
     }
     agxbputc (&xb, RPAREN);
     if (base != ins) free (base);

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 605674e6ad451e0195cf55099f5e31a22ab0b6ed..691173cfb064959b26fb3360650c755689636276 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -1362,6 +1362,7 @@ latin1ToUTF8 (char* s)
     agxbuf xb;
     unsigned char buf[BUFSIZ];
     unsigned int  v;
+    int rc;
     
     agxbinit(&xb, BUFSIZ, buf);
 
@@ -1373,15 +1374,16 @@ latin1ToUTF8 (char* s)
            v = htmlEntity (&s);
            if (!v) v = '&';
         }
-       if (v < 0x7F) agxbputc(&xb, v);
+       if (v < 0x7F)
+           rc = agxbputc(&xb, v);
        else if (v < 0x07FF) {
-           agxbputc(&xb, (v >> 6) | 0xC0);
-           agxbputc(&xb, (v & 0x3F) | 0x80);
+           rc = agxbputc(&xb, (v >> 6) | 0xC0);
+           rc = agxbputc(&xb, (v & 0x3F) | 0x80);
        }
        else {
-           agxbputc(&xb, (v >> 12) | 0xE0);
-           agxbputc(&xb, ((v >> 6) & 0x3F) | 0x80);
-           agxbputc(&xb, (v & 0x3F) | 0x80);
+           rc = agxbputc(&xb, (v >> 12) | 0xE0);
+           rc = agxbputc(&xb, ((v >> 6) & 0x3F) | 0x80);
+           rc = agxbputc(&xb, (v & 0x3F) | 0x80);
        }
     }
     ns = strdup (agxbuse(&xb));
@@ -1402,16 +1404,18 @@ utf8ToLatin1 (char* s)
     unsigned char buf[BUFSIZ];
     unsigned char c;
     unsigned char outc;
+    int rc;
     
     agxbinit(&xb, BUFSIZ, buf);
 
     while ((c = *(unsigned char*)s++)) {
-       if (c < 0x7F) agxbputc(&xb, c);
+       if (c < 0x7F)
+           rc = agxbputc(&xb, c);
        else {
            outc = (c & 0x03) << 6;
            c = *(unsigned char*)s++;
            outc = outc | (c & 0x3F);
-           agxbputc(&xb, outc);
+           rc = agxbputc(&xb, outc);
        }
     }
     ns = strdup (agxbuse(&xb));

diff --git a/lib/common/xdgen.c b/lib/common/xdgen.c
index 345bbaa0933448da7066a366235ef45a7a28783b..2417a9620ac050c726bafc7a53d52b1361f68252 100644 (file)
--- a/lib/common/xdgen.c
+++ b/lib/common/xdgen.c
@@ -207,8 +207,9 @@ static void xd_textline(point p, textline_t * line)
 static void xd_ellipse(point p, int rx, int ry, int filled)
 {
     char buf[BUFSIZ];
+    int rc;
 
-    agxbputc(xbufs[gvc->emit_state], (filled ? 'E' : 'e'));
+    rc = agxbputc(xbufs[gvc->emit_state], (filled ? 'E' : 'e'));
     sprintf(buf, " %d %d %d %d ", p.x, YDIR(p.y), rx, ry);
     agxbput(xbufs[gvc->emit_state], buf);
 }
@@ -216,10 +217,10 @@ static void xd_ellipse(point p, int rx, int ry, int filled)
 static void xd_points(char c, point * A, int n)
 {
     char buf[BUFSIZ];
-    int i;
+    int i, rc;
     point p;
 
-    agxbputc(xbufs[gvc->emit_state], c);
+    rc = agxbputc(xbufs[gvc->emit_state], c);
     sprintf(buf, " %d ", n);
     agxbput(xbufs[gvc->emit_state], buf);
     for (i = 0; i < n; i++) {

diff --git a/lib/graph/lexer.c b/lib/graph/lexer.c
index d2abd731ddcd53bffe5a21367fb9930b7b0e5927..ffe734e79fab03a8f57a085ccf17294cf28f3951 100644 (file)
--- a/lib/graph/lexer.c
+++ b/lib/graph/lexer.c
@@ -275,7 +275,7 @@ static char *lex_gets(void)
 static char *html_pair(char *p, agxbuf * tokp)
 {
     unsigned char c;
-    int depth = 1;
+    int rc, depth = 1;
 
     while (1) {
        while ((c = *p)) {
@@ -285,7 +285,7 @@ static char *html_pair(char *p, agxbuf * tokp)
                    return p;   /* p points to closing > */
            } else if (c == '<')
                depth++;
-           agxbputc(tokp, c);
+           rc = agxbputc(tokp, c);
            p++;
        }
        if ((p = lex_gets()) == NULL) {

diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 33a0cd8828a5d7997492645b77f891f64bc840ed..f2c553b95f7ee89f16233108a2dcfef72954fde8 100644 (file)
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -32,6 +32,7 @@ libgdtclft_la_LIBADD = \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs.la @GD_LIBS@
 libgdtclft_la_LDFLAGS = -module -no-undefined
 
+if WITH_LIBGD
 if WITH_TCL
 all-local: pkgIndex.tcl
 
@@ -41,6 +42,7 @@ pkgIndex.tcl: libgdtclft.la
 test:
        echo 'load .libs/libgdtclft$(TCL_SHLIB_SUFFIX) Gdtclft ; cd tests ; source all' | tclsh8.3
 endif
+endif
 
 .n.pdf:
        groff -Tps -man $< | ps2pdf - - >$@

diff --git a/tclpkg/gdtclft/gdtclft.c b/tclpkg/gdtclft/gdtclft.c
index f44020b459a68cfbc46ddb03bc58d61e2fad315b..af64b2ee06e3006f6d2c63f4fa23286c26f79d91 100644 (file)
--- a/tclpkg/gdtclft/gdtclft.c
+++ b/tclpkg/gdtclft/gdtclft.c
@@ -60,7 +60,9 @@ static CmdFunc tclGdBrushCmd;
 static CmdFunc tclGdStyleCmd;
 static CmdFunc tclGdTileCmd;
 static CmdFunc tclGdPolygonCmd;
+#ifdef HAVE_GD_PNG
 static CmdFunc tclGdWriteBufCmd;
+#endif
 
 static ColCmdFunc tclGdColorNewCmd;
 static ColCmdFunc tclGdColorExactCmd;
@@ -1431,6 +1433,7 @@ LPVOID reserved;          /* Not used. */
 #endif
 #endif
 
+#ifdef HAVE_GD_PNG
 static int BufferSinkFunc(void *context, const char *buffer, int len)
 {
     BuffSinkContext *p = context;
@@ -1454,7 +1457,6 @@ static int
 tclGdWriteBufCmd(Tcl_Interp * interp, GdData * gdData, int argc,
                 Tcl_Obj * CONST objv[])
 {
-#ifdef HAVE_GD_PNG
     gdImagePtr im;
     Tcl_Obj *output;
     /* char *cmd; */
@@ -1490,6 +1492,6 @@ tclGdWriteBufCmd(Tcl_Interp * interp, GdData * gdData, int argc,
     if (Tcl_ObjSetVar2(interp, objv[3], NULL, output, 0) == NULL)
        return TCL_ERROR;
     else
-#endif
        return TCL_OK;
 }
+#endif