From a711dd4ba8f2c71a260a3f7539c0e86175f97a21 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 21 Apr 2000 16:15:11 +0000 Subject: Update. 2000-04-21 Ulrich Drepper * iconv/iconv.c (iconv): Add __builtin_expect where useful. * iconv/iconv_close.c (iconv_close): Likewise. * iconv/iconv_open.c (iconv_open): Likewise. * grp/putgrent.c (putgrent): Unlock steam if fprintf failed. Add __builtin_expect where useful. * grp/initgroups.c (initgroups): Test for result of memory allocation and punt if it fails. * dirent/scandir.c (scandir): Add __builtin_expect where useful. * grp/fgetgrent.c (fgetfrent): Likewise. * grp/fgetgrent_r.c (__fgetgrent_r): Likewise. --- grp/fgetgrent.c | 6 +++--- grp/fgetgrent_r.c | 8 ++++---- grp/initgroups.c | 7 +++++-- grp/putgrent.c | 11 +++++++---- 4 files changed, 19 insertions(+), 13 deletions(-) (limited to 'grp') diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c index 245524f178..69507d97e7 100644 --- a/grp/fgetgrent.c +++ b/grp/fgetgrent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1999, 2000 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 @@ -38,7 +38,7 @@ fgetgrent (FILE *stream) struct group *result; int save; - if (fgetpos (stream, &pos) != 0) + if (__builtin_expect (fgetpos (stream, &pos), 0) != 0) return NULL; /* Get lock. */ @@ -58,7 +58,7 @@ fgetgrent (FILE *stream) char *new_buf; buffer_size += NSS_BUFLEN_GROUP; new_buf = realloc (buffer, buffer_size); - if (new_buf == NULL) + if (__builtin_expect (new_buf == NULL, 0)) { /* We are out of memory. Free the current buffer so that the process gets a chance for a normal termination. */ diff --git a/grp/fgetgrent_r.c b/grp/fgetgrent_r.c index 0b1d782586..058b0b3e74 100644 --- a/grp/fgetgrent_r.c +++ b/grp/fgetgrent_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996-1999, 2000 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 @@ -70,14 +70,14 @@ __fgetgrent_r (FILE *stream, struct group *resbuf, char *buffer, size_t buflen, { buffer[buflen - 1] = '\xff'; p = fgets_unlocked (buffer, buflen, stream); - if (p == NULL && feof_unlocked (stream)) + if (__builtin_expect (p == NULL, 0) && feof_unlocked (stream)) { funlockfile (stream); *result = NULL; __set_errno (ENOENT); return errno; } - if (p == NULL || buffer[buflen - 1] != '\xff') + if (__builtin_expect (p == NULL, 0) || buffer[buflen - 1] != '\xff') { funlockfile (stream); *result = NULL; @@ -97,7 +97,7 @@ __fgetgrent_r (FILE *stream, struct group *resbuf, char *buffer, size_t buflen, funlockfile (stream); - if (parse_result == -1) + if (__builtin_expect (parse_result, 0) == -1) { /* The parser ran out of space. */ *result = NULL; diff --git a/grp/initgroups.c b/grp/initgroups.c index fd30ebf7e0..06c48bb040 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1989, 91, 93, 96, 97, 98, 99 Free Software Foundation, Inc. +/* Copyright (C) 1989, 91, 93, 1996-1999, 2000 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 @@ -163,7 +163,10 @@ initgroups (user, group) size = 16; #endif - groups = malloc (size * sizeof (gid_t *)); + groups = (gid_t *) malloc (size * sizeof (gid_t)); + if (__builtin_expect (groups == NULL, 0)) + /* No more memory. */ + return -1; groups[0] = group; diff --git a/grp/putgrent.c b/grp/putgrent.c index a119ebed17..11b64eca63 100644 --- a/grp/putgrent.c +++ b/grp/putgrent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 96, 98, 99, 2000 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 @@ -36,7 +36,7 @@ putgrent (gr, stream) { int retval; - if (gr == NULL || stream == NULL) + if (__builtin_expect (gr == NULL, 0) || __builtin_expect (stream == NULL, 0)) { __set_errno (EINVAL); return -1; @@ -46,8 +46,11 @@ putgrent (gr, stream) retval = fprintf (stream, "%s:%s:%u:", gr->gr_name, _S (gr->gr_passwd), gr->gr_gid); - if (retval < 0) - return -1; + if (__builtin_expect (retval, 0) < 0) + { + funlockfile (stream); + return -1; + } if (gr->gr_mem != NULL) { -- cgit v1.2.3