|
@@ -22,6 +22,9 @@
|
|
|
/* We don't need and should not read this file if <string.h> was already
|
|
|
read. The one exception being that if __USE_BSD isn't defined, then
|
|
|
these aren't defined in string.h, so we need to define them here. */
|
|
|
+
|
|
|
+/* keep this file in sync w/ string.h, the glibc version is out of date */
|
|
|
+
|
|
|
#if !defined _STRING_H || !defined __USE_BSD
|
|
|
|
|
|
# include <features.h>
|
|
@@ -30,33 +33,46 @@
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
|
|
-/* 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__;
|
|
|
-
|
|
|
/* 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));
|
|
|
|
|
|
-/* 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. */
|
|
|
-extern int ffs (int __i) __THROW __attribute__ ((const));
|
|
|
+/* 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__ __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. */
|
|
|
+extern int ffs (int __i) __THROW __attribute__ ((__const__));
|
|
|
+
|
|
|
+/* The following two functions are non-standard but necessary for non-32 bit
|
|
|
+ platforms. */
|
|
|
+#if 0 /*def __USE_GNU*/
|
|
|
+extern int ffsl (long int __l) __THROW __attribute__ ((__const__));
|
|
|
+# ifdef __GNUC__
|
|
|
+__extension__ extern int ffsll (long long int __ll)
|
|
|
+ __THROW __attribute__ ((__const__));
|
|
|
+# endif
|
|
|
+# endif
|
|
|
|
|
|
/* 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));
|
|
|
|
|
|
__END_DECLS
|
|
|
|