Part 1 of merging sbr/norm_charmap.c into sbr/check_charset.c.

[nmh] / uip / mhlistsbr.c

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 5a45d0360f1ef530bf0fc9c54196c11640cdea53..f7ecbc89586939de5979ea575553523bca202469 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhlistsbr.c -- routines to list information about the
+/* mhlistsbr.c -- routines to list information about the

  *             -- contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  *             -- contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the


@@ -135,8 +133,6 @@ list_switch (CT ct, int toplevel, int realsize, int verbose, int debug,
 }
 
 
 }
 
 

-#define empty(s) ((s) ? (s) : "")
-

 /*
  * Method for listing information about a simple/generic content
  */
 /*
  * Method for listing information about a simple/generic content
  */


@@ -151,16 +147,16 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug,
     PM pm;
 
     if (toplevel > 0)
     PM pm;
 
     if (toplevel > 0)

-       printf (LSTFMT2a, atoi (r1bindex (empty (ct->c_file), '/')));
+       printf (LSTFMT2a, atoi (r1bindex (FENDNULL(ct->c_file), '/')));

     else
        printf(toplevel < 0 ? "part " : "     ");
 
     else
        printf(toplevel < 0 ? "part " : "     ");
 

-    snprintf (buffer, sizeof(buffer), "%s/%s", empty (ci->ci_type),
-               empty (ci->ci_subtype));
+    snprintf (buffer, sizeof(buffer), "%s/%s", FENDNULL(ci->ci_type),
+               FENDNULL(ci->ci_subtype));

     if (verbose)
     if (verbose)

-       printf (LSTFMT2bv, empty (ct->c_partno), buffer);
+       printf (LSTFMT2bv, FENDNULL(ct->c_partno), buffer);

     else
     else

-       printf (LSTFMT2b, empty (ct->c_partno), buffer);
+       printf (LSTFMT2b, FENDNULL(ct->c_partno), buffer);

 
     if (ct->c_cesizefnx && realsize)
        size = (*ct->c_cesizefnx) (ct);
 
     if (ct->c_cesizefnx && realsize)
        size = (*ct->c_cesizefnx) (ct);


@@ -201,7 +197,7 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug,
        free (dp);
     }
 
        free (dp);
     }
 

-    printf ("\n");
+    putchar('\n');

 
     if (verbose) {
        CI ci = &ct->c_ctinfo;
 
     if (verbose) {
        CI ci = &ct->c_ctinfo;


@@ -254,7 +250,7 @@ list_debug (CT ct)
     PM pm;
 
     fflush (stdout);
     PM pm;
 
     fflush (stdout);

-    fprintf (stderr, "  partno \"%s\"\n", empty (ct->c_partno));
+    fprintf (stderr, "  partno \"%s\"\n", FENDNULL(ct->c_partno));

 
     /* print MIME-Version line */
     if (ct->c_vrsn)
 
     /* print MIME-Version line */
     if (ct->c_vrsn)


@@ -265,10 +261,10 @@ list_debug (CT ct)
        fprintf (stderr, "  %s:%s\n", TYPE_FIELD, ct->c_ctline);
 
     /* print parsed elements of content type */
        fprintf (stderr, "  %s:%s\n", TYPE_FIELD, ct->c_ctline);
 
     /* print parsed elements of content type */

-    fprintf (stderr, "    type    \"%s\"\n", empty (ci->ci_type));
-    fprintf (stderr, "    subtype \"%s\"\n", empty (ci->ci_subtype));
-    fprintf (stderr, "    comment \"%s\"\n", empty (ci->ci_comment));
-    fprintf (stderr, "    magic   \"%s\"\n", empty (ci->ci_magic));
+    fprintf (stderr, "    type    \"%s\"\n", FENDNULL(ci->ci_type));
+    fprintf (stderr, "    subtype \"%s\"\n", FENDNULL(ci->ci_subtype));
+    fprintf (stderr, "    comment \"%s\"\n", FENDNULL(ci->ci_comment));
+    fprintf (stderr, "    magic   \"%s\"\n", FENDNULL(ci->ci_magic));

 
     /* print parsed parameters attached to content type */
     fprintf (stderr, "    parameters\n");
 
     /* print parsed parameters attached to content type */
     fprintf (stderr, "    parameters\n");


@@ -281,9 +277,9 @@ list_debug (CT ct)
             ct->c_type, ct->c_subtype,
             (unsigned int)(unsigned long) ct->c_ctparams);
 
             ct->c_type, ct->c_subtype,
             (unsigned int)(unsigned long) ct->c_ctparams);
 

