about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--fedora/branch.mk8
-rw-r--r--stdlib/stdlib.h196
-rw-r--r--string/string.h137
4 files changed, 204 insertions, 142 deletions
diff --git a/ChangeLog b/ChangeLog
index 8113142e53..7aab6f0bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-22  Ulrich Drepper  <drepper@redhat.com>
+
+	* string/string.h: Add __nonnull annotations.
+	* stdlib/stdlib.h: Likewise.
+
 2004-09-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/alpha/sysdep.h (inline_syscall[0-6]): Change name
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 91d751ff05..95e9a8c0c6 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,5 @@
+# This file is updated automatically by Makefile.
 glibc-branch := fedora
-glibc-base   := HEAD
-
-fedora-sync-date := 2004-09-22 05:52 UTC
-fedora-sync-tag := fedora-base
+glibc-base := HEAD
+fedora-sync-date := 2004-09-23 01:48 UTC
+fedora-sync-tag := fedora-glibc-20040923T0148
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index e178568dd3..dc0c712df7 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -139,58 +139,64 @@ extern size_t __ctype_get_mb_cur_max (void) __THROW;
 
 __BEGIN_NAMESPACE_STD
 /* Convert a string to a floating-point number.  */
-extern double atof (__const char *__nptr) __THROW __attribute_pure__;
+extern double atof (__const char *__nptr)
+     __THROW __attribute_pure__ __nonnull ((1));
 /* Convert a string to an integer.  */
-extern int atoi (__const char *__nptr) __THROW __attribute_pure__;
+extern int atoi (__const char *__nptr)
+     __THROW __attribute_pure__ __nonnull ((1));
 /* Convert a string to a long integer.  */
-extern long int atol (__const char *__nptr) __THROW __attribute_pure__;
+extern long int atol (__const char *__nptr)
+     __THROW __attribute_pure__ __nonnull ((1));
 __END_NAMESPACE_STD
 
 #if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC)
 __BEGIN_NAMESPACE_C99
 /* Convert a string to a long long integer.  */
 __extension__ extern long long int atoll (__const char *__nptr)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1));
 __END_NAMESPACE_C99
 #endif
 
 __BEGIN_NAMESPACE_STD
 /* Convert a string to a floating-point number.  */
 extern double strtod (__const char *__restrict __nptr,
-		      char **__restrict __endptr) __THROW;
+		      char **__restrict __endptr) __THROW __nonnull ((1));
 __END_NAMESPACE_STD
 
 #ifdef	__USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Likewise for `float' and `long double' sizes of floating-point numbers.  */
 extern float strtof (__const char *__restrict __nptr,
-		     char **__restrict __endptr) __THROW;
+		     char **__restrict __endptr) __THROW __nonnull ((1));
 
 extern long double strtold (__const char *__restrict __nptr,
-			    char **__restrict __endptr) __THROW;
+			    char **__restrict __endptr)
+     __THROW __nonnull ((1));
 __END_NAMESPACE_C99
 #endif
 
 __BEGIN_NAMESPACE_STD
 /* Convert a string to a long integer.  */
 extern long int strtol (__const char *__restrict __nptr,
-			char **__restrict __endptr, int __base) __THROW;
+			char **__restrict __endptr, int __base)
+     __THROW __nonnull ((1));
 /* Convert a string to an unsigned long integer.  */
 extern unsigned long int strtoul (__const char *__restrict __nptr,
 				  char **__restrict __endptr, int __base)
-     __THROW;
+     __THROW __nonnull ((1));
 __END_NAMESPACE_C99
 
 #if defined __GLIBC_HAVE_LONG_LONG && defined __USE_BSD
 /* Convert a string to a quadword integer.  */
 __extension__
 extern long long int strtoq (__const char *__restrict __nptr,
-			     char **__restrict __endptr, int __base) __THROW;
+			     char **__restrict __endptr, int __base)
+     __THROW __nonnull ((1));
 /* Convert a string to an unsigned quadword integer.  */
 __extension__
 extern unsigned long long int strtouq (__const char *__restrict __nptr,
 				       char **__restrict __endptr, int __base)
-     __THROW;
+     __THROW __nonnull ((1));
 #endif /* GCC and use BSD.  */
 
 #if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC)
@@ -198,12 +204,13 @@ __BEGIN_NAMESPACE_C99
 /* Convert a string to a quadword integer.  */
 __extension__
 extern long long int strtoll (__const char *__restrict __nptr,
-			      char **__restrict __endptr, int __base) __THROW;
+			      char **__restrict __endptr, int __base)
+     __THROW __nonnull ((1));
 /* Convert a string to an unsigned quadword integer.  */
 __extension__
 extern unsigned long long int strtoull (__const char *__restrict __nptr,
 					char **__restrict __endptr, int __base)
-     __THROW;
+     __THROW __nonnull ((1));
 __END_NAMESPACE_C99
 #endif /* ISO C99 or GCC and use MISC.  */
 
