diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-18 20:26:06 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-18 20:26:06 +0000 |
| commit | 6aa2f56259e20828eeabc3eb007da779aabda3ff (patch) | |
| tree | b19d4b3d30519b91408aef4cbc60cf4ae0c82380 /src | |
| parent | 431808b93caa05fae8e87e549363f1272c02a953 (diff) | |
| download | krb5-6aa2f56259e20828eeabc3eb007da779aabda3ff.tar.gz krb5-6aa2f56259e20828eeabc3eb007da779aabda3ff.tar.xz krb5-6aa2f56259e20828eeabc3eb007da779aabda3ff.zip | |
* dump.c (name_matches): Cleanup warning of assignments in
conditionals.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13383 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/dbutil/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index d8b1e59bb9..39f2e63d90 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,5 +1,10 @@ 2001-06-18 Ezra Peisach <epeisach@mit.edu> + * dump.c (name_matches): Cleanup warning of assignments in + conditionals. + +2001-06-18 Ezra Peisach <epeisach@mit.edu> + * dump.c: Include regex.h if exists and if HAVE_REGCOMP defined. Preior to this, regex.h was never included. diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index 3bfc4ebafe..dfdfb7dee1 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -356,9 +356,8 @@ name_matches(name, arglist) /* * Compile the regular expression. */ - if (match_error = regcomp(&match_exp, - arglist->names[i], - REG_EXTENDED)) { + match_error = regcomp(&match_exp, arglist->names[i], REG_EXTENDED); + if (match_error) { errmsg_size = regerror(match_error, &match_exp, match_errmsg, @@ -369,7 +368,8 @@ name_matches(name, arglist) /* * See if we have a match. */ - if (match_error = regexec(&match_exp, name, 1, &match_match, 0)) { + match_error = regexec(&match_exp, name, 1, &match_match, 0); + if (match_error) { if (match_error != REG_NOMATCH) { errmsg_size = regerror(match_error, &match_exp, |