diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-04-07 20:25:36 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-04-07 20:25:36 +0000 |
| commit | cec4091671724d867d1bc80c37be9f50f572c8f7 (patch) | |
| tree | bf605e22619cbbb365d4db0077084670fe9090ad /sysdeps/posix/tempname.c | |
| parent | 2035d91c389888fcf359698fecc20c05f7b583dd (diff) | |
| download | glibc-cec4091671724d867d1bc80c37be9f50f572c8f7.zip glibc-cec4091671724d867d1bc80c37be9f50f572c8f7.tar.gz glibc-cec4091671724d867d1bc80c37be9f50f572c8f7.tar.bz2 | |
* sysdeps/posix/tempname.c (__gen_tempname): Change attempts_min
into a macro. Use preprocessor to decide how to initialize
attempts [Coverity CID 67].
* io/fts.c (fts_build): Comment out dead code [Coverity CID 68].
* sunrpc/rpc_parse.c (def_union): Comment out dead code
[Coverity CID 70].
* locale/programs/linereader.c (lr_token): Remove duplicate
handling of EOF [Coverity CID 71].
* locale/programs/ld-numeric.c (numeric_read) [case tok_grouping]:
We bail out early if ignore_content is set, so there is no need to
check it later again [Coverity CID 72].
* inet/inet6_option.c (inet6_option_find): Check *tptrp for NULL,
not tptrp [Coverity CID 73].
* inet/inet6_option.c (inet6_option_next): Check *tptrp for NULL,
not tptrp [Coverity CID 74].
* misc/tsearch.c (__tsearch): Don't rotate tree if memory
allocation failed [Coverity CID 78].
Diffstat (limited to 'sysdeps/posix/tempname.c')
| -rw-r--r-- | sysdeps/posix/tempname.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c index 0d4bbc4..c8973a0 100644 --- a/sysdeps/posix/tempname.c +++ b/sysdeps/posix/tempname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2000, 2001, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -242,11 +242,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")) |