Use result, because (void) didn't prevent warning on FreeBSD 10.

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 85baf33db00a6a8d9596d820038122f67a8a6266..a8231e911167c424b6aa4b07f490b45addd5372e 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -48,7 +48,7 @@ main (int argc, char **argv)
     FILE *fp;
     char *tfile = NULL;
 
     FILE *fp;
     char *tfile = NULL;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }

 
     done=unlink_done;
 
 
     done=unlink_done;
 


@@ -59,7 +59,7 @@ main (int argc, char **argv)
 
     vec = argsplit(postproc, &program, &vecp);
 
 
     vec = argsplit(postproc, &program, &vecp);
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 


@@ -89,7 +89,7 @@ main (int argc, char **argv)
                    continue;
            }
        }
                    continue;
            }
        }

-       addrs = addrs ? add (cp, add (", ", addrs)) : getcpy (cp);
+       addrs = addrs ? add (cp, add (", ", addrs)) : mh_xstrdup(cp);

     }
 
     if (addrs == NULL)
     }
 
     if (addrs == NULL)


@@ -118,11 +118,11 @@ main (int argc, char **argv)
        done (1);
 
     vec[vecp++] = "-dist";
        done (1);
 
     vec[vecp++] = "-dist";

-    vec[vecp++] = drft;

     if ((cp = context_find ("mhlproc"))) {
       vec[vecp++] = "-mhlproc";
       vec[vecp++] = cp;
     }
     if ((cp = context_find ("mhlproc"))) {
       vec[vecp++] = "-mhlproc";
       vec[vecp++] = cp;
     }

+    vec[vecp++] = drft;

     vec[vecp] = NULL;
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
     vec[vecp] = NULL;
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)


@@ -173,10 +173,11 @@ static char *addrcomps[] = {
 static void
 rcvdistout (FILE *inb, char *form, char *addrs)
 {
 static void
 rcvdistout (FILE *inb, char *form, char *addrs)
 {

-    register int char_read = 0, format_len, i, state;
-    register char **ap;
-    char *cp, *scanl, name[NAMESZ], tmpbuf[SBUFSIZ];
-    register struct comp *cptr;
+    int char_read = 0, format_len, i, state;
+    char **ap;
+    char *cp, name[NAMESZ], tmpbuf[SBUFSIZ];
+    charstring_t scanl;
+    struct comp *cptr;

     FILE *out;
     m_getfld_state_t gstate = 0;
 
     FILE *out;
     m_getfld_state_t gstate = 0;
 


@@ -234,17 +235,17 @@ finished: ;
     m_getfld_state_destroy (&gstate);
 
     i = format_len + char_read + 256;
     m_getfld_state_destroy (&gstate);
 
     i = format_len + char_read + 256;

-    scanl = mh_xmalloc ((size_t) i + 2);
+    scanl = charstring_create (i + 2);

     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;

-    fmt_scan (fmt, scanl, i + 1, i, dat, NULL);
-    fputs (scanl, out);
+    fmt_scan (fmt, scanl, i, dat, NULL);
+    fputs (charstring_buffer (scanl), out);

 
     if (ferror (out))
        adios (drft, "error writing");
     fclose (out);
 
 
     if (ferror (out))
        adios (drft, "error writing");
     fclose (out);
 

-    free (scanl);
+    charstring_free (scanl);

     fmt_free(fmt, 1);
 }
 
     fmt_free(fmt, 1);
 }