From a452e4e6294ffb6d7362215cb0b10896e8a7631f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 4 Sep 2003 12:31:47 +0000 Subject: Update. 2003-09-04 Ulrich Drepper * nss/getXXbyYY.c (FUNCTION_NAME): Add a few casts. Remove unnecessary errno handling. * nss/getXXbyYY_r.c (INTERNAL): Use better variable name. Initialize it in all cases. Change it to be a bit more like the code we had before. --- nss/getXXbyYY.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'nss/getXXbyYY.c') diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c index ece2a0d47c..07e1d8a088 100644 --- a/nss/getXXbyYY.c +++ b/nss/getXXbyYY.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1996-2001,2003 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 @@ -106,7 +106,7 @@ FUNCTION_NAME (ADD_PARAMS) if (buffer == NULL) { buffer_size = BUFLEN; - buffer = malloc (buffer_size); + buffer = (char *) malloc (buffer_size); } #ifdef HANDLE_DIGITS_DOTS @@ -132,14 +132,13 @@ FUNCTION_NAME (ADD_PARAMS) { char *new_buf; buffer_size += BUFLEN; - new_buf = realloc (buffer, buffer_size); + new_buf = (char *) realloc (buffer, buffer_size); if (new_buf == NULL) { /* We are out of memory. Free the current buffer so that the process gets a chance for a normal termination. */ - save = errno; free (buffer); - __set_errno (save); + __set_errno (ENOMEM); } buffer = new_buf; } @@ -150,10 +149,8 @@ FUNCTION_NAME (ADD_PARAMS) #ifdef HANDLE_DIGITS_DOTS done: #endif - /* Release lock. Preserve error value. */ - save = errno; + /* Release lock. */ __libc_lock_unlock (lock); - __set_errno (save); #ifdef NEED_H_ERRNO if (h_errno_tmp != 0) -- cgit v1.2.3