about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/tests-mbwc/tst_wcscpy.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 448f8fb50e..9c2c2c8a32 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-21  Marek Polacek  <polacek@redhat.com>
+
+	* tests-mbwc/tst_wcscpy.c (tst_wcscpy): Fix condition.
+
 2015-01-02  Joseph Myers  <joseph@codesourcery.com>
 
 	* All files with FSF copyright notices: Update copyright dates
diff --git a/localedata/tests-mbwc/tst_wcscpy.c b/localedata/tests-mbwc/tst_wcscpy.c
index d5705a55dc..a30a6e5f78 100644
--- a/localedata/tests-mbwc/tst_wcscpy.c
+++ b/localedata/tests-mbwc/tst_wcscpy.c
@@ -41,7 +41,7 @@ tst_wcscpy (FILE * fp, int debug_flg)
 	  ws_ex = TST_EXPECT (wcscpy).ws;
 
 	  for (err = 0, i = 0;
-	       (ws1[i] != 0L || ws_ex[i] != 0L) && i < WCSSIZE; i++)
+	       i < WCSSIZE && (ws1[i] != 0L || ws_ex[i] != 0L); i++)
 	    {
 	      if (debug_flg)
 		{