about summary refs log tree commit diff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 79d22ab98d..500d8627eb 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -255,7 +255,7 @@ setlocale (int category, const char *name)
 	  char *n = alloca (len);
 	  memcpy (n, name, len);
 
-	  while (p = strchr (n, '='))
+	  while ((p = strchr (n, '=')) != NULL)
 	    {
 	      for (i = 0; i < LC_ALL; ++i)
 		if (_nl_category_name_sizes[i] == p - n &&
@@ -353,7 +353,7 @@ setlocale (int category, const char *name)
 	}
 
       /* Now we have loaded all the new data.  Put it in place.  */
-      for (; category < LC_ALL; ++category)
+      for (category = 0; category < LC_ALL; ++category)
 	{
 	  setdata (category, newdata[category]);
 	  setname (category, newnames[category]);