Fewer macros in transform.c

* src/transform.c (CASE_CTL_RESET): Remove, replacing with one
instance of code (with a goto, alas).  Still a bit clearer, I think.

diff --git a/src/transform.c b/src/transform.c
index b0023915acc8e235eb4a4b041c2622e90ac47786..aff88910048e52f2eceb2c47cfae614db324d319 100644 (file)
--- a/src/transform.c
+++ b/src/transform.c
@@ -464,15 +464,6 @@ _single_transform_name_to_obstack (struct transform *tf, char *input)
   size_t nmatches = 0;
   enum case_ctl_type case_ctl = ctl_stop,  /* Current case conversion op */
                      save_ctl = ctl_stop;  /* Saved case_ctl for \u and \l */
-
-  /* Reset case conversion after a single-char operation */
-#define CASE_CTL_RESET()  if (case_ctl == ctl_upcase_next     \
-                             || case_ctl == ctl_locase_next) \
-                            {                                 \
-                              case_ctl = save_ctl;            \
-                              save_ctl = ctl_stop;            \
-                           }
-
   regmatch_t *rmp = xinmalloc (tf->regex.re_nsub + 1, sizeof *rmp);
 
   while (*input)
@@ -506,7 +497,14 @@ _single_transform_name_to_obstack (struct transform *tf, char *input)
                  run_case_conv (case_ctl,
                                 segm->v.literal.ptr,
                                 segm->v.literal.size);
-                 CASE_CTL_RESET ();
+               case_ctl_reset:
+                 /* Reset case conversion after a single-char operation.  */
+                 if (case_ctl == ctl_upcase_next
+                     || case_ctl == ctl_locase_next)
+                   {
+                     case_ctl = save_ctl;
+                     save_ctl = ctl_stop;
+                   }
                  break;
 
                case segm_backref:    /* Back-reference segment */
@@ -517,7 +515,7 @@ _single_transform_name_to_obstack (struct transform *tf, char *input)
                                      - rmp[segm->v.ref].rm_so;
                      run_case_conv (case_ctl,
                                     input + rmp[segm->v.ref].rm_so, size);
-                     CASE_CTL_RESET ();
+                     goto case_ctl_reset;
                    }
                  break;