@@ -228,33 +235,36 @@ __END_NAMESPACE_C99
    use as an additional parameter.  */
 extern long int strtol_l (__const char *__restrict __nptr,
 			  char **__restrict __endptr, int __base,
-			  __locale_t __loc) __THROW;
+			  __locale_t __loc) __THROW __nonnull ((1, 4));
 
 extern unsigned long int strtoul_l (__const char *__restrict __nptr,
 				    char **__restrict __endptr,
-				    int __base, __locale_t __loc) __THROW;
+				    int __base, __locale_t __loc)
+     __THROW __nonnull ((1, 4));
 
 __extension__
 extern long long int strtoll_l (__const char *__restrict __nptr,
 				char **__restrict __endptr, int __base,
-				__locale_t __loc) __THROW;
+				__locale_t __loc)
+     __THROW __nonnull ((1, 4));
 
 __extension__
 extern unsigned long long int strtoull_l (__const char *__restrict __nptr,
 					  char **__restrict __endptr,
 					  int __base, __locale_t __loc)
-     __THROW;
+     __THROW __nonnull ((1, 4));
 
 extern double strtod_l (__const char *__restrict __nptr,
 			char **__restrict __endptr, __locale_t __loc)
-     __THROW;
+     __THROW __nonnull ((1, 3));
 
 extern float strtof_l (__const char *__restrict __nptr,
-		       char **__restrict __endptr, __locale_t __loc) __THROW;
+		       char **__restrict __endptr, __locale_t __loc)
+     __THROW __nonnull ((1, 3));
 
 extern long double strtold_l (__const char *__restrict __nptr,
 			      char **__restrict __endptr,
-			      __locale_t __loc) __THROW;
+			      __locale_t __loc) __THROW __nonnull ((1, 3));
 #endif /* GNU */
 
 
@@ -263,23 +273,25 @@ extern long double strtold_l (__const char *__restrict __nptr,
 
 extern double __strtod_internal (__const char *__restrict __nptr,
 				 char **__restrict __endptr, int __group)
-     __THROW;
+     __THROW __nonnull ((1));
 extern float __strtof_internal (__const char *__restrict __nptr,
 				char **__restrict __endptr, int __group)
-     __THROW;
+     __THROW __nonnull ((1));
 extern long double __strtold_internal (__const char *__restrict __nptr,
 				       char **__restrict __endptr,
-				       int __group) __THROW;
+				       int __group) __THROW __nonnull ((1));
 #ifndef __strtol_internal_defined
 extern long int __strtol_internal (__const char *__restrict __nptr,
 				   char **__restrict __endptr,
-				   int __base, int __group) __THROW;
+				   int __base, int __group)
+     __THROW __nonnull ((1));
 # define __strtol_internal_defined	1
 #endif
 #ifndef __strtoul_internal_defined
 extern unsigned long int __strtoul_internal (__const char *__restrict __nptr,
 					     char **__restrict __endptr,
-					     int __base, int __group) __THROW;
+					     int __base, int __group)
+     __THROW __nonnull ((1));
 # define __strtoul_internal_defined	1
 #endif
 #if defined __GNUC__ || defined __USE_ISOC99
@@ -287,7 +299,8 @@ extern unsigned long int __strtoul_internal (__const char *__restrict __nptr,
 __extension__
 extern long long int __strtoll_internal (__const char *__restrict __nptr,
 					 char **__restrict __endptr,
-					 int __base, int __group) __THROW;
+					 int __base, int __group)
+     __THROW __nonnull ((1));
 #  define __strtoll_internal_defined	1
 # endif
 # ifndef __strtoull_internal_defined
@@ -296,7 +309,7 @@ extern unsigned long long int __strtoull_internal (__const char *
 						   __restrict __nptr,
 						   char **__restrict __endptr,
 						   int __base, int __group)
-     __THROW;
+     __THROW __nonnull ((1));
 #  define __strtoull_internal_defined	1
 # endif
 #endif /* GCC */
@@ -408,7 +421,8 @@ __END_NAMESPACE_C99
 extern char *l64a (long int __n) __THROW;
 
 /* Read a number from a string S in base 64 as above.  */
-extern long int a64l (__const char *__s) __THROW __attribute_pure__;
+extern long int a64l (__const char *__s)
+     __THROW __attribute_pure__ __nonnull ((1));
 
 #endif	/* Use SVID || extended X/Open.  */
 
@@ -430,11 +444,11 @@ extern void srandom (unsigned int __seed) __THROW;
    32, 64, 128 and 256, the bigger the better; values less than 8 will
    cause an error and values greater than 256 will be rounded down.  */
 extern char *initstate (unsigned int __seed, char *__statebuf,
-			size_t __statelen) __THROW;
+			size_t __statelen) __THROW __nonnull ((2));
 
 /* Switch the random number generator to state buffer STATEBUF,
    which should have been previously initialized by `initstate'.  */
-extern char *setstate (char *__statebuf) __THROW;
+extern char *setstate (char *__statebuf) __THROW __nonnull ((1));
 
 
 # ifdef __USE_MISC
@@ -454,16 +468,19 @@ struct random_data
   };
 
 extern int random_r (struct random_data *__restrict __buf,
-		     int32_t *__restrict __result) __THROW;
+		     int32_t *__restrict __result) __THROW __nonnull ((1, 2));
 
