aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-23 19:41:48 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-23 19:41:48 +0000
commitd64a397a543831f55bded895dca6f00f093ef4ee (patch)
tree6d2d95600c7fd21a6793b27e9b9b53b604ab9374
parent33e09162d0187eddf91bafa5e64f9d413a5a920f (diff)
downloadglibc-d64a397a543831f55bded895dca6f00f093ef4ee.zip
glibc-d64a397a543831f55bded895dca6f00f093ef4ee.tar.gz
glibc-d64a397a543831f55bded895dca6f00f093ef4ee.tar.bz2
Update.
2000-11-23 Ulrich Drepper <drepper@redhat.com> * tst-digits.c (main): Add casts to avoid warnings. * collate-test.c (xstrcoll): Make l1 and l2 const. * xfrm-test.c (xstrcmp): Make l1 and l2 const.
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/collate-test.c4
-rw-r--r--localedata/tst-digits.c16
-rw-r--r--localedata/xfrm-test.c4
4 files changed, 18 insertions, 12 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 1d491f4..4bea33c 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-23 Ulrich Drepper <drepper@redhat.com>
+
+ * tst-digits.c (main): Add casts to avoid warnings.
+ * collate-test.c (xstrcoll): Make l1 and l2 const.
+ * xfrm-test.c (xstrcmp): Make l1 and l2 const.
+
2000-11-20 Ulrich Drepper <drepper@redhat.com>
* charmaps/BALTIC: Superceded by ISO-8859-13.
diff --git a/localedata/collate-test.c b/localedata/collate-test.c
index 789b371..4003f3f 100644
--- a/localedata/collate-test.c
+++ b/localedata/collate-test.c
@@ -116,8 +116,8 @@ xstrcoll (ptr1, ptr2)
const void *ptr1;
const void *ptr2;
{
- struct lines *l1 = (struct lines *) ptr1;
- struct lines *l2 = (struct lines *) ptr2;
+ const struct lines *l1 = (const struct lines *) ptr1;
+ const struct lines *l2 = (const struct lines *) ptr2;
return strcoll (l1->key, l2->key);
}
diff --git a/localedata/tst-digits.c b/localedata/tst-digits.c
index ae6b378..9312248 100644
--- a/localedata/tst-digits.c
+++ b/localedata/tst-digits.c
@@ -67,6 +67,8 @@ static struct printf_int_test
{ 123456, "%I'10d", ONE TWO THREE "," FOUR FIVE SIX },
{ 1234567, "%I'10d", ONE "," TWO THREE FOUR "," FIVE SIX SEVEN }
};
+#define nprintf_int_tests \
+ (sizeof (printf_int_tests) / sizeof (printf_int_tests[0]))
#define WZERO L"\x2080"
#define WONE L"\x2081"
@@ -106,7 +108,8 @@ static struct wprintf_int_test
{ 123456, L"%I'10d", L" " WONE WTWO WTHREE L"," WFOUR WFIVE WSIX },
{ 1234567, L"%I'10d", L" " WONE L"," WTWO WTHREE WFOUR L"," WFIVE WSIX WSEVEN }
};
-
+#define nwprintf_int_tests \
+ (sizeof (wprintf_int_tests) / sizeof (wprintf_int_tests[0]))
int
@@ -125,8 +128,7 @@ main (void)
/* First: printf tests. */
failures = 0;
- for (cnt = 0; cnt < sizeof (printf_int_tests) / sizeof (printf_int_tests[0]);
- ++cnt)
+ for (cnt = 0; cnt < (int) nprintf_int_tests; ++cnt)
{
char buf[100];
ssize_t n;
@@ -137,7 +139,7 @@ main (void)
printf ("%3d: got \"%s\", expected \"%s\"",
cnt, buf, printf_int_tests[cnt].expected);
- if (n != strlen (printf_int_tests[cnt].expected)
+ if (n != (ssize_t) strlen (printf_int_tests[cnt].expected)
|| strcmp (buf, printf_int_tests[cnt].expected) != 0)
{
puts (" -> FAILED");
@@ -152,9 +154,7 @@ main (void)
/* wprintf tests. */
failures = 0;
- for (cnt = 0;
- cnt < sizeof (wprintf_int_tests) / sizeof (wprintf_int_tests[0]);
- ++cnt)
+ for (cnt = 0; cnt < (int) nwprintf_int_tests; ++cnt)
{
wchar_t buf[100];
ssize_t n;
@@ -166,7 +166,7 @@ main (void)
printf ("%3d: got \"%ls\", expected \"%ls\"",
cnt, buf, wprintf_int_tests[cnt].expected);
- if (n != wcslen (wprintf_int_tests[cnt].expected)
+ if (n != (ssize_t) wcslen (wprintf_int_tests[cnt].expected)
|| wcscmp (buf, wprintf_int_tests[cnt].expected) != 0)
{
puts (" -> FAILED");
diff --git a/localedata/xfrm-test.c b/localedata/xfrm-test.c
index 7a9cbf8..bc12fcd 100644
--- a/localedata/xfrm-test.c
+++ b/localedata/xfrm-test.c
@@ -127,8 +127,8 @@ xstrcmp (ptr1, ptr2)
const void *ptr1;
const void *ptr2;
{
- struct lines *l1 = (struct lines *) ptr1;
- struct lines *l2 = (struct lines *) ptr2;
+ const struct lines *l1 = (const struct lines *) ptr1;
+ const struct lines *l2 = (const struct lines *) ptr2;
return strcmp (l1->xfrm, l2->xfrm);
}