Use C's `++', `+=', etc., not the longhand.

[nmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 15cab6c0e5e1f34af38b860ff98daf4d6f1f48b9..9e3183e499a448aa99c144f64cfae47da48d6e6c 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * replsbr.c -- routines to help repl along...
+/* replsbr.c -- routines to help repl along...

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -525,7 +523,7 @@ fix_addresses (char *str) {
             struct mailname *mp;
 
             NEW(adr_nodep);
             struct mailname *mp;
 
             NEW(adr_nodep);

-            adr_nodep->adr = strdup (cp);
+            adr_nodep->adr = mh_xstrdup (cp);

             adr_nodep->escape_local_part = 0;
             adr_nodep->fixed = 0;
             adr_nodep->next = NULL;
             adr_nodep->escape_local_part = 0;
             adr_nodep->fixed = 0;
             adr_nodep->next = NULL;


@@ -552,12 +550,12 @@ fix_addresses (char *str) {
          * Walk the list and try to fix broken addresses.
          */
         for (np = adrs; np; np = np->next) {
          * Walk the list and try to fix broken addresses.
          */
         for (np = adrs; np; np = np->next) {

-            char *display_name = strdup (np->adr);
+            char *display_name = mh_xstrdup (np->adr);

             size_t len = strlen (display_name);
 
             if (np->escape_local_part) {
                 char *local_part_end = strrchr (display_name, '<');
             size_t len = strlen (display_name);
 
             if (np->escape_local_part) {
                 char *local_part_end = strrchr (display_name, '<');

-                char *angle_addr = strdup (local_part_end);
+                char *angle_addr = mh_xstrdup (local_part_end);

                 struct mailname *mp;
                 char *new_adr, *adr;
 
                 struct mailname *mp;
                 char *new_adr, *adr;
 


@@ -578,7 +576,7 @@ fix_addresses (char *str) {
                 free (angle_addr);
                 free (new_adr);
                 free (np->adr);
                 free (angle_addr);
                 free (new_adr);
                 free (np->adr);

-                np->adr = strdup (adr);
+                np->adr = mh_xstrdup (adr);

 
                 /* Need to flush getname() */
                 while ((cp = getname (""))) continue;
 
                 /* Need to flush getname() */
                 while ((cp = getname (""))) continue;


@@ -601,7 +599,7 @@ fix_addresses (char *str) {
                     free (fixed_str);
                     fixed_str = new_str;
                 } else {
                     free (fixed_str);
                     fixed_str = new_str;
                 } else {

-                    fixed_str = strdup (np->adr);
+                    fixed_str = mh_xstrdup (np->adr);

                 }
             }
 
                 }
             }
 


@@ -615,5 +613,5 @@ fix_addresses (char *str) {
         return fixed_str;
     }
     free (fixed_str);
         return fixed_str;
     }
     free (fixed_str);

-    return str  ?  strdup (str)  :  NULL;
+    return str  ?  mh_xstrdup (str)  :  NULL;

 }
 }