mime_type.c: Fix regexp in comment that describes following code.

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 1546f75af213b84774f6726ad3a5a807762aa13e..9f95c6d26575903050f364899ee72d4a528b185e 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -321,7 +321,7 @@ read_hdrs (struct msgs *mp, char *datesw)
        }
     }
     s->s_msg = 0;
        }
     }
     s->s_msg = 0;

-    return(s - smsgs);
+    return s - smsgs;

 }
 
 
 }
 
 


@@ -343,7 +343,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
        admonish (msgnam, "unable to read message");
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
        admonish (msgnam, "unable to read message");

-       return (0);
+       return 0;

     }
     gstate = m_getfld_state_init(in);
     for (compnum = 1;;) {
     }
     gstate = m_getfld_state_init(in);
     for (compnum = 1;;) {


@@ -390,10 +390,10 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
                      msg, compnum);
                check_failed = 1;
            }
                      msg, compnum);
                check_failed = 1;
            }

-            mh_xfree(datecomp);
-            mh_xfree(subjcomp);
+            free(datecomp);
+            free(subjcomp);

            fclose (in);
            fclose (in);

-           return (0);
+           return 0;

 
        default:
            adios (NULL, "internal error -- you lose");
 
        default:
            adios (NULL, "internal error -- you lose");


@@ -453,9 +453,9 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        smsg->s_subj = subjcomp;
     }
     fclose (in);
        smsg->s_subj = subjcomp;
     }
     fclose (in);

-    mh_xfree(datecomp);
+    free(datecomp);

 
 

-    return (1);
+    return 1;

 }
 
 /*
 }
 
 /*


@@ -465,12 +465,12 @@ static int
 dsort (struct smsg **a, struct smsg **b)
 {
     if ((*a)->s_clock < (*b)->s_clock)
 dsort (struct smsg **a, struct smsg **b)
 {
     if ((*a)->s_clock < (*b)->s_clock)

-       return (-1);
+       return -1;

     if ((*a)->s_clock > (*b)->s_clock)
     if ((*a)->s_clock > (*b)->s_clock)

-       return (1);
+       return 1;

     if ((*a)->s_msg < (*b)->s_msg)
     if ((*a)->s_msg < (*b)->s_msg)

-       return (-1);
-    return (1);
+       return -1;
+    return 1;

 }
 
 /*
 }
 
 /*


@@ -482,9 +482,9 @@ subsort (struct smsg **a, struct smsg **b)
     int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
     int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))

-       return (i);
+       return i;

 
 

-    return (dsort (a, b));
+    return dsort(a, b);

 }
 
 static int
 }
 
 static int


@@ -493,10 +493,10 @@ txtsort (struct smsg **a, struct smsg **b)
     int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
     int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))

-       return (i);
+       return i;

     if ((*a)->s_msg < (*b)->s_msg)
     if ((*a)->s_msg < (*b)->s_msg)

-       return (-1);
-    return (1);
+       return -1;
+    return 1;

 }
 
 static void
 }
 
 static void