[Rpm-maint] [PATCH 1/5] Fix indentation and formatting

Stefan Berger stefanb at us.ibm.com
Fri Apr 22 13:01:13 UTC 2016


Fix the indentation and formatting in signature related files.

Signed-off-by: Stefan Berger <stefanb at linux.vnet.ibm.com>
---
 lib/rpmsignfiles.c | 12 ++++++------
 sign/rpmgensig.c   |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/rpmsignfiles.c b/lib/rpmsignfiles.c
index 61ea33e..95ac851 100644
--- a/lib/rpmsignfiles.c
+++ b/lib/rpmsignfiles.c
@@ -138,13 +138,13 @@ rpmRC rpmSignFiles(Header h, const char *key, char *keypass)
 	return RPMRC_FAIL;
     }
 
-	headerDel(h, RPMTAG_FILESIGNATURELENGTH);
-	headerDel(h, RPMTAG_FILESIGNATURES);
-	siglen = signatureLength(algoname, diglen, key, keypass);
-	headerPutUint32(h, RPMTAG_FILESIGNATURELENGTH, &siglen, 1);
+    headerDel(h, RPMTAG_FILESIGNATURELENGTH);
+    headerDel(h, RPMTAG_FILESIGNATURES);
+    siglen = signatureLength(algoname, diglen, key, keypass);
+    headerPutUint32(h, RPMTAG_FILESIGNATURELENGTH, &siglen, 1);
 
-	headerGet(h, RPMTAG_FILEDIGESTS, &digests, HEADERGET_MINMEM);
-	while ((digest = rpmtdNextString(&digests))) {
+    headerGet(h, RPMTAG_FILEDIGESTS, &digests, HEADERGET_MINMEM);
+    while ((digest = rpmtdNextString(&digests))) {
 	signature = signFile(algoname, digest, diglen, key, keypass);
 	if (!signature) {
 	    rpmlog(RPMLOG_ERR, _("signFile failed\n"));
diff --git a/sign/rpmgensig.c b/sign/rpmgensig.c
index 9341fa8..77b6d5a 100644
--- a/sign/rpmgensig.c
+++ b/sign/rpmgensig.c
@@ -655,7 +655,8 @@ static rpmRC includeFileSignatures(FD_t fd, const char *rpm,
 	replaceSigDigests(fd, rpm, sigp, sigStart, sigTargetSize, SHA1, MD5);
 
 exit:
-if (ofd)    (void) closeFile(&ofd);
+    if (ofd)
+	(void) closeFile(&ofd);
     return rc;
 }
 
-- 
2.5.5



More information about the Rpm-maint mailing list