Skip to content

Commit

Permalink
* debug/pread64_chk.c: Use __libc_pread64 instead of __pread64.
Browse files Browse the repository at this point in the history
	* sysdeps/posix/posix_fallocate64.c: Likewise.
	* include/string.h: Use libc_hidden_proto for strnlen.
	* sysdeps/generic/strnlen.c: Add libc_hidden_def.
	* include/libintl.h: Use libc_hidden_proto for __dcgettext.
	* intl/dcgettext.c: Add libc_hidden_def.
	* include/execinfo.h: Add libc_hidden_proto for __backtrace and
	__backtrace_symbols_fd.
	* sysdeps/generic/backtrace.c: Add libc_hidden_def.
	* sysdeps/generic/backtracesymsfd.c: Likewise.
	* sysdeps/generic/elf/backtracesymsfd.c: Likewise.
	* sysdeps/i386/backtrace.c: Likewise.
	* sysdeps/ia64/backtrace.c: Likewise.
	* sysdeps/powerpc/powerpc32/backtrace.c: Likewise.
	* sysdeps/powerpc/powerpc64/backtrace.c: Likewise.
	* sysdeps/s390/s390-32/backtrace.c: Likewise.
	* sysdeps/s390/s390-64/backtrace.c: Likewise.
  • Loading branch information
Ulrich Drepper committed Jun 14, 2005
1 parent c63d8f8 commit 0e66ade
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 16 deletions.
20 changes: 20 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
2005-06-14 Ulrich Drepper <drepper@redhat.com>

* debug/pread64_chk.c: Use __libc_pread64 instead of __pread64.
* sysdeps/posix/posix_fallocate64.c: Likewise.
* include/string.h: Use libc_hidden_proto for strnlen.
* sysdeps/generic/strnlen.c: Add libc_hidden_def.
* include/libintl.h: Use libc_hidden_proto for __dcgettext.
* intl/dcgettext.c: Add libc_hidden_def.
* include/execinfo.h: Add libc_hidden_proto for __backtrace and
__backtrace_symbols_fd.
* sysdeps/generic/backtrace.c: Add libc_hidden_def.
* sysdeps/generic/backtracesymsfd.c: Likewise.
* sysdeps/generic/elf/backtracesymsfd.c: Likewise.
* sysdeps/i386/backtrace.c: Likewise.
* sysdeps/ia64/backtrace.c: Likewise.
* sysdeps/powerpc/powerpc32/backtrace.c: Likewise.
* sysdeps/powerpc/powerpc64/backtrace.c: Likewise.
* sysdeps/s390/s390-32/backtrace.c: Likewise.
* sysdeps/s390/s390-64/backtrace.c: Likewise.

2005-06-13 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/clock_gettime.c (clock_gettime): Implement case
Expand Down
2 changes: 1 addition & 1 deletion debug/pread64_chk.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ __pread64_chk (int fd, void *buf, size_t nbytes, off64_t offset, size_t buflen)
if (nbytes > buflen)
__chk_fail ();

return __pread64 (fd, buf, nbytes, offset);
return __libc_pread64 (fd, buf, nbytes, offset);
}
2 changes: 2 additions & 0 deletions include/execinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
#include <debug/execinfo.h>

extern int __backtrace (void **__array, int __size);
libc_hidden_proto (__backtrace)

extern char **__backtrace_symbols (void *__const *__array, int __size);

extern void __backtrace_symbols_fd (void *__const *__array, int __size,
int __fd);
libc_hidden_proto (__backtrace_symbols_fd)

