mchunkptr victim;
#if defined _LIBC || defined MALLOC_HOOKS
- if (__malloc_hook != NULL) {
+ __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, __const __malloc_ptr_t)) =
+ __malloc_hook;
+ if (hook != NULL) {
Void_t* result;
#if defined __GNUC__ && __GNUC__ >= 2
- result = (*__malloc_hook)(bytes, RETURN_ADDRESS (0));
+ result = (*hook)(bytes, RETURN_ADDRESS (0));
#else
- result = (*__malloc_hook)(bytes, NULL);
+ result = (*hook)(bytes, NULL);
#endif
return result;
}
mchunkptr p; /* chunk corresponding to mem */
#if defined _LIBC || defined MALLOC_HOOKS
- if (__free_hook != NULL) {
+ void (*hook) __MALLOC_PMT ((__malloc_ptr_t, __const __malloc_ptr_t)) =
+ __free_hook;
+
+ if (hook != NULL) {
#if defined __GNUC__ && __GNUC__ >= 2
- (*__free_hook)(mem, RETURN_ADDRESS (0));
+ (*hook)(mem, RETURN_ADDRESS (0));
#else
- (*__free_hook)(mem, NULL);
+ (*hook)(mem, NULL);
#endif
return;
}
mchunkptr newp; /* chunk to return */
#if defined _LIBC || defined MALLOC_HOOKS
- if (__realloc_hook != NULL) {
+ __malloc_ptr_t (*hook) __MALLOC_PMT ((__malloc_ptr_t, size_t,
+ __const __malloc_ptr_t)) =
+ __realloc_hook;
+ if (hook != NULL) {
Void_t* result;
#if defined __GNUC__ && __GNUC__ >= 2
- result = (*__realloc_hook)(oldmem, bytes, RETURN_ADDRESS (0));
+ result = (*hook)(oldmem, bytes, RETURN_ADDRESS (0));
#else
- result = (*__realloc_hook)(oldmem, bytes, NULL);
+ result = (*hook)(oldmem, bytes, NULL);
#endif
return result;
}
mchunkptr p;
#if defined _LIBC || defined MALLOC_HOOKS
- if (__memalign_hook != NULL) {
+ __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, size_t,
+ __const __malloc_ptr_t)) =
+ __memalign_hook;
+ if (hook != NULL) {
Void_t* result;
#if defined __GNUC__ && __GNUC__ >= 2
- result = (*__memalign_hook)(alignment, bytes, RETURN_ADDRESS (0));
+ result = (*hook)(alignment, bytes, RETURN_ADDRESS (0));
#else
- result = (*__memalign_hook)(alignment, bytes, NULL);
+ result = (*hook)(alignment, bytes, NULL);
#endif
return result;
}
Void_t* mem;
#if defined _LIBC || defined MALLOC_HOOKS
- if (__malloc_hook != NULL) {
+ __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, __const __malloc_ptr_t)) =
+ __malloc_hook;
+ if (hook != NULL) {
sz = n * elem_size;
#if defined __GNUC__ && __GNUC__ >= 2
- mem = (*__malloc_hook)(sz, RETURN_ADDRESS (0));
+ mem = (*hook)(sz, RETURN_ADDRESS (0));
#else
- mem = (*__malloc_hook)(sz, NULL);
+ mem = (*hook)(sz, NULL);
#endif
if(mem == 0)
return 0;
/* Optimized, inlined string functions. i486 version.
- Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
}
+
+#if defined __USE_GNU
+#define _HAVE_STRING_ARCH_strnlen 1
+__STRING_INLINE size_t
+strnlen (__const char *__string, size_t __maxlen)
+{
+ __const char *__end = (__const char *) memchr (__string, '\0', __maxlen);
+ return __end ? (size_t) (__end - __string) : __maxlen;
+}
+#endif
+
+
/* Copy SRC to DEST. */
#define _HAVE_STRING_ARCH_strcpy 1
#define strcpy(dest, src) \