From d00ac15a6511b77ab132d4b6694acbb5b9a6f402 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 20 Sep 2006 18:38:14 +0000 Subject: [PATCH] * tempname.c (__gen_tempname): Change attempts_min into a macro. Use preprocessor to decide how to initialize attempts [Coverity CID 67]. --- lib/ChangeLog | 10 ++++++++++ lib/tempname.c | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 54a86e1c82..900564e140 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,13 @@ +2006-09-20 Paul Eggert + + Import this patch from libc: + + 2006-04-07 Ulrich Drepper + + * tempname.c (__gen_tempname): Change attempts_min + into a macro. Use preprocessor to decide how to initialize + attempts [Coverity CID 67]. + 2006-09-18 Bruno Haible * javaversion.c: Include configmake.h. diff --git a/lib/tempname.c b/lib/tempname.c index d143882c92..6fef5e9a1e 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -213,11 +213,15 @@ __gen_tempname (char *tmpl, int kind) necessary to try all these combinations. Instead if a reasonable number of names is tried (we define reasonable as 62**3) fail to give the system administrator the chance to remove the problems. */ - unsigned int attempts_min = 62 * 62 * 62; +#define ATTEMPTS_MIN (62 * 62 * 62) /* The number of times to attempt to generate a temporary file. To conform to POSIX, this must be no smaller than TMP_MAX. */ - unsigned int attempts = attempts_min < TMP_MAX ? TMP_MAX : attempts_min; +#if ATTEMPTS_MIN < TMP_MAX + unsigned int attempts = TMP_MAX; +#else + unsigned int attempts = ATTEMPTS_MIN; +#endif len = strlen (tmpl); if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) -- 2.30.2