Skip to content

Commit b760b9c

Browse files
pmatilaiffesti
authored andcommitted
Refactor signature insertion to a helper function
No functional changes, just a tiny refactoring bit for the next steps.
1 parent 51446f4 commit b760b9c

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

sign/rpmgensig.cc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,11 @@ static int haveSignature(rpmtd sigtd, Header h)
403403
return rc;
404404
}
405405

406+
static int putSignature(Header sigh, rpmtd sigtd)
407+
{
408+
return (headerPut(sigh, sigtd, HEADERPUT_DEFAULT) == 0);
409+
}
410+
406411
static int replaceSignature(Header sigh, sigTarget sigt_v3, sigTarget sigt_v4)
407412
{
408413
int rc = -1;
@@ -420,7 +425,7 @@ static int replaceSignature(Header sigh, sigTarget sigt_v3, sigTarget sigt_v4)
420425
/* Nuke all signature tags */
421426
deleteSigs(sigh);
422427

423-
if (headerPut(sigh, sigtd, HEADERPUT_DEFAULT) == 0)
428+
if (putSignature(sigh, sigtd))
424429
goto exit;
425430

426431
if (sigt_v3) {
@@ -430,7 +435,7 @@ static int replaceSignature(Header sigh, sigTarget sigt_v3, sigTarget sigt_v4)
430435
if ((sigtd = makeGPGSignature(0, sigt_v3)) == NULL)
431436
goto exit;
432437

433-
if (headerPut(sigh, sigtd, HEADERPUT_DEFAULT) == 0)
438+
if (putSignature(sigh, sigtd))
434439
goto exit;
435440
}
436441

0 commit comments

Comments
 (0)