Updated to fedora-glibc-20060102T1045

6 files changed, 11 insertions, 11 deletions

diff --git a/posix/bug-regex22.c b/posix/bug-regex22.c
index 1636202d36..c5bc94869b 100644
--- a/posix/bug-regex22.c
+++ b/posix/bug-regex22.c
@@ -1,5 +1,5 @@
 /* Test re.translate != NULL.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
 
@@ -40,7 +40,7 @@ main (void)
   re_set_syntax (RE_SYNTAX_POSIX_EGREP);
 
   memset (&re, 0, sizeof (re));
-  re.translate = trans;
+  re.translate = (unsigned char *) trans;
   s = re_compile_pattern ("\\W", 2, &re);
 
   if (s != NULL)
@@ -68,7 +68,7 @@ main (void)
     }
 
   memset (&re, 0, sizeof (re));
-  re.translate = trans;
+  re.translate = (unsigned char *) trans;
   s = re_compile_pattern ("\\w", 2, &re);
 
   if (s != NULL)
@@ -96,7 +96,7 @@ main (void)
     }
 
   memset (&re, 0, sizeof (re));
-  re.translate = trans;
+  re.translate = (unsigned char *) trans;
   s = re_compile_pattern ("[[:DIGIT:]]", 11, &re);
   if (s == NULL)
     {
@@ -106,7 +106,7 @@ main (void)
     }
 
   memset (&re, 0, sizeof (re));
-  re.translate = trans;
+  re.translate = (unsigned char *) trans;
   s = re_compile_pattern ("[[:DIGIT:]]", 2, &re);
   if (s == NULL)
     {
diff --git a/posix/bug-regex5.c b/posix/bug-regex5.c
index ee4d652157..f199ffbfd3 100644
--- a/posix/bug-regex5.c
+++ b/posix/bug-regex5.c
@@ -41,7 +41,7 @@ main (void)
 	{
 	  char elem[256];
 	  idx = symb_table[2 * i + 1];
-	  strncpy (elem, extra + idx + 1, extra[idx]);
+	  strncpy (elem, (const char *) (extra + idx + 1), extra[idx]);
 	  elem[extra[idx]] = '\0';
 	  printf ("Found a collating element: %s\n", elem);
 	  ++found;
diff --git a/posix/getconf.c b/posix/getconf.c
index 57c1d6a5d6..66e582e995 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 1995-2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 1995-2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -1007,7 +1007,7 @@ main (int argc, char *argv[])
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2005");
+"), "2006");
       fprintf (stderr, gettext ("Written by %s.\n"), "Roland McGrath");
       return 0;
     }
diff --git a/posix/transbug.c b/posix/transbug.c
index 3ae4929593..d0983b4d44 100755
--- a/posix/transbug.c
+++ b/posix/transbug.c
@@ -79,7 +79,7 @@ run_test (const char *pattern, struct re_registers *regs)
       exit (1);
     }
 
-  pat.translate = (char *) casetable;
+  pat.translate = (unsigned char *) casetable;
 
   err = re_compile_pattern (pattern, strlen (pattern), &pat);
   if (err != NULL)
diff --git a/posix/tst-execle1.c b/posix/tst-execle1.c
index bacf51b1a2..84470703f1 100644
--- a/posix/tst-execle1.c
+++ b/posix/tst-execle1.c
@@ -6,7 +6,7 @@ static int
 do_test (void)
 {
   static const char prog[] = "does-not-exist";
-  char *env [] = {"FOO=BAR", NULL};
+  const char *env [] = {"FOO=BAR", NULL};
   errno = 0;
   execle (prog, prog, NULL, env);
 
diff --git a/posix/tst-execle2.c b/posix/tst-execle2.c
index 002d4c938f..0430b7b573 100644
--- a/posix/tst-execle2.c
+++ b/posix/tst-execle2.c
@@ -45,7 +45,7 @@ prepare (int argc, char *argv[])
 static int
 do_test (void)
 {
-  char *env[] = {"FOO=BAR", NULL};
+  const char *env[] = {"FOO=BAR", NULL};
   errno = 0;
   execle (copy, copy, NULL, env);