-extern int srandom_r (unsigned int __seed, struct random_data *__buf) __THROW;
+extern int srandom_r (unsigned int __seed, struct random_data *__buf)
+     __THROW __nonnull ((2));
 
 extern int initstate_r (unsigned int __seed, char *__restrict __statebuf,
 			size_t __statelen,
-			struct random_data *__restrict __buf) __THROW;
+			struct random_data *__restrict __buf)
+     __THROW __nonnull ((2, 4));
 
 extern int setstate_r (char *__restrict __statebuf,
-		       struct random_data *__restrict __buf) __THROW;
+		       struct random_data *__restrict __buf)
+     __THROW __nonnull ((1, 2));
 # endif	/* Use misc.  */
 #endif	/* Use SVID || extended X/Open || BSD. */
 
@@ -486,20 +503,23 @@ extern int rand_r (unsigned int *__seed) __THROW;
 
 /* Return non-negative, double-precision floating-point value in [0.0,1.0).  */
 extern double drand48 (void) __THROW;
-extern double erand48 (unsigned short int __xsubi[3]) __THROW;
+extern double erand48 (unsigned short int __xsubi[3]) __THROW __nonnull ((1));
 
 /* Return non-negative, long integer in [0,2^31).  */
 extern long int lrand48 (void) __THROW;
-extern long int nrand48 (unsigned short int __xsubi[3]) __THROW;
+extern long int nrand48 (unsigned short int __xsubi[3])
+     __THROW __nonnull ((1));
 
 /* Return signed, long integers in [-2^31,2^31).  */
 extern long int mrand48 (void) __THROW;
-extern long int jrand48 (unsigned short int __xsubi[3]) __THROW;
+extern long int jrand48 (unsigned short int __xsubi[3])
+     __THROW __nonnull ((1));
 
 /* Seed random number generator.  */
 extern void srand48 (long int __seedval) __THROW;
-extern unsigned short int *seed48 (unsigned short int __seed16v[3]) __THROW;
-extern void lcong48 (unsigned short int __param[7]) __THROW;
+extern unsigned short int *seed48 (unsigned short int __seed16v[3])
+     __THROW __nonnull ((1));
+extern void lcong48 (unsigned short int __param[7]) __THROW __nonnull ((1));
 
 # ifdef __USE_MISC
 /* Data structure for communication with thread safe versions.  This
@@ -516,34 +536,39 @@ struct drand48_data
 
 /* Return non-negative, double-precision floating-point value in [0.0,1.0).  */
 extern int drand48_r (struct drand48_data *__restrict __buffer,
-		      double *__restrict __result) __THROW;
+		      double *__restrict __result) __THROW __nonnull ((1, 2));
 extern int erand48_r (unsigned short int __xsubi[3],
 		      struct drand48_data *__restrict __buffer,
-		      double *__restrict __result) __THROW;
+		      double *__restrict __result) __THROW __nonnull ((1, 2));
 
 /* Return non-negative, long integer in [0,2^31).  */
 extern int lrand48_r (struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result) __THROW;
+		      long int *__restrict __result)
+     __THROW __nonnull ((1, 2));
 extern int nrand48_r (unsigned short int __xsubi[3],
 		      struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result) __THROW;
+		      long int *__restrict __result)
+     __THROW __nonnull ((1, 2));
 
 /* Return signed, long integers in [-2^31,2^31).  */
 extern int mrand48_r (struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result) __THROW;
+		      long int *__restrict __result)
+     __THROW __nonnull ((1, 2));
 extern int jrand48_r (unsigned short int __xsubi[3],
 		      struct drand48_data *__restrict __buffer,
-		      long int *__restrict __result) __THROW;
+		      long int *__restrict __result)
+     __THROW __nonnull ((1, 2));
 
 /* Seed random number generator.  */
 extern int srand48_r (long int __seedval, struct drand48_data *__buffer)
-     __THROW;
+     __THROW __nonnull ((2));
 
 extern int seed48_r (unsigned short int __seed16v[3],
-		     struct drand48_data *__buffer) __THROW;
+		     struct drand48_data *__buffer) __THROW __nonnull ((1, 2));
 
 extern int lcong48_r (unsigned short int __param[7],
-		      struct drand48_data *__buffer) __THROW;
+		      struct drand48_data *__buffer)
+     __THROW __nonnull ((1, 2));
 # endif	/* Use misc.  */
 #endif	/* Use SVID or X/Open.  */
 
@@ -586,7 +611,7 @@ extern void *valloc (size_t __size) __THROW __attribute_malloc__;
 #ifdef __USE_XOPEN2K
 /* Allocate memory of SIZE bytes with an alignment of ALIGNMENT.  */
 extern int posix_memalign (void **__memptr, size_t __alignment, size_t __size)
-     __THROW __attribute_malloc__;
+     __THROW __attribute_malloc__ __nonnull ((1));
 #endif
 
 __BEGIN_NAMESPACE_STD
