AIX fiddles (Albert Chin <rpm-list@thewrittenword.com>).

CVS patchset: 5434
CVS date: 2002/05/13 22:45:30

diff --git a/beecrypt/base64.c b/beecrypt/base64.c
index 15103ee..632445f 100644 (file)
--- a/beecrypt/base64.c
+++ b/beecrypt/base64.c
@@ -328,7 +328,7 @@ fprintf(stderr, "%7u %02x %02x %02x -> %02x %02x %02x %02x\n",
 #define CRC24_INIT 0xb704ceL
 #define CRC24_POLY 0x1864cfbL
 
-char * b64crc (const void * data, int ns)
+char * b64crc (const unsigned char * data, int ns)
 {
     const unsigned char *s = data;
     uint32 crc = CRC24_INIT;

diff --git a/beecrypt/base64.h b/beecrypt/base64.h
index b2fe50e..30745a2 100644 (file)
--- a/beecrypt/base64.h
+++ b/beecrypt/base64.h
@@ -78,7 +78,7 @@ char * b64encode (const void * data, int ns)
  * @return             (malloc'd) base64 string
  */
 BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/
-char * b64crc (const void * data, int ns)
+char * b64crc (const unsigned char * data, int ns)
        /*@*/;
 
 /**

diff --git a/beecrypt/dsa.c b/beecrypt/dsa.c
index 8497035..f006300 100644 (file)
--- a/beecrypt/dsa.c
+++ b/beecrypt/dsa.c
@@ -54,8 +54,8 @@ int dsasign(const mp32barrett* p, const mp32barrett* q, const mp32number* g, ran
 {
        register uint32  psize = p->size;
        register uint32  qsize = q->size;
-       // k + inv(k) = 2 * qsize
-       // g^k mod p = psize+4*psize+2
+       /* k + inv(k) = 2 * qsize */
+       /* g^k mod p = psize+4*psize+2 */
 
        register uint32* ptemp;
        register uint32* qtemp;
@@ -74,11 +74,11 @@ int dsasign(const mp32barrett* p, const mp32barrett* q, const mp32number* g, ran
                register uint32* pwksp = ptemp+psize;
                register uint32* qwksp = qtemp+3*qsize;
 
-               // allocate r
+               /* allocate r */
                mp32nfree(r);
                mp32nsize(r, qsize);
 
-               // get a random k, invertible modulo q
+               /* get a random k, invertible modulo q */
                mp32brndinv_w(q, rgc, qtemp, qtemp+qsize, qwksp);
 
 #if 0
@@ -92,24 +92,24 @@ int dsasign(const mp32barrett* p, const mp32barrett* q, const mp32number* g, ran
                mp32binv_w(q, qsize, qtemp, qtemp+qsize, qwksp);
 #endif
 
-               // g^k mod p
+               /* g^k mod p */
                mp32bpowmod_w(p, g->size, g->data, qsize, qtemp, ptemp, pwksp);
 
-               // (g^k mod p) mod q - simple modulo
+               /* (g^k mod p) mod q - simple modulo */
                mp32nmod(qtemp+2*qsize, psize, ptemp, qsize, q->modl, pwksp);
                mp32copy(qsize, r->data, qtemp+psize+qsize);
 
-               // allocate s
+               /* allocate s */
                mp32nfree(s);
                mp32nsize(s, qsize);
 
-               // x*r mod q
+               /* x*r mod q */
                mp32bmulmod_w(q, x->size, x->data, r->size, r->data, qtemp, qwksp);
 
-               // add h(m) mod q
+               /* add h(m) mod q */
                mp32baddmod_w(q, qsize, qtemp, hm->size, hm->data, qtemp+2*qsize, qwksp);
 
-               // multiply inv(k) mod q
+               /* multiply inv(k) mod q */
                mp32bmulmod_w(q, qsize, qtemp+qsize, qsize, qtemp+2*qsize, s->data, qwksp);
                rc = 0;
 
@@ -162,49 +162,49 @@ fprintf(stderr, "\t                r: "),  mp32println(stderr, r->size, r->data)
 fprintf(stderr, "\t                s: "),  mp32println(stderr, s->size, s->data);
 /*@=modfilesys@*/
 }
-               // compute w = inv(s) mod q
+               /* compute w = inv(s) mod q */
                if (mp32binv_w(q, s->size, s->data, qtemp, qwksp))
                {
 /*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t w = inv(s) mod q: "),  mp32println(stderr, qsize, qtemp);
 /*@=modfilesys@*/
-                       // compute u1 = h(m)*w mod q
+                       /* compute u1 = h(m)*w mod q */
                        mp32bmulmod_w(q, hm->size, hm->data, qsize, qtemp, qtemp+qsize, qwksp);
 /*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\tu1 = h(m)*w mod q: "),  mp32println(stderr, qsize, qtemp+qsize);
 /*@=modfilesys@*/
 
-                       // compute u2 = r*w mod q
+                       /* compute u2 = r*w mod q */
                        mp32bmulmod_w(q, r->size, r->data, qsize, qtemp, qtemp, qwksp);
 /*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\tu2 = r*w mod q   : "),  mp32println(stderr, qsize, qtemp);
 /*@=modfilesys@*/
 
-                       // compute g^u1 mod p
+                       /* compute g^u1 mod p */
                        mp32bpowmod_w(p, g->size, g->data, qsize, qtemp+qsize, ptemp, pwksp);
 /*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t       g^u1 mod p: "),  mp32println(stderr, psize, ptemp);
 /*@=modfilesys@*/
 
-                       // compute y^u2 mod p
+                       /* compute y^u2 mod p */
                        mp32bpowmod_w(p, y->size, y->data, qsize, qtemp, ptemp+psize, pwksp);
 /*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t       y^u2 mod p: "),  mp32println(stderr, psize, ptemp+psize);
 /*@=modfilesys@*/
 
-                       // multiply mod p
+                       /* multiply mod p */
                        mp32bmulmod_w(p, psize, ptemp, psize, ptemp+psize, ptemp, pwksp);
 /*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t   multiply mod p: "),  mp32println(stderr, psize, ptemp);
 /*@=modfilesys@*/
 
-                       // modulo q
+                       /* modulo q */
                        mp32nmod(ptemp+psize, psize, ptemp, qsize, q->modl, pwksp);
 /*@-modfilesys@*/
 if (_debug)

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index a38ed44..9bd5499 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -412,7 +412,7 @@ static int addDefault(defaultEntry * table, int * tableLen, char * line,
     return 0;
 }
 
-static /*@null@*/ const canonEntry lookupInCanonTable(const char * name,
+static /*@null@*/ canonEntry lookupInCanonTable(const char * name,
                const canonEntry table, int tableLen)
        /*@*/
 {
@@ -1399,7 +1399,7 @@ void rpmGetOsInfo(const char ** name, int * num)
     getMachineInfo(OS, name, num);
 }
 
-void rpmRebuildTargetVars(const char ** target, const char ** canontarget)
+static void rpmRebuildTargetVars(const char ** target, const char ** canontarget)
 {
 
     char *ca = NULL, *co = NULL, *ct = NULL;

diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index 599b10d..8322151 100644 (file)
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -203,7 +203,7 @@ int ufdClose( /*@only@*/ void * cookie)
 /** \ingroup rpmio
  */
 /*@unused@*/ static inline
-/*@null@*/ const FDIO_t fdGetIo(FD_t fd)
+/*@null@*/ FDIO_t fdGetIo(FD_t fd)
        /*@*/
 {
     FDSANE(fd);

diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index 9c63c96..7e9d02b 100644 (file)
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -59,7 +59,7 @@ typedef enum pgpTag_e {
     PGPTAG_PRIVATE_60          = 60, /*!< Private or Experimental Values */
     PGPTAG_COMMENT             = 61, /*!< Comment */
     PGPTAG_PRIVATE_62          = 62, /*!< Private or Experimental Values */
-    PGPTAG_CONTROL             = 63, /*!< Control (GPG) */
+    PGPTAG_CONTROL             = 63 /*!< Control (GPG) */
 } pgpTag;
 
 /**
@@ -174,7 +174,7 @@ typedef enum pgpPubkeyAlgo_e {
     PGPPUBKEYALGO_EC           = 18,   /*!< Elliptic Curve */
     PGPPUBKEYALGO_ECDSA                = 19,   /*!< ECDSA */
     PGPPUBKEYALGO_ELGAMAL      = 20,   /*!< Elgamal */
-    PGPPUBKEYALGO_DH           = 21,   /*!< Diffie-Hellman (X9.42) */
+    PGPPUBKEYALGO_DH           = 21    /*!< Diffie-Hellman (X9.42) */
 } pgpPubkeyAlgo;
 /*@=typeuse@*/
 
@@ -451,7 +451,7 @@ typedef enum pgpSubType_e {
     PGPSUBTYPE_INTERNAL_107    = 107, /*!< internal or user-defined */
     PGPSUBTYPE_INTERNAL_108    = 108, /*!< internal or user-defined */
     PGPSUBTYPE_INTERNAL_109    = 109, /*!< internal or user-defined */
-    PGPSUBTYPE_INTERNAL_110    = 110, /*!< internal or user-defined */
+    PGPSUBTYPE_INTERNAL_110    = 110 /*!< internal or user-defined */
 } pgpSubType;
 /*@=typeuse@*/
 
@@ -921,7 +921,7 @@ typedef enum pgpArmor_e {
     PGPARMOR_SIGNED_MESSAGE    =  4, /*!< SIGNED MESSAGE */
     PGPARMOR_FILE              =  5, /*!< ARMORED FILE */
     PGPARMOR_PRIVKEY           =  6, /*!< PRIVATE KEY BLOCK */
-    PGPARMOR_SECKEY            =  7, /*!< SECRET KEY BLOCK */
+    PGPARMOR_SECKEY            =  7 /*!< SECRET KEY BLOCK */
 } pgpArmor;
 /*@=typeuse@*/
 
@@ -938,7 +938,7 @@ typedef enum pgpArmorKey_e {
     PGPARMORKEY_COMMENT                = 2, /*!< Comment: */
     PGPARMORKEY_MESSAGEID      = 3, /*!< MessageID: */
     PGPARMORKEY_HASH           = 4, /*!< Hash: */
-    PGPARMORKEY_CHARSET                = 5, /*!< Charset: */
+    PGPARMORKEY_CHARSET                = 5 /*!< Charset: */
 } pgpArmorKey;
 /*@=typeuse@*/