diff options
author | Ulrich Drepper <drepper@redhat.com> | 2004-03-29 21:46:58 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-29 21:46:58 +0000 |
commit | b569ae384410aeff8bf3252eca64df1686bcd70a (patch) | |
tree | a7aec1e0aac1736f50a662b302f39602f50bb3fb /nis/nss_nis/nis-service.c | |
parent | 95479dc273d889da860a94fc28cb5683d98189e1 (diff) | |
download | glibc-b569ae384410aeff8bf3252eca64df1686bcd70a.tar.gz glibc-b569ae384410aeff8bf3252eca64df1686bcd70a.tar.xz glibc-b569ae384410aeff8bf3252eca64df1686bcd70a.zip |
Update.
* 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.
Diffstat (limited to 'nis/nss_nis/nis-service.c')
-rw-r--r-- | nis/nss_nis/nis-service.c | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c index c25422f3ca..9af9fd20a3 100644 --- a/nis/nss_nis/nis-service.c +++ b/nis/nss_nis/nis-service.c @@ -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. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996. @@ -38,8 +38,8 @@ __libc_lock_define_initialized (static, lock) struct response_t { - char *val; struct response_t *next; + char val[0]; }; struct intern_t @@ -62,26 +62,19 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval, 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) - { - intern->start = malloc (sizeof (struct response_t)); - if (intern->start == NULL) - return YP_FALSE; /* We have no error code for out of memory */ - intern->next = intern->start; - } + intern->start = newp; 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 */ - strncpy (intern->next->val, inval, invallen); - intern->next->val[invallen] = '\0'; + intern->next->next = newp; + intern->next = newp; + + newp->next = NULL; + *((char *) mempcpy (newp->val, inval, invallen)) = '\0'; } return 0; @@ -92,13 +85,10 @@ internal_nis_endservent (intern_t * intern) { while (intern->start != NULL) { - if (intern->start->val != NULL) - free (intern->start->val); intern->next = intern->start; intern->start = intern->start->next; free (intern->next); } - intern->start = NULL; return NSS_STATUS_SUCCESS; } |