diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-03-04 15:12:02 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-03-04 15:12:02 +0200 |
| commit | 095e1ba71d28300a31bf411f1e9045bbb539a130 (patch) | |
| tree | 7625323340972ab576f511a2b0f5100f3cc28b8f /lib/signature.c | |
| parent | dc5fa254588be57a066ef4679c75e2bb3bda5fef (diff) | |
| download | rpm-095e1ba71d28300a31bf411f1e9045bbb539a130.tar.gz rpm-095e1ba71d28300a31bf411f1e9045bbb539a130.tar.bz2 rpm-095e1ba71d28300a31bf411f1e9045bbb539a130.zip | |
Condense "shut up gcc" switch-cases to just default no action case
Diffstat (limited to 'lib/signature.c')
| -rw-r--r-- | lib/signature.c | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/lib/signature.c b/lib/signature.c index fba002762..545ab4d20 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -598,11 +598,6 @@ static int makeGPGSignature(const char * file, rpmSigTag * sigTagp, sigp = &dig->signature; switch (*sigTagp) { - case RPMSIGTAG_SIZE: - case RPMSIGTAG_LONGSIZE: - case RPMSIGTAG_MD5: - case RPMSIGTAG_SHA1: - break; case RPMSIGTAG_GPG: /* XXX check MD5 hash too? */ if (sigp->pubkey_algo == PGPPUBKEYALGO_RSA) @@ -622,13 +617,7 @@ static int makeGPGSignature(const char * file, rpmSigTag * sigTagp, if (sigp->pubkey_algo == PGPPUBKEYALGO_DSA) *sigTagp = RPMSIGTAG_DSA; break; - /* shut up gcc */ - case RPMSIGTAG_LEMD5_1: - case RPMSIGTAG_LEMD5_2: - case RPMSIGTAG_BADSHA1_1: - case RPMSIGTAG_BADSHA1_2: - case RPMSIGTAG_PAYLOADSIZE: - case RPMSIGTAG_LONGARCHIVESIZE: + default: break; } @@ -662,14 +651,6 @@ static int makeHDRSignature(Header sigh, const char * file, rpmSigTag sigTag, int ret = -1; /* assume failure. */ switch (sigTag) { - case RPMSIGTAG_SIZE: - case RPMSIGTAG_LONGSIZE: - case RPMSIGTAG_MD5: - case RPMSIGTAG_PGP5: /* XXX legacy */ - case RPMSIGTAG_PGP: - case RPMSIGTAG_GPG: - goto exit; - break; case RPMSIGTAG_SHA1: fd = Fopen(file, "r.fdio"); if (fd == NULL || Ferror(fd)) @@ -744,13 +725,8 @@ static int makeHDRSignature(Header sigh, const char * file, rpmSigTag sigTag, goto exit; ret = 0; break; - /* shut up gcc */ - case RPMSIGTAG_LEMD5_1: - case RPMSIGTAG_LEMD5_2: - case RPMSIGTAG_BADSHA1_1: - case RPMSIGTAG_BADSHA1_2: - case RPMSIGTAG_PAYLOADSIZE: - case RPMSIGTAG_LONGARCHIVESIZE: + default: + goto exit; break; } @@ -824,13 +800,7 @@ int rpmAddSignature(Header sigh, const char * file, rpmSigTag sigTag, case RPMSIGTAG_SHA1: ret = makeHDRSignature(sigh, file, sigTag, passPhrase); break; - /* shut up gcc */ - case RPMSIGTAG_LEMD5_1: - case RPMSIGTAG_LEMD5_2: - case RPMSIGTAG_BADSHA1_1: - case RPMSIGTAG_BADSHA1_2: - case RPMSIGTAG_PAYLOADSIZE: - case RPMSIGTAG_LONGARCHIVESIZE: + default: break; } free(pkt); |