OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update.

Browse Source 
2004-11-15  Jakub Jelinek  <jakub@redhat.com>

	* posix/bug-regex24.c: Include string.h.

	* nis/nis_clone_obj.c (nis_clone_object): Rename out3 label to out2
	and out2 to out.  Remove out label.  Formatting.

2004-11-15  Ulrich Drepper  <drepper@redhat.com>

	* include/stdio.h: Do not mark __libc_message as noreturn.
	* sysdeps/unix/sysv/linux/libc_fatal.c (__libc_fatal): Add loop to
	fool gcc.  Include <stdbool.h>.
	* sysdeps/posix/libc_fatal.c (__libc_fatal): Add loop to fool gcc.
	(__libc_message): Fix typo.
This commit is contained in:
Ulrich Drepper 2004-11-15 22:00:25 +00:00
parent 4f27c49622
commit f895670da2
6 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2004-11-15 Jakub Jelinek <jakub@redhat.com>
* posix/bug-regex24.c: Include string.h.
* nis/nis_clone_obj.c (nis_clone_object): Rename out3 label to out2
and out2 to out. Remove out label. Formatting.
2004-11-15 Ulrich Drepper <drepper@redhat.com>
* include/stdio.h: Do not mark __libc_message as noreturn.
* sysdeps/unix/sysv/linux/libc_fatal.c (__libc_fatal): Add loop to
fool gcc. Include <stdbool.h>.
* sysdeps/posix/libc_fatal.c (__libc_fatal): Add loop to fool gcc.
(__libc_message): Fix typo.
2004-11-13 Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (malloc_state): stat_lock_* elements need only

3
include/stdio.h
View File

@ -62,8 +62,7 @@ extern int __gen_tempname (char *__tmpl, int __kind);
/* Print out MESSAGE on the error output and abort. */
extern void __libc_fatal (__const char *__message)
__attribute__ ((__noreturn__));
extern void __libc_message (int do_abort, __const char *__fnt, ...)
__attribute__ ((__noreturn__));
extern void __libc_message (int do_abort, __const char *__fnt, ...);
/* Acquire ownership of STREAM. */
extern void __flockfile (FILE *__stream);

11
nis/nis_clone_obj.c
View File

@ -41,27 +41,26 @@ nis_clone_object (const nis_object *src, nis_object *dest)
if (dest == NULL)
{
if ((res = calloc (1, sizeof (nis_object))) == NULL)
goto out2;
goto out;
}
else
res = dest;
xdrmem_create (&xdrs, addr, size, XDR_ENCODE);
if (!_xdr_nis_object (&xdrs, (nis_object *)src))
goto out3;
if (!_xdr_nis_object (&xdrs, (nis_object *) src))
goto out2;
xdr_destroy (&xdrs);
xdrmem_create (&xdrs, addr, size, XDR_DECODE);
if (!_xdr_nis_object (&xdrs, res))
{
out3:
out2:
if (dest == NULL)
free (res);
res = NULL;
}
out:
xdr_destroy (&xdrs);
out2:
out:
free (addr);
return res;

1
posix/bug-regex24.c
View File

@ -1,5 +1,6 @@
#include <regex.h>
#include <stdio.h>
#include <string.h>
#define str "civic"

10
sysdeps/posix/libc_fatal.c
View File

@ -131,9 +131,9 @@ __libc_message (int do_abort, const char *fmt, ...)
va_end (ap_copy);
if (do_abort()
/* Kill the application. */
abort ();
if (do_abort)
/* Kill the application. */
abort ();
}
@ -141,6 +141,8 @@ void
__libc_fatal (message)
const char *message;
{
__libc_message (1, "%s", message);
/* The loop is added only to keep gcc happy. */
while (1)
__libc_message (1, "%s", message);
}
libc_hidden_def (__libc_fatal)

9
sysdeps/unix/sysv/linux/libc_fatal.c
View File

@ -20,16 +20,13 @@
#include <fcntl.h>
#include <paths.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysdep.h>
#include <unistd.h>
#include <sys/syslog.h>
#ifndef ABORT_INSTRUCTION
/* No such instruction is available. */
# define ABORT_INSTRUCTION
#endif
/* Abort with an error message. */
#include <not-cancel.h>
@ -153,6 +150,8 @@ void
__libc_fatal (message)
const char *message;
{
__libc_message (1, "%s", message);
/* The loop is added only to keep gcc happy. */
while (1)
__libc_message (1, "%s", message);
}
libc_hidden_def (__libc_fatal)