#endif
1 change: 1 addition & 0 deletions include/libintl.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ extern char *__dgettext (__const char *__domainname,
extern char *__dcgettext (__const char *__domainname,
__const char *__msgid, int __category)
__attribute_format_arg__ (2);
libc_hidden_proto (__dcgettext)
extern char *__dcgettext_internal (__const char *__domainname,
__const char *__msgid, int __category)
__attribute_format_arg__ (2)
Expand Down
1 change: 1 addition & 0 deletions include/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ libc_hidden_builtin_proto (strcmp)
libc_hidden_builtin_proto (strcpy)
libc_hidden_builtin_proto (strcspn)
libc_hidden_builtin_proto (strlen)
libc_hidden_builtin_proto (strnlen)
libc_hidden_builtin_proto (strncmp)
libc_hidden_builtin_proto (strncpy)
libc_hidden_builtin_proto (strpbrk)
Expand Down
3 changes: 2 additions & 1 deletion intl/dcgettext.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Implementation of the dcgettext(3) function.
Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1995-2002, 2005 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
Expand Down Expand Up @@ -57,4 +57,5 @@ DCGETTEXT (domainname, msgid, category)
/* Alias for function name in GNU C Library. */
INTDEF(__dcgettext)
weak_alias (__dcgettext, dcgettext);
libc_hidden_def (__dcgettext)
#endif
3 changes: 2 additions & 1 deletion sysdeps/generic/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Return backtrace of current program state. Generic version.
Copyright (C) 1998, 2000, 2002, 2004 Free Software Foundation, Inc.
Copyright (C) 1998, 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
Expand Down Expand Up @@ -91,3 +91,4 @@ __backtrace (array, size)
return cnt;
}
weak_alias (__backtrace, backtrace)
libc_hidden_def (__backtrace)
3 changes: 2 additions & 1 deletion sysdeps/generic/backtracesymsfd.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Write formatted list with names for addresses in backtrace to a file.
Copyright (C) 1998, 2003 Free Software Foundation, Inc.
Copyright (C) 1998, 2003, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
Expand Down Expand Up @@ -61,3 +61,4 @@ __backtrace_symbols_fd (array, size, fd)
}
}
weak_alias (__backtrace_symbols_fd, backtrace_symbols_fd)
libc_hidden_def (__backtrace_symbols_fd)
3 changes: 2 additions & 1 deletion sysdeps/generic/elf/backtracesymsfd.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Write formatted list with names for addresses in backtrace to a file.
Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc.
Copyright (C) 1998, 2000, 2003, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
Expand Down Expand Up @@ -107,3 +107,4 @@ __backtrace_symbols_fd (array, size, fd)
}
}
weak_alias (__backtrace_symbols_fd, backtrace_symbols_fd)
libc_hidden_def (__backtrace_symbols_fd)
3 changes: 2 additions & 1 deletion sysdeps/generic/strnlen.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Find the length of STRING, but scan at most MAXLEN characters.
Copyright (C) 1991, 1993, 1997, 2000, 2001 Free Software Foundation, Inc.
Copyright (C) 1991,1993,1997,2000,2001,2005 Free Software Foundation, Inc.
Contributed by Jakub Jelinek <jakub@redhat.com>.
Based on strlen written by Torbjorn Granlund (tege@sics.se),
Expand Down Expand Up @@ -158,3 +158,4 @@ __strnlen (const char *str, size_t maxlen)
return char_ptr - str;
}
weak_alias (__strnlen, strnlen)
libc_hidden_def (strnlen)
3 changes: 2 additions & 1 deletion sysdeps/i386/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Return backtrace of current program state.
Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 1998, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
Expand Down Expand Up @@ -141,3 +141,4 @@ __backtrace (array, size)
return arg.cnt != -1 ? arg.cnt : 0;
}
weak_alias (__backtrace, backtrace)
libc_hidden_def (__backtrace)
3 changes: 2 additions & 1 deletion sysdeps/ia64/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Return backtrace of current program state.
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
Expand Down Expand Up @@ -90,3 +90,4 @@ __backtrace (array, size)
return arg.cnt != -1 ? arg.cnt : 0;
}
weak_alias (__backtrace, backtrace)
libc_hidden_def (__backtrace)
4 changes: 2 additions & 2 deletions sysdeps/posix/posix_fallocate64.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
if (offset < st.st_size)
{
unsigned char c;
ssize_t rsize = __pread64 (fd, &c, 1, offset);
ssize_t rsize = __libc_pread64 (fd, &c, 1, offset);

if (rsize < 0)
return errno;
Expand All @@ -86,7 +86,7 @@ __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
continue;
}

if (__pwrite64 (fd, "", 1, offset) != 1)
if (__libc_pwrite64 (fd, "", 1, offset) != 1)
return errno;
}

Expand Down
3 changes: 2 additions & 1 deletion sysdeps/powerpc/powerpc32/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Return backtrace of current program state.
Copyright (C) 1998, 2000 Free Software Foundation, Inc.
Copyright (C) 1998, 2000, 2005 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
Expand Down Expand Up @@ -64,3 +64,4 @@ __backtrace (void **array, int size)
return count;
}
weak_alias (__backtrace, backtrace)
libc_hidden_def (__backtrace)
3 changes: 2 additions & 1 deletion sysdeps/powerpc/powerpc64/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Return backtrace of current program state.
Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
Copyright (C) 1998, 2000, 2002, 2005 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
Expand Down Expand Up @@ -67,3 +67,4 @@ __backtrace (void **array, int size)
return count;
}
weak_alias (__backtrace, backtrace)
libc_hidden_def (__backtrace)
5 changes: 3 additions & 2 deletions sysdeps/s390/s390-32/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Return backtrace of current program state.
Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -142,3 +142,4 @@ __backtrace (void **array, int size)
}

weak_alias (__backtrace, backtrace)
libc_hidden_def (__backtrace)
5 changes: 3 additions & 2 deletions sysdeps/s390/s390-64/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Return backtrace of current program state. 64 bit S/390 version.
Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -141,3 +141,4 @@ __backtrace (void **array, int size)
}

weak_alias (__backtrace, backtrace)
libc_hidden_def (__backtrace)

0 comments on commit 0e66ade

Please sign in to comment.