alexk / rpms / rpm

Forked from rpms/rpm 2 years ago
Clone
45afda
From 3461bd52ef2d403de1c420962aac52834f6e4b34 Mon Sep 17 00:00:00 2001
45afda
From: Panu Matilainen <pmatilai@redhat.com>
45afda
Date: Tue, 10 Oct 2017 15:20:16 +0300
45afda
Subject: [PATCH 10/33] Drop redundant check on hash algo name
45afda
45afda
The array is already size-validated, me thinks we can safely
45afda
assume the array to be populated with non-NULL values.
45afda
---
45afda
 lib/rpmtag.h | 8 ++++----
45afda
 1 file changed, 4 insertions(+), 4 deletions(-)
45afda
45afda
diff --git a/lib/rpmtag.h b/lib/rpmtag.h
45afda
index 46719ec75..40ff5fa5d 100644
45afda
--- a/lib/rpmtag.h
45afda
+++ b/lib/rpmtag.h
45afda
@@ -65,8 +65,8 @@ typedef enum rpmTag_e {
45afda
     RPMTAG_LONGARCHIVESIZE	= RPMTAG_SIG_BASE+15,	/* l */
45afda
     /* RPMTAG_SIG_BASE+16 reserved */
45afda
     RPMTAG_SHA256HEADER		= RPMTAG_SIG_BASE+17,	/* s */
45afda
-    /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
45afda
-    /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURES */
45afda
+    /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
45afda
+    /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
45afda
 
45afda
     RPMTAG_NAME  		= 1000,	/* s */
45afda
 #define	RPMTAG_N	RPMTAG_NAME	/* s */
45afda
@@ -427,8 +427,8 @@ typedef enum rpmSigTag_e {
45afda
     RPMSIGTAG_LONGSIZE	= RPMTAG_LONGSIGSIZE,	/*!< internal Header+Payload size (64bit) in bytes. */
45afda
     RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal uncompressed payload size (64bit) in bytes. */
45afda
     RPMSIGTAG_SHA256	= RPMTAG_SHA256HEADER,
45afda
-    RPMSIGTAG_FILESIGNATURELENGTH	= RPMTAG_SIG_BASE + 18,
45afda
-    RPMSIGTAG_FILESIGNATURES		= RPMTAG_SIG_BASE + 19,
45afda
+    RPMSIGTAG_FILESIGNATURES           = RPMTAG_SIG_BASE + 18,
45afda
+    RPMSIGTAG_FILESIGNATURELENGTH      = RPMTAG_SIG_BASE + 19,
45afda
 } rpmSigTag;
45afda
 
45afda
 
45afda
-- 
45afda
2.27.0
45afda