@@ -595,14 +620,14 @@ extern void abort (void) __THROW __attribute__ ((__noreturn__));
 
 
 /* Register a function to be called when `exit' is called.  */
-extern int atexit (void (*__func) (void)) __THROW;
+extern int atexit (void (*__func) (void)) __THROW __nonnull ((1));
 __END_NAMESPACE_STD
 
 #ifdef	__USE_MISC
 /* Register a function to be called with the status
    given to `exit' and the given argument.  */
 extern int on_exit (void (*__func) (int __status, void *__arg), void *__arg)
-     __THROW;
+     __THROW __nonnull ((1));
 #endif
 
 __BEGIN_NAMESPACE_STD
@@ -623,28 +648,28 @@ __END_NAMESPACE_C99
 
 __BEGIN_NAMESPACE_STD
 /* Return the value of envariable NAME, or NULL if it doesn't exist.  */
-extern char *getenv (__const char *__name) __THROW;
+extern char *getenv (__const char *__name) __THROW __nonnull ((1));
 __END_NAMESPACE_STD
 
 /* This function is similar to the above but returns NULL if the
    programs is running with SUID or SGID enabled.  */
-extern char *__secure_getenv (__const char *__name) __THROW;
+extern char *__secure_getenv (__const char *__name) __THROW __nonnull ((1));
 
 #if defined __USE_SVID || defined __USE_XOPEN
 /* The SVID says this is in <stdio.h>, but this seems a better place.	*/
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.
    If there is no `=', remove NAME from the environment.  */
-extern int putenv (char *__string) __THROW;
+extern int putenv (char *__string) __THROW __nonnull ((1));
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN2K
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
 extern int setenv (__const char *__name, __const char *__value, int __replace)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 
 /* Remove the variable NAME from the environment.  */
-extern int unsetenv (__const char *__name) __THROW;
+extern int unsetenv (__const char *__name) __THROW __nonnull ((1));
 #endif
 
 #ifdef	__USE_MISC
@@ -660,7 +685,7 @@ extern int clearenv (void) __THROW;
    The last six characters of TEMPLATE must be "XXXXXX";
    they are replaced with a string that makes the file name unique.
    Returns TEMPLATE, or a null pointer if it cannot get a unique file name.  */
-extern char *mktemp (char *__template) __THROW;
+extern char *mktemp (char *__template) __THROW __nonnull ((1));
 
 /* Generate a unique temporary file name from TEMPLATE.
    The last six characters of TEMPLATE must be "XXXXXX";
@@ -671,16 +696,16 @@ extern char *mktemp (char *__template) __THROW;
    This function is a possible cancellation points and therefore not
    marked with __THROW.  */
 # ifndef __USE_FILE_OFFSET64
-extern int mkstemp (char *__template);
+extern int mkstemp (char *__template) __nonnull ((1));
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (mkstemp, (char *__template), mkstemp64);
+extern int __REDIRECT (mkstemp, (char *__template), mkstemp64) __nonnull ((1));
 #  else
 #   define mkstemp mkstemp64
 #  endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int mkstemp64 (char *__template);
+extern int mkstemp64 (char *__template) __nonnull ((1));
 # endif
 #endif
 
@@ -690,7 +715,7 @@ extern int mkstemp64 (char *__template);
    they are replaced with a string that makes the directory name unique.
    Returns TEMPLATE, or a null pointer if it cannot get a unique name.
    The directory is created mode 700.  */
-extern char *mkdtemp (char *__template) __THROW;
+extern char *mkdtemp (char *__template) __THROW __nonnull ((1));
 #endif
 
 
@@ -707,7 +732,8 @@ __END_NAMESPACE_STD
 /* Return a malloc'd string containing the canonical absolute name of the
    named file.  The last file name component need not exist, and may be a
    symlink to a nonexistent file.  */
-extern char *canonicalize_file_name (__const char *__name) __THROW;
+extern char *canonicalize_file_name (__const char *__name)
+     __THROW __nonnull ((1));
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
@@ -718,7 +744,7 @@ extern char *canonicalize_file_name (__const char *__name) __THROW;
    ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the
    name in RESOLVED.  */
 extern char *realpath (__const char *__restrict __name,
-		       char *__restrict __resolved) __THROW;
+		       char *__restrict __resolved) __THROW __nonnull ((1));
 #endif
 
 
@@ -736,12 +762,13 @@ __BEGIN_NAMESPACE_STD
 /* Do a binary search for KEY in BASE, which consists of NMEMB elements
    of SIZE bytes each, using COMPAR to perform the comparisons.  */
 extern void *bsearch (__const void *__key, __const void *__base,
-		      size_t __nmemb, size_t __size, __compar_fn_t __compar);
+		      size_t __nmemb, size_t __size, __compar_fn_t __compar)
+     __nonnull ((1, 2, 5));
 
 /* Sort NMEMB elements of BASE, of SIZE bytes each,
    using COMPAR to perform the comparisons.  */
 extern void qsort (void *__base, size_t __nmemb, size_t __size,
-		   __compar_fn_t __compar);
+		   __compar_fn_t __compar) __nonnull ((1, 4));
 
 
 /* Return the absolute value of X.  */
@@ -782,44 +809,50 @@ __END_NAMESPACE_C99
    this.  Set *DECPT with the position of the decimal character and *SIGN
    with the sign of the number.  */
 extern char *ecvt (double __value, int __ndigit, int *__restrict __decpt,
-		   int *__restrict __sign) __THROW;
+		   int *__restrict __sign) __THROW __nonnull ((3, 4));
 
 /* Convert VALUE to a string rounded to NDIGIT decimal digits.  Set *DECPT
    with the position of the decimal character and *SIGN with the sign of
    the number.  */
 extern char *fcvt (double __value, int __ndigit, int *__restrict __decpt,
-		   int *__restrict __sign) __THROW;
+		   int *__restrict __sign) __THROW __nonnull ((3, 4));
 
 /* If possible convert VALUE to a string with NDIGIT significant digits.
    Otherwise use exponential representation.  The resulting string will
    be written to BUF.  */
-extern char *gcvt (double __value, int __ndigit, char *__buf) __THROW;
+extern char *gcvt (double __value, int __ndigit, char *__buf)
+     __THROW __nonnull ((3));
 
 
 # ifdef __USE_MISC
 /* Long double versions of above functions.  */
 extern char *qecvt (long double __value, int __ndigit,
-		    int *__restrict __decpt, int *__restrict __sign) __THROW;
+		    int *__restrict __decpt, int *__restrict __sign)
+     __THROW __nonnull ((3, 4));
 extern char *qfcvt (long double __value, int __ndigit,
-		    int *__restrict __decpt, int *__restrict __sign) __THROW;
-extern char *qgcvt (long double __value, int __ndigit, char *__buf) __THROW;
+		    int *__restrict __decpt, int *__restrict __sign)
+     __THROW __nonnull ((3, 4));
+extern char *qgcvt (long double __value, int __ndigit, char *__buf)
+     __THROW __nonnull ((3));
 
 
 /* Reentrant version of the functions above which provide their own
    buffers.  */
 extern int ecvt_r (double __value, int __ndigit, int *__restrict __decpt,
 		   int *__restrict __sign, char *__restrict __buf,
-		   size_t __len) __THROW;
+		   size_t __len) __THROW __nonnull ((3, 4, 5));
 extern int fcvt_r (double __value, int __ndigit, int *__restrict __decpt,
 		   int *__restrict __sign, char *__restrict __buf,
-		   size_t __len) __THROW;
+		   size_t __len) __THROW __nonnull ((3, 4, 5));
 
 extern int qecvt_r (long double __value, int __ndigit,
 		    int *__restrict __decpt, int *__restrict __sign,
-		    char *__restrict __buf, size_t __len) __THROW;
+		    char *__restrict __buf, size_t __len)
+     __THROW __nonnull ((3, 4, 5));
 extern int qfcvt_r (long double __value, int __ndigit,
 		    int *__restrict __decpt, int *__restrict __sign,
-		    char *__restrict __buf, size_t __len) __THROW;
+		    char *__restrict __buf, size_t __len)
+     __THROW __nonnull ((3, 4, 5));
 # endif	/* misc */
 #endif	/* use MISC || use X/Open Unix */
 
@@ -852,7 +885,7 @@ __END_NAMESPACE_STD
    or negative response expression as specified by the LC_MESSAGES category
    in the program's current locale.  Returns 1 if affirmative, 0 if
    negative, and -1 if not matching.  */
-extern int rpmatch (__const char *__response) __THROW;
+extern int rpmatch (__const char *__response) __THROW __nonnull ((1));
 #endif
 
 
@@ -865,13 +898,14 @@ extern int rpmatch (__const char *__response) __THROW;
    token or at the terminating NUL character.  */
 extern int getsubopt (char **__restrict __optionp,
 		      char *__const *__restrict __tokens,
-		      char **__restrict __valuep) __THROW;
+		      char **__restrict __valuep)
+     __THROW __nonnull ((1, 2, 3));
 #endif
 
 
 #ifdef __USE_XOPEN
 /* Setup DES tables according KEY.  */
-extern void setkey (__const char *__key) __THROW;
+extern void setkey (__const char *__key) __THROW __nonnull ((1));
 #endif
 
 
@@ -903,7 +937,8 @@ extern char *ptsname (int __fd) __THROW;
 /* Store at most BUFLEN characters of the pathname of the slave pseudo
    terminal associated with the master FD is open on in BUF.
    Return 0 on success, otherwise an error number.  */
-extern int ptsname_r (int __fd, char *__buf, size_t __buflen) __THROW;
+extern int ptsname_r (int __fd, char *__buf, size_t __buflen)
+     __THROW __nonnull ((2));
 
 /* Open a master pseudo terminal and return its file descriptor.  */
 extern int getpt (void);
@@ -913,7 +948,8 @@ extern int getpt (void);
 /* Put the 1 minute, 5 minute and 15 minute load averages into the first
    NELEM elements of LOADAVG.  Return the number written (never more than
    three, but may be less than NELEM), or -1 if an error occurred.  */
-extern int getloadavg (double __loadavg[], int __nelem) __THROW;
+extern int getloadavg (double __loadavg[], int __nelem)
+     __THROW __nonnull ((1));
 #endif
 
 #endif /* don't just need malloc and calloc */
diff --git a/string/string.h b/string/string.h
index d62594bc4c..4ea3a74ca7 100644
--- a/string/string.h
+++ b/string/string.h
@@ -36,11 +36,12 @@ __BEGIN_DECLS
 __BEGIN_NAMESPACE_STD
 /* Copy N bytes of SRC to DEST.  */
 extern void *memcpy (void *__restrict __dest,
-		     __const void *__restrict __src, size_t __n) __THROW;
+		     __const void *__restrict __src, size_t __n)
+     __THROW __nonnull ((1, 2));
 /* Copy N bytes of SRC to DEST, guaranteeing
    correct behavior for overlapping strings.  */
 extern void *memmove (void *__dest, __const void *__src, size_t __n)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 __END_NAMESPACE_STD
 
 /* Copy no more than N bytes of SRC to DEST, stopping when C is found.
@@ -49,62 +50,65 @@ __END_NAMESPACE_STD
 #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN
 extern void *memccpy (void *__restrict __dest, __const void *__restrict __src,
 		      int __c, size_t __n)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 #endif /* SVID.  */
 
 
 __BEGIN_NAMESPACE_STD
 /* Set N bytes of S to C.  */
-extern void *memset (void *__s, int __c, size_t __n) __THROW;
+extern void *memset (void *__s, int __c, size_t __n) __THROW __nonnull ((1));
 
 /* Compare N bytes of S1 and S2.  */
 extern int memcmp (__const void *__s1, __const void *__s2, size_t __n)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 
 /* Search N bytes of S for C.  */
 extern void *memchr (__const void *__s, int __c, size_t __n)
-      __THROW __attribute_pure__;
+      __THROW __attribute_pure__ __nonnull ((1));
 __END_NAMESPACE_STD
 
 #ifdef __USE_GNU
 /* Search in S for C.  This is similar to `memchr' but there is no
    length limit.  */
