[pacman-dev] [PATCH 1/2] Prevent wrapping of enum items

Allan McRae allan at archlinux.org
Wed May 4 07:42:28 UTC 2016


GCC-6 points out that the value we use for the sentinal in enums is actually
too large for the integer type. Reduce the bitshift by one to fix this.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 lib/libalpm/alpm.h | 2 +-
 lib/libalpm/db.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 9b8166f..168d71b 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -203,7 +203,7 @@ typedef enum _alpm_siglevel_t {
 	ALPM_SIG_DATABASE_MARGINAL_OK = (1 << 12),
 	ALPM_SIG_DATABASE_UNKNOWN_OK = (1 << 13),
 
-	ALPM_SIG_USE_DEFAULT = (1 << 31)
+	ALPM_SIG_USE_DEFAULT = (1 << 30)
 } alpm_siglevel_t;
 
 /** PGP signature verification status return codes */
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index 9673c7b..05ef43e 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -40,7 +40,7 @@ typedef enum _alpm_dbinfrq_t {
 	/* ALL should be info stored in the package or database */
 	INFRQ_ALL = INFRQ_BASE | INFRQ_DESC | INFRQ_FILES |
 		INFRQ_SCRIPTLET | INFRQ_DSIZE,
-	INFRQ_ERROR = (1 << 31)
+	INFRQ_ERROR = (1 << 30)
 } alpm_dbinfrq_t;
 
 /** Database status. Bitflags. */
-- 
2.8.2


More information about the pacman-dev mailing list