Add braces to make gcc quiet.
authordrepper <drepper>
Mon, 7 Sep 1998 13:17:42 +0000 (13:17 +0000)
committerdrepper <drepper>
Mon, 7 Sep 1998 13:17:42 +0000 (13:17 +0000)
stdlib/strtol.c
string/strcoll.c
string/strxfrm.c

index 2a750d7..93df6ab 100644 (file)
@@ -404,12 +404,14 @@ noconv:
      hexadecimal digits.  This is no error case.  We return 0 and
      ENDPTR points to the `x`.  */
   if (endptr != NULL)
-    if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
-       && save[-2] == L_('0'))
-      *endptr = (STRING_TYPE *) &save[-1];
-    else
-      /*  There was no number to convert.  */
-      *endptr = (STRING_TYPE *) nptr;
+    {
+      if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
+         && save[-2] == L_('0'))
+       *endptr = (STRING_TYPE *) &save[-1];
+      else
+       /*  There was no number to convert.  */
+       *endptr = (STRING_TYPE *) nptr;
+    }
 
   return 0L;
 }
index 8457ef8..08ffd63 100644 (file)
@@ -172,32 +172,35 @@ STRCOLL (s1, s2, l)
          /* We have to increment the index counters.  */
          if ((forward && ++s1idx >= s1run->data[pass].number)
              || (!forward && --s1idx < 0))
-           if (forward)
-             {
-               s1run = s1run->next;
-               s1idx = 0;
-             }
-           else
-             {
-               s1run = s1run->prev;
-               if (s1run != NULL)
-                 s1idx = s1run->data[pass].number - 1;
-             }
+           {
+             if (forward)
+               {
+                 s1run = s1run->next;
+                 s1idx = 0;
+               }
+             else
+               {
+                 s1run = s1run->prev;
+                 if (s1run != NULL)
+                   s1idx = s1run->data[pass].number - 1;
+               }
+           }
 
          if ((forward && ++s2idx >= s2run->data[pass].number)
              || (!forward && --s2idx < 0))
-           if (forward)
-             {
-               s2run = s2run->next;
-               s2idx = 0;
-             }
-           else
-             {
-               s2run = s2run->prev;
-               if (s2run != NULL)
-                 s2idx = s2run->data[pass].number - 1;
-             }
-
+           {
+             if (forward)
+               {
+                 s2run = s2run->next;
+                 s2idx = 0;
+               }
+             else
+               {
+                 s2run = s2run->prev;
+                 if (s2run != NULL)
+                   s2idx = s2run->data[pass].number - 1;
+               }
+           }
        }
 
       if (s1run != s2run)
index 795e8e4..b3e99fb 100644 (file)
@@ -250,17 +250,19 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l)
          /* We have to increment the index counters.  */
          if ((forward && ++idx >= run->data[pass].number)
              || (!forward && --idx < 0))
-           if (forward)
-             {
-               run = run->next;
-               idx = 0;
-             }
-           else
-             {
-               run = run->prev;
-               if (run != NULL)
-                 idx = run->data[pass].number - 1;
-             }
+           {
+             if (forward)
+               {
+                 run = run->next;
+                 idx = 0;
+               }
+             else
+               {
+                 run = run->prev;
+                 if (run != NULL)
+                   idx = run->data[pass].number - 1;
+               }
+           }
        }
 
       /* Write marker for end of word.  */