-extern void *rawmemchr (__const void *__s, int __c) __THROW __attribute_pure__;
+extern void *rawmemchr (__const void *__s, int __c)
+     __THROW __attribute_pure__ __nonnull ((1));
 
 /* Search N bytes of S for the final occurrence of C.  */
 extern void *memrchr (__const void *__s, int __c, size_t __n)
-      __THROW __attribute_pure__;
+      __THROW __attribute_pure__ __nonnull ((1));
 #endif
 
 
 __BEGIN_NAMESPACE_STD
 /* Copy SRC to DEST.  */
 extern char *strcpy (char *__restrict __dest, __const char *__restrict __src)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 /* Copy no more than N characters of SRC to DEST.  */
 extern char *strncpy (char *__restrict __dest,
-		      __const char *__restrict __src, size_t __n) __THROW;
+		      __const char *__restrict __src, size_t __n)
+     __THROW __nonnull ((1, 2));
 
 /* Append SRC onto DEST.  */
 extern char *strcat (char *__restrict __dest, __const char *__restrict __src)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 /* Append no more than N characters from SRC onto DEST.  */
 extern char *strncat (char *__restrict __dest, __const char *__restrict __src,
-		      size_t __n) __THROW;
+		      size_t __n) __THROW __nonnull ((1, 2));
 
 /* Compare S1 and S2.  */
 extern int strcmp (__const char *__s1, __const char *__s2)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 /* Compare N characters of S1 and S2.  */
 extern int strncmp (__const char *__s1, __const char *__s2, size_t __n)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 
 /* Compare the collated forms of S1 and S2.  */
 extern int strcoll (__const char *__s1, __const char *__s2)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 /* Put a transformation of SRC into no more than N bytes of DEST.  */
 extern size_t strxfrm (char *__restrict __dest,
-		       __const char *__restrict __src, size_t __n) __THROW;
+		       __const char *__restrict __src, size_t __n)
+     __THROW __nonnull ((2));
 __END_NAMESPACE_STD
 
 #ifdef __USE_GNU
