* sysdeps/unix/sysv/linux/getsysstats.c (free_mem): Revert last

patch.
	* grp/fgetgrent.c (free_mem): Remove if - free (0) is valid.
	* inet/getnetgrent.c (free_mem): Likewise.
	* misc/mntent.c (free_mem): Likewise.
	* nss/getXXbyYY.c (free_mem): Likewise.
	* nss/getXXent.c (free_mem): Likewise.
	* pwd/fgetpwent.c (free_mem): Likewise.
	* shadow/fgetspent.c (free_mem): Likewise.

diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index 69507d97e7ce01183ce67efba3da3a4f2be11caf..ba69c1077f9743ea6b09a8b17f1341dd8f5fb099 100644 (file)
--- a/grp/fgetgrent.c
+++ b/grp/fgetgrent.c
@@ -89,8 +89,7 @@ fgetgrent (FILE *stream)
 static void __attribute__ ((unused))
 free_mem (void)
 {
-  if (buffer != NULL)
-    free (buffer);
+  free (buffer);
 }
 
 text_set_element (__libc_subfreeres, free_mem);

diff --git a/inet/getnetgrent.c b/inet/getnetgrent.c
index 88b06ffc98e7fc3931f7051222d812f430de0eba..2f32ec683f1be84d43ea1f3f072020548ed468db 100644 (file)
--- a/inet/getnetgrent.c
+++ b/inet/getnetgrent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 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
@@ -56,8 +56,7 @@ static void
 __attribute__ ((unused))
 free_mem (void)
 {
-  if (buffer != NULL)
-    free (buffer);
+  free (buffer);
 }
 
 text_set_element (__libc_subfreeres, free_mem);

diff --git a/misc/mntent.c b/misc/mntent.c
index b21f24e731c1b226fc5e994a9c3eb4fc3f2fb2f8..41267d72c0cd7889e45f61572a92366a36abb550 100644 (file)
--- a/misc/mntent.c
+++ b/misc/mntent.c
@@ -1,5 +1,5 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 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
@@ -60,8 +60,7 @@ static void
 __attribute__ ((unused))
 free_mem (void)
 {
-  if (getmntent_buffer != NULL)
-    free (getmntent_buffer);
+  free (getmntent_buffer);
 }
 
 text_set_element (__libc_subfreeres, free_mem);

diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c
index 32327d6d1e6a9f1312962eca261db2b42ed3026d..ebddb98d08e790218c744510e9172191b955a9b1 100644 (file)
--- a/nss/getXXbyYY.c
+++ b/nss/getXXbyYY.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 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
@@ -26,26 +26,26 @@
 
 /*******************************************************************\
 |* Here we assume several symbols to be defined:                  *|
-|*                                                                *|
+|*                                                                *|
 |* LOOKUP_TYPE   - the return type of the function                *|
-|*                                                                *|
+|*                                                                *|
 |* FUNCTION_NAME - name of the non-reentrant function             *|
-|*                                                                *|
+|*                                                                *|
 |* DATABASE_NAME - name of the database the function accesses     *|
 |*                (e.g., host, services, ...)                     *|
-|*                                                                *|
+|*                                                                *|
 |* ADD_PARAMS    - additional parameter, can vary in number       *|
-|*                                                                *|
+|*                                                                *|
 |* ADD_VARIABLES - names of additional parameter                  *|
-|*                                                                *|
+|*                                                                *|
 |* BUFLEN       - length of buffer allocated for the non          *|
 |*                reentrant version                               *|
-|*                                                                *|
+|*                                                                *|
 |* Optionally the following vars can be defined:                  *|
-|*                                                                *|
+|*                                                                *|
 |* NEED_H_ERRNO  - an extra parameter will be passed to point to   *|
 |*                the global `h_errno' variable.                  *|
-|*                                                                *|
+|*                                                                *|
 \*******************************************************************/
 
 /* To make the real sources a bit prettier.  */
@@ -164,8 +164,7 @@ done:
 static void __attribute__ ((unused))
 free_mem (void)
 {
-  if (buffer != NULL)
-    free (buffer);
+  free (buffer);
 }
 
 text_set_element (__libc_subfreeres, free_mem);

diff --git a/nss/getXXent.c b/nss/getXXent.c
index 497c0dee2217e235f377037219bc17fcd493f960..d2482157fff26da8dd1e62abfcbef7c4decebf7e 100644 (file)
--- a/nss/getXXent.c
+++ b/nss/getXXent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -24,18 +24,18 @@
 
 /*******************************************************************\
 |* Here we assume several symbols to be defined:                  *|
-|*                                                                *|
+|*                                                                *|
 |* LOOKUP_TYPE   - the return type of the function                *|
-|*                                                                *|
+|*                                                                *|
 |* GETFUNC_NAME  - name of the non-reentrant getXXXent function           *|
-|*                                                                *|
+|*                                                                *|
 |* BUFLEN       - size of static buffer                           *|
-|*                                                                *|
+|*                                                                *|
 |* Optionally the following vars can be defined:                  *|
-|*                                                                *|
+|*                                                                *|
 |* NEED_H_ERRNO  - an extra parameter will be passed to point to   *|
 |*                the global `h_errno' variable.                  *|
-|*                                                                *|
+|*                                                                *|
 \*******************************************************************/
 
 /* To make the real sources a bit prettier.  */
@@ -121,8 +121,7 @@ GETFUNC_NAME (void)
 static void __attribute__ ((unused))
 free_mem (void)
 {
-  if (buffer != NULL)
-    free (buffer);
+  free (buffer);
 }
 
 text_set_element (__libc_subfreeres, free_mem);

diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c
index 09a13c39f91b3c9dd51e2310e8b03d27c5922210..31aff45b080d8ef1f22bbbdaf507bd51c6f509b0 100644 (file)
--- a/pwd/fgetpwent.c
+++ b/pwd/fgetpwent.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
@@ -89,8 +89,7 @@ fgetpwent (FILE *stream)
 static void __attribute__ ((unused))
 free_mem (void)
 {
-  if (buffer != NULL)
-    free (buffer);
+  free (buffer);
 }
 
 text_set_element (__libc_subfreeres, free_mem);

diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c
index 66a5452678d2fbc4f1509fc3bb56e6a0e51a30b2..78f6bb28f1cafca524b9873b9ef22efd980626f7 100644 (file)
--- a/shadow/fgetspent.c
+++ b/shadow/fgetspent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -92,8 +92,7 @@ fgetspent (FILE *stream)
 static void __attribute__ ((unused))
 free_mem (void)
 {
-  if (buffer != NULL)
-    free (buffer);
+  free (buffer);
 }
 
 text_set_element (__libc_subfreeres, free_mem);

diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index 9d0137678fa08ba10050494c77e5f53bc472c97b..a4113ce661e1e3bfdc9ae9c08166e9364e00f76b 100644 (file)
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -283,7 +283,6 @@ weak_alias (__get_avphys_pages, get_avphys_pages)
 static void
 free_mem (void)
 {
-  if (mount_proc != NULL)
-    free (mount_proc);
+  free (mount_proc);
 }
 text_set_element (__libc_subfreeres, free_mem);