diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-10-11 16:29:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-10-11 16:29:13 +0000 |
| commit | 6c7e1cf59e14689cf1af78550ba3f9b0f1302b2c (patch) | |
| tree | 4f7e0074f66f74dd5a936358b9ae653c87dcf6c5 | |
| parent | 8099361ecd23167ddbb8585a375cbacbcffb64c4 (diff) | |
| download | glibc-6c7e1cf59e14689cf1af78550ba3f9b0f1302b2c.tar.gz glibc-6c7e1cf59e14689cf1af78550ba3f9b0f1302b2c.tar.xz glibc-6c7e1cf59e14689cf1af78550ba3f9b0f1302b2c.zip | |
* malloc/malloc.c (_int_malloc): Remove unused any_larger variable.
* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | malloc/malloc.c | 3 | ||||
| -rw-r--r-- | nis/nis_defaults.c | 2 | ||||
| -rw-r--r-- | nis/nis_subr.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/unsecvars.h | 1 |
5 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 6917e5bd7c..f4cbd58167 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-10-11 Jakub Jelinek <jakub@redhat.com> + + * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. + + * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. + + * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. + * sysdeps/generic/unsecvars.h: Add NIS_PATH. + 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. diff --git a/malloc/malloc.c b/malloc/malloc.c index a369001520..c3855290f7 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4097,7 +4097,6 @@ _int_malloc(mstate av, size_t bytes) for(;;) { int iters = 0; - bool any_larger = false; while ( (victim = unsorted_chunks(av)->bk) != unsorted_chunks(av)) { bck = victim->bk; if (__builtin_expect (victim->size <= 2 * SIZE_SZ, 0) @@ -4194,8 +4193,6 @@ _int_malloc(mstate av, size_t bytes) fwd->bk = victim; bck->fd = victim; - if (size >= nb + MINSIZE) - any_larger = true; #define MAX_ITERS 10000 if (++iters >= MAX_ITERS) break; diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c index 59fbbe4b26..ed79b59ec6 100644 --- a/nis/nis_defaults.c +++ b/nis/nis_defaults.c @@ -447,7 +447,7 @@ __nis_default_access (char *param, unsigned int defaults) { cptr = getenv ("NIS_DEFAULTS"); if (cptr != NULL && strstr (cptr, "access=") != NULL) - result = searchaccess (getenv ("NIS_DEFAULTS"), result); + result = searchaccess (cptr, result); } return result; diff --git a/nis/nis_subr.c b/nis/nis_subr.c index c68189e541..258479c857 100644 --- a/nis/nis_subr.c +++ b/nis/nis_subr.c @@ -178,7 +178,7 @@ nis_getnames (const_nis_name name) } /* Get the search path, where we have to search "name" */ - path = getenv ("NIS_PATH"); + path = __secure_getenv ("NIS_PATH"); if (path == NULL) path = strdupa ("$"); else diff --git a/sysdeps/generic/unsecvars.h b/sysdeps/generic/unsecvars.h index a7378b742f..d5b8119c9c 100644 --- a/sysdeps/generic/unsecvars.h +++ b/sysdeps/generic/unsecvars.h @@ -18,6 +18,7 @@ "LOCALDOMAIN\0" \ "LOCPATH\0" \ "MALLOC_TRACE\0" \ + "NIS_PATH\0" \ "NLSPATH\0" \ "RESOLV_HOST_CONF\0" \ "RES_OPTIONS\0" \ |