aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog16
-rw-r--r--nis/nss_nis/nis-ethers.c34
-rw-r--r--nis/nss_nis/nis-initgroups.c35
-rw-r--r--nis/nss_nis/nis-proto.c34
-rw-r--r--nis/nss_nis/nis-rpc.c35
-rw-r--r--nis/nss_nis/nis-service.c36
6 files changed, 79 insertions, 111 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bc34ad3c7..20956be9f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
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.
2004-03-26 Thorsten Kukuk <kukuk@suse.de>
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c
index 713fe31e93..328d61f6c5 100644
--- a/nis/nss_nis/nis-ethers.c
+++ b/nis/nss_nis/nis-ethers.c
@@ -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.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@@ -40,8 +40,8 @@ __libc_lock_define_initialized (static, lock)
struct response
{
- char *val;
struct response *next;
+ char val[0];
};
static struct response *start;
@@ -56,26 +56,18 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval,
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)
- {
- start = malloc (sizeof (struct response));
- if (start == NULL)
- return YP_FALSE;
- next = start;
- }
+ start = newp;
else
- {
- next->next = malloc (sizeof (struct response));
- if (next->next == NULL)
- return YP_FALSE;
- next = next->next;
- }
- next->next = NULL;
- next->val = malloc (invallen + 1);
- if (next->val == NULL)
- return YP_FALSE;
- strncpy (next->val, inval, invallen);
- next->val[invallen] = '\0';
+ next->next = newp;
+ next = newp;
+
+ newp->next = NULL;
+ *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
return 0;
@@ -86,8 +78,6 @@ internal_nis_endetherent (void)
{
while (start != NULL)
{
- if (start->val != NULL)
- free (start->val);
next = start;
start = start->next;
free (next);
diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c
index e3a8f57fcc..4c979889b7 100644
--- a/nis/nss_nis/nis-initgroups.c
+++ b/nis/nss_nis/nis-initgroups.c
@@ -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.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
@@ -38,8 +38,8 @@
struct response_t
{
- char *val;
struct response_t *next;
+ char val[0];
};
struct intern_t
@@ -60,26 +60,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;
- intern->next = intern->start;
- }
+ intern->start = newp;
else
- {
- intern->next->next = malloc (sizeof (struct response_t));
- if (intern->next->next == NULL)
- return YP_FALSE;
- intern->next = intern->next->next;
- }
- 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';
+ intern->next->next = newp;
+ intern->next = newp;
+
+ newp->next = NULL;
+ *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
return 0;
@@ -209,8 +202,6 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start,
done:
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);
diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index b8c234ed6f..7c1ce32074 100644
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.c
@@ -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.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@@ -37,8 +37,8 @@ __libc_lock_define_initialized (static, lock)
struct response
{
- char *val;
struct response *next;
+ char val[0];
};
static struct response *start;
@@ -53,26 +53,18 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval,
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)
- {
- start = malloc (sizeof (struct response));
- if (start == NULL)
- return YP_FALSE;
- next = start;
- }
+ start = newp;
else
- {
- next->next = malloc (sizeof (struct response));
- if (next->next == NULL)
- return YP_FALSE;
- next = next->next;
- }
- next->next = NULL;
- next->val = malloc (invallen + 1);
- if (next->val == NULL)
- return YP_FALSE;
- strncpy (next->val, inval, invallen);
- next->val[invallen] = '\0';
+ next->next = newp;
+ next = newp;
+
+ newp->next = NULL;
+ *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
return 0;
@@ -83,8 +75,6 @@ internal_nis_endprotoent (void)
{
while (start != NULL)
{
- if (start->val != NULL)
- free (start->val);
next = start;
start = start->next;
free (next);
diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c
index 6e707b9d58..e4a39542c5 100644
--- a/nis/nss_nis/nis-rpc.c
+++ b/nis/nss_nis/nis-rpc.c
@@ -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.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@@ -37,8 +37,8 @@ __libc_lock_define_initialized (static, lock)
struct response_t
{
- char *val;
struct response_t *next;
+ char val[0];
};
struct intern_t
@@ -61,26 +61,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;
- intern->next = intern->start;
- }
+ intern->start = newp;
else
- {
- intern->next->next = malloc (sizeof (struct response_t));
- if (intern->next->next == NULL)
- return YP_FALSE;
- intern->next = intern->next->next;
- }
- 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';
+ intern->next->next = newp;
+ intern->next = newp;
+
+ newp->next = NULL;
+ *((char *) mempcpy (newp->val, inval, invallen)) = '\0';
}
return 0;
@@ -91,8 +84,6 @@ internal_nis_endrpcent (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);
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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:16:14 +0000