Add gcc's malloc function attribute.

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 2737dac8ccc0e40dcfdfad52a8f221def7683e33..88dfb153b9c7ba6e1f78dd6a4f08c545ea5898b4 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -125,7 +125,8 @@ static int fix_filename_encoding (CT);
 static int write_content (CT, const char *, char *, FILE *, int, int);
 static void set_text_ctparams(CT, char *, int);
 static int remove_file (const char *);
 static int write_content (CT, const char *, char *, FILE *, int, int);
 static void set_text_ctparams(CT, char *, int);
 static int remove_file (const char *);

-static void report (char *, char *, char *, char *, ...);
+static void report (char *, char *, char *, char *, ...)
+    CHECK_PRINTF(4, 5);

 static void pipeser (int);
 
 
 static void pipeser (int);
 
 


@@ -232,11 +233,10 @@ main (int argc, char **argv) {
                     adios (NULL, "missing argument to %s", argp[-2]);
                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||
                     adios (NULL, "missing argument to %s", argp[-2]);
                 }
                 if (! strncasecmp (cp, "multipart/", 10)  ||

-                    ! strncasecmp (cp, "message/", 8)) {
+                    ! strncasecmp (cp, "message/", 8))

                     adios (NULL, "-fixtype %s not allowed", cp);
                     adios (NULL, "-fixtype %s not allowed", cp);

-                } else if (! strchr (cp, '/')) {
+                if (! strchr (cp, '/'))

                     adios (NULL, "-fixtype requires type/subtype");
                     adios (NULL, "-fixtype requires type/subtype");

-                }

                 if (fx.fixtypes == NULL) { fx.fixtypes = svector_create (10); }
                 svector_push_back (fx.fixtypes, cp);
                 continue;
                 if (fx.fixtypes == NULL) { fx.fixtypes = svector_create (10); }
                 svector_push_back (fx.fixtypes, cp);
                 continue;


@@ -287,11 +287,9 @@ main (int argc, char **argv) {
             }
         }
         if (*cp == '+' || *cp == '@') {
             }
         }
         if (*cp == '+' || *cp == '@') {

-            if (folder) {
+            if (folder)

                 adios (NULL, "only one folder at a time!");
                 adios (NULL, "only one folder at a time!");

-            } else {
-                folder = pluspath (cp);
-            }
+            folder = pluspath (cp);

         } else {
             if (*cp == '/') {
                 /* Interpret a full path as a filename, not a message. */
         } else {
             if (*cp == '/') {
                 /* Interpret a full path as a filename, not a message. */