-    fprintf (stderr, "    showproc  \"%s\"\n", empty (ct->c_showproc));
-    fprintf (stderr, "    termproc  \"%s\"\n", empty (ct->c_termproc));
-    fprintf (stderr, "    storeproc \"%s\"\n", empty (ct->c_storeproc));
+    fprintf (stderr, "    showproc  \"%s\"\n", FENDNULL(ct->c_showproc));
+    fprintf (stderr, "    termproc  \"%s\"\n", FENDNULL(ct->c_termproc));
+    fprintf (stderr, "    storeproc \"%s\"\n", FENDNULL(ct->c_storeproc));

 
     /* print transfer encoding information */
     if (ct->c_celine)
 
     /* print transfer encoding information */
     if (ct->c_celine)


@@ -305,14 +301,14 @@ list_debug (CT ct)
     if (ct->c_dispo)
        fprintf (stderr, "  %s:%s", DISPO_FIELD, ct->c_dispo);
 
     if (ct->c_dispo)
        fprintf (stderr, "  %s:%s", DISPO_FIELD, ct->c_dispo);
 

-    fprintf(stderr, "    disposition \"%s\"\n", empty (ct->c_dispo_type));
+    fprintf(stderr, "    disposition \"%s\"\n", FENDNULL(ct->c_dispo_type));

     fprintf(stderr, "    disposition parameters\n");
     for (pm = ct->c_dispo_first; pm; pm = pm->pm_next)
        fprintf (stderr, "      %s=\"%s\"\n", pm->pm_name,
                 get_param_value(pm, '?'));
 
     fprintf (stderr, "    read fp 0x%x file \"%s\" begin %ld end %ld\n",
     fprintf(stderr, "    disposition parameters\n");
     for (pm = ct->c_dispo_first; pm; pm = pm->pm_next)
        fprintf (stderr, "      %s=\"%s\"\n", pm->pm_name,
                 get_param_value(pm, '?'));
 
     fprintf (stderr, "    read fp 0x%x file \"%s\" begin %ld end %ld\n",

-            (unsigned int)(unsigned long) ct->c_fp, empty (ct->c_file),
+            (unsigned int)(unsigned long) ct->c_fp, FENDNULL(ct->c_file),

             ct->c_begin, ct->c_end);
 
     /* print more information about transfer encoding */
             ct->c_begin, ct->c_end);
 
     /* print more information about transfer encoding */


@@ -321,8 +317,6 @@ list_debug (CT ct)
     return OK;
 }
 
     return OK;
 }
 

-#undef empty
-

 
 /*
  * list content information for type "multipart"
 
 /*
  * list content information for type "multipart"


@@ -365,7 +359,7 @@ list_partial (CT ct, int toplevel, int realsize, int verbose, int debug,
        printf ("\t     [message %s, part %d", p->pm_partid, p->pm_partno);
        if (p->pm_maxno)
            printf (" of %d", p->pm_maxno);
        printf ("\t     [message %s, part %d", p->pm_partid, p->pm_partno);
        if (p->pm_maxno)
            printf (" of %d", p->pm_maxno);

-       printf ("]\n");
+       puts("]");

     }
 
     return OK;
     }
 
     return OK;


@@ -411,7 +405,7 @@ list_external (CT ct, int toplevel, int realsize, int verbose, int debug,
            printf ("\t     permission=\"%s\"\n", e->eb_permission);
 
        if (e->eb_flags == NOTOK)
            printf ("\t     permission=\"%s\"\n", e->eb_permission);
 
        if (e->eb_flags == NOTOK)

-           printf ("\t     [service unavailable]\n");
+           puts("\t     [service unavailable]");

 
     }
 
 
     }
 


@@ -454,7 +448,7 @@ list_encoding (CT ct)
 
     fprintf (stderr, "    decoded fp 0x%x file \"%s\"\n",
             (unsigned int)(unsigned long) ce->ce_fp,
 
     fprintf (stderr, "    decoded fp 0x%x file \"%s\"\n",
             (unsigned int)(unsigned long) ce->ce_fp,

-            ce->ce_file ? ce->ce_file : "");
+            FENDNULL(ce->ce_file));

 
     return OK;
 }
 
     return OK;
 }