From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 7 Mar 2008 06:15:03 +0000 (+0200)
Subject: Mark another pile of header_magic duplicates as read-only
X-Git-Tag: rpm-4.6.0-rc1~1042
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e3972aebf3db7a6fce83619ea106b80145ed923;p=platform%2Fupstream%2Frpm.git

Mark another pile of header_magic duplicates as read-only
---

diff --git a/lib/package.c b/lib/package.c
index 4d0d67c..66af9e8 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -28,14 +28,15 @@ static unsigned int nkeyids = 0;
 static unsigned int nextkeyid  = 0;
 static unsigned int * keyids;
 
-static unsigned char header_magic[8] = {
+/* XXX FIXME: these are doubled here and header.c and .. */
+static unsigned char const header_magic[8] = {
         0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
 };
 
 /**
  * Alignment needs (and sizeof scalars types) for internal rpm data types.
  */
-static int typeAlign[16] =  {
+static int const typeAlign[16] =  {
     1,	/*!< RPM_NULL_TYPE */
     1,	/*!< RPM_CHAR_TYPE */
     1,	/*!< RPM_INT8_TYPE */
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 0aa3414..daf7927 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -454,7 +454,7 @@ rpmtsClean(ts);
     return res;
 }
 
-static unsigned char header_magic[8] = {
+static unsigned char const header_magic[8] = {
         0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
 };
 
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 1c82f02..7991774 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -15,7 +15,7 @@
 
 #include "debug.h"
 
-static unsigned char lead_magic[] = {
+static unsigned char const lead_magic[] = {
     RPMLEAD_MAGIC0, RPMLEAD_MAGIC1, RPMLEAD_MAGIC2, RPMLEAD_MAGIC3
 };
 
diff --git a/lib/signature.c b/lib/signature.c
index 42903ea..d4b2fc8 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -124,7 +124,8 @@ static inline rpmRC printSize(FD_t fd, size_t siglen, size_t pad, rpm_off_t data
     return RPMRC_OK;
 }
 
-static unsigned char header_magic[8] = {
+/* XXX sigh yet another duplicate.. */
+static unsigned char const header_magic[8] = {
     0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
 };