system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update.

Browse Source 
* nis/nss_nis/nis-rpc.c (saveit): Improve memory.  No need to
	allocate multiple blocks.
	(internal_nis_endrpcent): Adjust accordingly.
	* nis/nss_nis/nis-proto.c (saveit): Improve memory.  No need to
	allocate multiple blocks.
	(internal_nis_endprotoent): Adjust accordingly.
	* nis/nss_nis/nis-initgroups.c (saveit): Improve memory.  No need
	to allocate multiple blocks.
	(_nss_nis_initgroups_dyn): Adjust accordingly.
	* nis/nss_nis/nis-ethers.c (saveit): Improve memory.  No need to
	allocate multiple blocks.
	(internal_nis_endetherent): Adjust accordingly.
	* nis/nss_nis/nis-service.c (saveit): Improve memory.  No need to
	allocate multiple blocks.
	(internal_nis_endservent): Adjust accordingly.
This commit is contained in:
Ulrich Drepper 2004-03-29 21:46:58 +00:00
parent 95479dc273
commit b569ae3844
6 changed files with 80 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,5 +1,21 @@
2004-03-29 Ulrich Drepper <drepper@redhat.com> 2004-03-29 Ulrich Drepper <drepper@redhat.com>
* nis/nss_nis/nis-rpc.c (saveit): Improve memory. No need to
allocate multiple blocks.
(internal_nis_endrpcent): Adjust accordingly.
* nis/nss_nis/nis-proto.c (saveit): Improve memory. No need to
allocate multiple blocks.
(internal_nis_endprotoent): Adjust accordingly.
* nis/nss_nis/nis-initgroups.c (saveit): Improve memory. No need
to allocate multiple blocks.
(_nss_nis_initgroups_dyn): Adjust accordingly.
* nis/nss_nis/nis-ethers.c (saveit): Improve memory. No need to
allocate multiple blocks.
(internal_nis_endetherent): Adjust accordingly.
* nis/nss_nis/nis-service.c (saveit): Improve memory. No need to
allocate multiple blocks.
(internal_nis_endservent): Adjust accordingly.
* nss/getXXbyYY_r.c: Return 0 for NSS_STATUS_NOTFOUND. * nss/getXXbyYY_r.c: Return 0 for NSS_STATUS_NOTFOUND.
2004-03-26 Thorsten Kukuk <kukuk@suse.de> 2004-03-26 Thorsten Kukuk <kukuk@suse.de>