@@ -115,15 +119,16 @@ __END_NAMESPACE_STD
 
 /* Compare the collated forms of S1 and S2 using rules from L.  */
 extern int strcoll_l (__const char *__s1, __const char *__s2, __locale_t __l)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2, 3));
 /* Put a transformation of SRC into no more than N bytes of DEST.  */
 extern size_t strxfrm_l (char *__dest, __const char *__src, size_t __n,
-			 __locale_t __l) __THROW;
+			 __locale_t __l) __THROW __nonnull ((2, 4));
 #endif
 
 #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 /* Duplicate S, returning an identical malloc'd string.  */
-extern char *strdup (__const char *__s) __THROW __attribute_malloc__;
+extern char *strdup (__const char *__s)
+     __THROW __attribute_malloc__ __nonnull ((1));
 #endif
 
 /* Return a malloc'd copy of at most N bytes of STRING.  The
@@ -131,7 +136,7 @@ extern char *strdup (__const char *__s) __THROW __attribute_malloc__;
    appears before STRING[N].  */
 #if defined __USE_GNU
 extern char *strndup (__const char *__string, size_t __n)
-     __THROW __attribute_malloc__;
+     __THROW __attribute_malloc__ __nonnull ((1));
 #endif
 
 #if defined __USE_GNU && defined __GNUC__
