diff options
| author | David Howells <dhowells@redhat.com> | 2011-07-19 16:58:55 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-07-19 16:58:55 +0100 |
| commit | 8ca469e85d80185a75c809e200c5a1af10677867 (patch) | |
| tree | e24631c454b94194c0d01ddf1e2dcbc50ee068b4 | |
| parent | faabd7c8464502becd01972b1a76ab1dfa1906cc (diff) | |
| download | keyutils-8ca469e85d80185a75c809e200c5a1af10677867.tar.gz | |
Lib: Clean up variable that are set but not read
Clean up variables that are set but not read, giving:
keyutils.c: In function 'recursive_key_scan_aux':
keyutils.c:353:46: error: variable 'is_keyring' set but not used [-Werror=unused-but-set-variable]
key.dns_resolver.c: In function 'main':
key.dns_resolver.c:643:7: error: variable 'hostbuf' set but not used [-Werror=unused-but-set-variable]
with the F16 compiler.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | key.dns_resolver.c | 3 | ||||
| -rw-r--r-- | keyutils.c | 4 | ||||
| -rw-r--r-- | keyutils.spec | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/key.dns_resolver.c b/key.dns_resolver.c index ab9b878..49857a5 100644 --- a/key.dns_resolver.c +++ b/key.dns_resolver.c @@ -640,9 +640,6 @@ int main(int argc, char *argv[]) char *keyend, *p; char *callout_info = NULL; char *buf = NULL, *name; - char hostbuf[NI_MAXHOST]; - - hostbuf[0] = '\0'; openlog(prog, 0, LOG_DAEMON); @@ -350,7 +350,7 @@ static int recursive_key_scan_aux(key_serial_t parent, key_serial_t key, size_t ringlen; void *ring; char *desc, type[255]; - int desc_len, uid, gid, ret, n, kcount = 0, is_keyring = 0; + int desc_len, uid, gid, ret, n, kcount = 0; if (depth > 800) return 0; @@ -376,8 +376,6 @@ static int recursive_key_scan_aux(key_serial_t parent, key_serial_t key, /* if it's a keyring then we're going to want to recursively search it * if we can */ if (strcmp(type, "keyring") == 0) { - is_keyring = 1; - /* read the keyring's contents */ ret = keyctl_read_alloc(key, &ring); if (ret < 0) diff --git a/keyutils.spec b/keyutils.spec index abc00f2..d0b701e 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -9,7 +9,7 @@ Summary: Linux Key Management Utilities Name: keyutils Version: %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base ExclusiveOS: Linux @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue Jul 19 2011 David Howells <dhowells@redhat.com> - 1.5-2 +- Fix unread variables. + * Thu Mar 10 2011 David Howells <dhowells@redhat.com> - 1.5-1 - Disable RPATH setting in Makefile. - Add -I. to build to get this keyutils.h. |