mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Update.
2004-09-22 Ulrich Drepper <drepper@redhat.com> * string/string.h: Add __nonnull annotations. * stdlib/stdlib.h: Likewise.
This commit is contained in:
Ulrich Drepper
137
string/string.h
137
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user