@@ -159,53 +164,58 @@ extern char *strndup (__const char *__string, size_t __n)
 
 __BEGIN_NAMESPACE_STD
 /* Find the first occurrence of C in S.  */
-extern char *strchr (__const char *__s, int __c) __THROW __attribute_pure__;
+extern char *strchr (__const char *__s, int __c)
+     __THROW __attribute_pure__ __nonnull ((1));
 /* Find the last occurrence of C in S.  */
-extern char *strrchr (__const char *__s, int __c) __THROW __attribute_pure__;
+extern char *strrchr (__const char *__s, int __c)
+     __THROW __attribute_pure__ __nonnull ((1));
 __END_NAMESPACE_STD
 
 #ifdef __USE_GNU
 /* This function is similar to `strchr'.  But it returns a pointer to
    the closing NUL byte in case C is not found in S.  */
-extern char *strchrnul (__const char *__s, int __c) __THROW __attribute_pure__;
+extern char *strchrnul (__const char *__s, int __c)
+     __THROW __attribute_pure__ __nonnull ((1));
 #endif
 
 __BEGIN_NAMESPACE_STD
 /* Return the length of the initial segment of S which
    consists entirely of characters not in REJECT.  */
 extern size_t strcspn (__const char *__s, __const char *__reject)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 /* Return the length of the initial segment of S which
    consists entirely of characters in ACCEPT.  */
 extern size_t strspn (__const char *__s, __const char *__accept)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 /* Find the first occurrence in S of any character in ACCEPT.  */
 extern char *strpbrk (__const char *__s, __const char *__accept)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
 extern char *strstr (__const char *__haystack, __const char *__needle)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 
 
 /* Divide S into tokens separated by characters in DELIM.  */
 extern char *strtok (char *__restrict __s, __const char *__restrict __delim)
-     __THROW;
+     __THROW __nonnull ((2));
 __END_NAMESPACE_STD
 
 /* Divide S into tokens separated by characters in DELIM.  Information
    passed between calls are stored in SAVE_PTR.  */
 extern char *__strtok_r (char *__restrict __s,
 			 __const char *__restrict __delim,
-			 char **__restrict __save_ptr) __THROW;
+			 char **__restrict __save_ptr)
+     __THROW __nonnull ((2, 3));
 #if defined __USE_POSIX || defined __USE_MISC
 extern char *strtok_r (char *__restrict __s, __const char *__restrict __delim,
-		       char **__restrict __save_ptr) __THROW;
+		       char **__restrict __save_ptr)
+     __THROW __nonnull ((2, 3));
 #endif
 
 #ifdef __USE_GNU
 /* Similar to `strstr' but this function ignores the case of both strings.  */
 extern char *strcasestr (__const char *__haystack, __const char *__needle)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 #endif
 
 #ifdef __USE_GNU
@@ -214,27 +224,30 @@ extern char *strcasestr (__const char *__haystack, __const char *__needle)
    HAYSTACK is HAYSTACKLEN bytes long.  */
 extern void *memmem (__const void *__haystack, size_t __haystacklen,
 		     __const void *__needle, size_t __needlelen)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 3));
 
 /* Copy N bytes of SRC to DEST, return pointer to bytes after the
    last written byte.  */
 extern void *__mempcpy (void *__restrict __dest,
-			__const void *__restrict __src, size_t __n) __THROW;
+			__const void *__restrict __src, size_t __n)
+     __THROW __nonnull ((1, 2));
 extern void *mempcpy (void *__restrict __dest,
-		      __const void *__restrict __src, size_t __n) __THROW;
+		      __const void *__restrict __src, size_t __n)
+     __THROW __nonnull ((1, 2));
 #endif
 
 
 __BEGIN_NAMESPACE_STD
 /* Return the length of S.  */
-extern size_t strlen (__const char *__s) __THROW __attribute_pure__;
+extern size_t strlen (__const char *__s)
+     __THROW __attribute_pure__ __nonnull ((1));
 __END_NAMESPACE_STD
 
 #ifdef	__USE_GNU
 /* Find the length of STRING, but scan at most MAXLEN characters.
    If no '\0' terminator is found in that many characters, return MAXLEN.  */
 extern size_t strnlen (__const char *__string, size_t __maxlen)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1));
 #endif
 
 
@@ -256,39 +269,43 @@ __END_NAMESPACE_STD
 #  ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (strerror_r,
 			   (int __errnum, char *__buf, size_t __buflen),
-			   __xpg_strerror_r);
+			   __xpg_strerror_r) __nonnull ((2));
 #  else
 extern int __xpg_strerror_r (int __errnum, char *__buf, size_t __buflen)
