diff options
| author | Werner Koch <[email protected]> | 2003-12-17 12:26:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-12-17 12:26:56 +0000 |
| commit | 23fa5c97929a1206aaa662e2833eaec629d95c57 (patch) | |
| tree | 5839ee2a1ea7224a0ae1175f4047e1a16d551da5 /g10/trustdb.c | |
| parent | * gettime.c (asctimestamp): Add a note on a non-avoidable gcc warning. (diff) | |
| download | gnupg-23fa5c97929a1206aaa662e2833eaec629d95c57.tar.gz gnupg-23fa5c97929a1206aaa662e2833eaec629d95c57.zip | |
* card-util.c (print_name): Fixed bad format string usage.
(print_isoname): Ditto.
* trustdb.c (check_regexp): s/exp/expr/.
* keyedit.c (trustsig_prompt): Removed a "> 255" term; it is
always false due to the data type.
* passphrase.c (agent_get_passphrase): Use xasprintf and avoid
non-literal format strings.
* tdbio.c (upd_hashtable, drop_from_hashtable, lookup_hashtable):
Fixed log_error format string bugs. Kudos to the now working
gcc-3.3 -Wformat-nonliteral and Florian Weimer's investigations in
gnupg 1.2.3.
Diffstat (limited to 'g10/trustdb.c')
| -rw-r--r-- | g10/trustdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index 864334f4f..b3a2b369e 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1539,19 +1539,19 @@ mark_usable_uid_certs (KBNODE keyblock, KBNODE uidnode, signature. Returns 1 for match, and 0 for no match or regex error. */ static int -check_regexp(const char *exp,const char *string) +check_regexp(const char *expr,const char *string) { #ifdef DISABLE_REGEX /* When DISABLE_REGEX is defined, assume all regexps do not match. */ return 0; #elif defined(__riscos__) - return riscos_check_regexp(exp, string, DBG_TRUST); + return riscos_check_regexp(expr, string, DBG_TRUST); #else int ret; regex_t pat; - if(regcomp(&pat,exp,REG_ICASE|REG_NOSUB|REG_EXTENDED)!=0) + if(regcomp(&pat,expr,REG_ICASE|REG_NOSUB|REG_EXTENDED)!=0) return 0; ret=regexec(&pat,string,0,NULL,0); @@ -1559,7 +1559,7 @@ check_regexp(const char *exp,const char *string) regfree(&pat); if(DBG_TRUST) - log_debug("regexp \"%s\" on \"%s\": %s\n",exp,string,ret==0?"YES":"NO"); + log_debug("regexp \"%s\" on \"%s\": %s\n",expr,string,ret==0?"YES":"NO"); return (ret==0); #endif |