34
nis/nss_nis/nis-ethers.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-2000, 2001, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@ -40,8 +40,8 @@ __libc_lock_define_initialized (static, lock)
struct response struct response
{ {
char *val;
struct response *next; struct response *next;
char val[0];
}; };
static struct response *start; static struct response *start;
@ -56,26 +56,18 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval,
if (inkey && inkeylen > 0 && inval && invallen > 0) if (inkey && inkeylen > 0 && inval && invallen > 0)
{ {
struct response *newp = malloc (sizeof (struct response) + invallen + 1);
if (newp == NULL)
return YP_FALSE; /* We have no error code for out of memory */
if (start == NULL) if (start == NULL)
{ start = newp;
start = malloc (sizeof (struct response));
if (start == NULL)
return YP_FALSE;
next = start;
}
else else
{ next->next = newp;
next->next = malloc (sizeof (struct response)); next = newp;
if (next->next == NULL)
return YP_FALSE; newp->next = NULL;
next = next->next; *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
next->next = NULL;
next->val = malloc (invallen + 1);
if (next->val == NULL)
return YP_FALSE;
strncpy (next->val, inval, invallen);
next->val[invallen] = '\0';
} }
return 0; return 0;
@ -86,8 +78,6 @@ internal_nis_endetherent (void)
{ {
while (start != NULL) while (start != NULL)
{ {
if (start->val != NULL)
free (start->val);
next = start; next = start;
start = start->next; start = start->next;
free (next); free (next);

35
nis/nss_nis/nis-initgroups.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1998-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
@ -38,8 +38,8 @@
struct response_t struct response_t
{ {
char *val;
struct response_t *next; struct response_t *next;
char val[0];
}; };
struct intern_t struct intern_t
@ -60,26 +60,19 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval,
if (inkey && inkeylen > 0 && inval && invallen > 0) if (inkey && inkeylen > 0 && inval && invallen > 0)
{ {
struct response_t *newp = malloc (sizeof (struct response_t)
+ invallen + 1);
if (newp == NULL)
return YP_FALSE; /* We have no error code for out of memory */
if (intern->start == NULL) if (intern->start == NULL)
{ intern->start = newp;
intern->start = malloc (sizeof (struct response_t));
if (intern->start == NULL)
return YP_FALSE;
intern->next = intern->start;
}
else else
{ intern->next->next = newp;
intern->next->next = malloc (sizeof (struct response_t)); intern->next = newp;
if (intern->next->next == NULL)
return YP_FALSE; newp->next = NULL;
intern->next = intern->next->next; *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
intern->next->next = NULL;
intern->next->val = malloc (invallen + 1);
if (intern->next->val == NULL)
return YP_FALSE;
strncpy (intern->next->val, inval, invallen);
intern->next->val[invallen] = '\0';
} }
return 0; return 0;
@ -209,8 +202,6 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start,
done: done:
while (intern.start != NULL) while (intern.start != NULL)
{ {
if (intern.start->val != NULL)
free (intern.start->val);
intern.next = intern.start; intern.next = intern.start;
intern.start = intern.start->next; intern.start = intern.start->next;
free (intern.next); free (intern.next);

34
nis/nss_nis/nis-proto.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-1998, 2000-2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1996-1998, 2000-2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@ -37,8 +37,8 @@ __libc_lock_define_initialized (static, lock)
struct response struct response
{ {
char *val;
struct response *next; struct response *next;
char val[0];
}; };
static struct response *start; static struct response *start;
@ -53,26 +53,18 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval,
if (inkey && inkeylen > 0 && inval && invallen > 0) if (inkey && inkeylen > 0 && inval && invallen > 0)
{ {
struct response *newp = malloc (sizeof (struct response) + invallen + 1);
if (newp == NULL)
return YP_FALSE; /* We have no error code for out of memory */
if (start == NULL) if (start == NULL)
{ start = newp;
start = malloc (sizeof (struct response));
if (start == NULL)
return YP_FALSE;
next = start;
}
else else
{ next->next = newp;
next->next = malloc (sizeof (struct response)); next = newp;
if (next->next == NULL)
return YP_FALSE; newp->next = NULL;
next = next->next; *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
next->next = NULL;
next->val = malloc (invallen + 1);
if (next->val == NULL)
return YP_FALSE;
strncpy (next->val, inval, invallen);
next->val[invallen] = '\0';
} }
return 0; return 0;
@ -83,8 +75,6 @@ internal_nis_endprotoent (void)
{ {
while (start != NULL) while (start != NULL)
{ {
if (start->val != NULL)
free (start->val);
next = start; next = start;
start = start->next; start = start->next;
free (next); free (next);

35
nis/nss_nis/nis-rpc.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-1998, 2000, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1996-1998,2000,2002,2003,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@ -37,8 +37,8 @@ __libc_lock_define_initialized (static, lock)
struct response_t struct response_t
{ {
char *val;
struct response_t *next; struct response_t *next;
char val[0];
}; };
struct intern_t struct intern_t
@ -61,26 +61,19 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval,
if (inkey && inkeylen > 0 && inval && invallen > 0) if (inkey && inkeylen > 0 && inval && invallen > 0)
{ {
struct response_t *newp = malloc (sizeof (struct response_t)
+ invallen + 1);
if (newp == NULL)
return YP_FALSE; /* We have no error code for out of memory */
if (intern->start == NULL) if (intern->start == NULL)
{ intern->start = newp;
intern->start = malloc (sizeof (struct response_t));
if (intern->start == NULL)
return YP_FALSE;
intern->next = intern->start;
}
else else
{ intern->next->next = newp;
intern->next->next = malloc (sizeof (struct response_t)); intern->next = newp;
if (intern->next->next == NULL)
return YP_FALSE; newp->next = NULL;
intern->next = intern->next->next; *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
intern->next->next = NULL;
intern->next->val = malloc (invallen + 1);
if (intern->next->val == NULL)
return YP_FALSE;
strncpy (intern->next->val, inval, invallen);
intern->next->val[invallen] = '\0';
} }
return 0; return 0;
@ -91,8 +84,6 @@ internal_nis_endrpcent (intern_t *intern)
{ {
while (intern->start != NULL) while (intern->start != NULL)
{ {
if (intern->start->val != NULL)
free (intern->start->val);
intern->next = intern->start; intern->next = intern->start;
intern->start = intern->start->next; intern->start = intern->start->next;
free (intern->next); free (intern->next);

38
nis/nss_nis/nis-service.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc. /* Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@ -38,8 +38,8 @@ __libc_lock_define_initialized (static, lock)
struct response_t struct response_t
{ {
char *val;
struct response_t *next; struct response_t *next;
char val[0];
}; };
struct intern_t struct intern_t
@ -62,26 +62,19 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval,
if (inkey && inkeylen > 0 && inval && invallen > 0) if (inkey && inkeylen > 0 && inval && invallen > 0)
{ {
if (intern->start == NULL) struct response_t *newp = malloc (sizeof (struct response_t)
{ + invallen + 1);
intern->start = malloc (sizeof (struct response_t)); if (newp == NULL)
if (intern->start == NULL)
return YP_FALSE; /* We have no error code for out of memory */
intern->next = intern->start;
}
else
{
intern->next->next = malloc (sizeof (struct response_t));
if (intern->next->next == NULL)
return YP_FALSE; /* We have no error code for out of memory */
intern->next = intern->next->next;
}
intern->next->next = NULL;
intern->next->val = malloc (invallen + 1);
if (intern->next->val == NULL)
return YP_FALSE; /* We have no error code for out of memory */ return YP_FALSE; /* We have no error code for out of memory */
strncpy (intern->next->val, inval, invallen);
intern->next->val[invallen] = '\0'; if (intern->start == NULL)
intern->start = newp;
else
intern->next->next = newp;
intern->next = newp;
newp->next = NULL;
*((char *) mempcpy (newp->val, inval, invallen)) = '\0';
} }
return 0; return 0;
@ -92,13 +85,10 @@ internal_nis_endservent (intern_t * intern)
{ {
while (intern->start != NULL) while (intern->start != NULL)
{ {
if (intern->start->val != NULL)
free (intern->start->val);
intern->next = intern->start; intern->next = intern->start;
intern->start = intern->start->next; intern->start = intern->start->next;
free (intern->next); free (intern->next);
} }
intern->start = NULL;
return NSS_STATUS_SUCCESS; return NSS_STATUS_SUCCESS;
} }