-     __THROW;
+     __THROW __nonnull ((2));
 #   define strerror_r __xpg_strerror_r
 #  endif
 # else
 /* If a temporary buffer is required, at most BUFLEN bytes of BUF will be
    used.  */
-extern char *strerror_r (int __errnum, char *__buf, size_t __buflen) __THROW;
+extern char *strerror_r (int __errnum, char *__buf, size_t __buflen)
+     __THROW __nonnull ((2));
 # endif
 #endif
 
 /* We define this function always since `bzero' is sometimes needed when
    the namespace rules does not allow this.  */
-extern void __bzero (void *__s, size_t __n) __THROW;
+extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1));
 
 #ifdef __USE_BSD
 /* Copy N bytes of SRC to DEST (like memmove, but args reversed).  */
-extern void bcopy (__const void *__src, void *__dest, size_t __n) __THROW;
+extern void bcopy (__const void *__src, void *__dest, size_t __n)
+     __THROW __nonnull ((1, 2));
 
 /* Set N bytes of S to 0.  */
-extern void bzero (void *__s, size_t __n) __THROW;
+extern void bzero (void *__s, size_t __n) __THROW __nonnull ((1));
 
 /* Compare N bytes of S1 and S2 (same as memcmp).  */
 extern int bcmp (__const void *__s1, __const void *__s2, size_t __n)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 
 /* Find the first occurrence of C in S (same as strchr).  */
-extern char *index (__const char *__s, int __c) __THROW __attribute_pure__;
+extern char *index (__const char *__s, int __c)
+     __THROW __attribute_pure__ __nonnull ((1));
 
 /* Find the last occurrence of C in S (same as strrchr).  */
-extern char *rindex (__const char *__s, int __c) __THROW __attribute_pure__;
+extern char *rindex (__const char *__s, int __c)
+     __THROW __attribute_pure__ __nonnull ((1));
 
 /* Return the position of the first bit set in I, or 0 if none are set.
    The least-significant bit is position 1, the most-significant 32.  */
@@ -306,64 +323,68 @@ __extension__ extern int ffsll (long long int __ll)
 
 /* Compare S1 and S2, ignoring case.  */
 extern int strcasecmp (__const char *__s1, __const char *__s2)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 
 /* Compare no more than N chars of S1 and S2, ignoring case.  */
 extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 #endif /* Use BSD.  */
 
 #ifdef	__USE_GNU
 /* Again versions of a few functions which use the given locale instead
    of the global one.  */
 extern int strcasecmp_l (__const char *__s1, __const char *__s2,
-			 __locale_t __loc) __THROW __attribute_pure__;
+			 __locale_t __loc)
+     __THROW __attribute_pure__ __nonnull ((1, 2, 3));
 
 extern int strncasecmp_l (__const char *__s1, __const char *__s2,
 			  size_t __n, __locale_t __loc)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2, 4));
 #endif
 
 #ifdef	__USE_BSD
 /* Return the next DELIM-delimited token from *STRINGP,
    terminating it with a '\0', and update *STRINGP to point past it.  */
 extern char *strsep (char **__restrict __stringp,
-		     __const char *__restrict __delim) __THROW;
+		     __const char *__restrict __delim)
+     __THROW __nonnull ((1, 2));
 #endif
 
 #ifdef	__USE_GNU
 /* Compare S1 and S2 as strings holding name & indices/version numbers.  */
 extern int strverscmp (__const char *__s1, __const char *__s2)
-     __THROW __attribute_pure__;
+     __THROW __attribute_pure__ __nonnull ((1, 2));
 
 /* Return a string describing the meaning of the signal number in SIG.  */
 extern char *strsignal (int __sig) __THROW;
 
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
 extern char *__stpcpy (char *__restrict __dest, __const char *__restrict __src)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 extern char *stpcpy (char *__restrict __dest, __const char *__restrict __src)
-     __THROW;
+     __THROW __nonnull ((1, 2));
 
 /* Copy no more than N characters of SRC to DEST, returning the address of
    the last character written into DEST.  */
 extern char *__stpncpy (char *__restrict __dest,
-			__const char *__restrict __src, size_t __n) __THROW;
+			__const char *__restrict __src, size_t __n)
+     __THROW __nonnull ((1, 2));
 extern char *stpncpy (char *__restrict __dest,
-		      __const char *__restrict __src, size_t __n) __THROW;
+		      __const char *__restrict __src, size_t __n)
+     __THROW __nonnull ((1, 2));
 
 /* Sautee STRING briskly.  */
-extern char *strfry (char *__string) __THROW;
+extern char *strfry (char *__string) __THROW __nonnull ((1));
 
 /* Frobnicate N bytes of S.  */
-extern void *memfrob (void *__s, size_t __n) __THROW;
+extern void *memfrob (void *__s, size_t __n) __THROW __nonnull ((1));
 
 # ifndef basename
 /* Return the file name within directory of FILENAME.  We don't
    declare the function if the `basename' macro is available (defined
    in <libgen.h>) which makes the XPG version of this function
    available.  */
-extern char *basename (__const char *__filename) __THROW;
+extern char *basename (__const char *__filename) __THROW __nonnull ((1));
 # endif
 #endif