[Cvs-cvs] ccvs/src ChangeLog gpg.c [signed-commits3]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits3
Changes by:     Derek Robert Price <address@hidden>     05/12/30 16:23:53

Modified files:
        src            : ChangeLog gpg.c 

Log message:
        * gpg.c (read_u8, read_u16, read_u32): Use <stdint.h> uintN_t types for
        output rather than potentially variable bit length types.
        (write_part, parse_header, read_signature, parse_signature): Carry
        through above <stdint.h> change to callers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.3328.2.4&tr2=1.3328.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/gpg.c.diff?only_with_tag=signed-commits3&tr1=1.1.6.4&tr2=1.1.6.5&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3328.2.4 ccvs/src/ChangeLog:1.3328.2.5
--- ccvs/src/ChangeLog:1.3328.2.4       Fri Dec 30 16:12:05 2005
+++ ccvs/src/ChangeLog  Fri Dec 30 16:23:53 2005
@@ -1,5 +1,10 @@
 2005-12-30  Derek Price  <address@hidden>
 
+       * gpg.c (read_u8, read_u16, read_u32): Use <stdint.h> uintN_t types for
+       output rather than potentially variable bit length types.
+       (write_part, parse_header, read_signature, parse_signature): Carry
+       through above <stdint.h> change to callers.
+
        * gpg.c: Minor comment fixes.
 
        * gpg.c: Include <stdint.h>.
Index: ccvs/src/gpg.c
diff -u ccvs/src/gpg.c:1.1.6.4 ccvs/src/gpg.c:1.1.6.5
--- ccvs/src/gpg.c:1.1.6.4      Fri Dec 30 16:12:05 2005
+++ ccvs/src/gpg.c      Fri Dec 30 16:23:53 2005
@@ -99,7 +99,7 @@
 
 
 static int
-read_u8 (struct buffer *bpin, unsigned char *rn)
+read_u8 (struct buffer *bpin, uint8_t *rn)
 {
   char *tmp;
   size_t got;
@@ -115,9 +115,9 @@
 
 
 static int
-read_u16 (struct buffer *bpin, size_t *rn)
+read_u16 (struct buffer *bpin, uint16_t *rn)
 {
-  unsigned char tmp;
+  uint8_t tmp;
   int rc;
 
   if ((rc = read_u8 (bpin, &tmp)))
@@ -132,9 +132,9 @@
 
 
 static int
-read_u32 (struct buffer *bpin, unsigned long *rn)
+read_u32 (struct buffer *bpin, uint32_t *rn)
 {
-  size_t tmp;
+  uint16_t tmp;
   int rc;
 
   if ((rc = read_u16 (bpin, &tmp)))
@@ -158,7 +158,7 @@
 
   while (partial)
     {
-      size_t partlen;
+      uint16_t partlen;
       
       assert (partial == 2);
       /* old gnupg */
@@ -209,7 +209,7 @@
  *   -2                On memory allocation errors from buf_read_data().
  */
 int
-parse_header (struct buffer *bpin, int *pkttype, unsigned long *pktlen,
+parse_header (struct buffer *bpin, int *pkttype, uint32_t *pktlen,
              int *partial, unsigned char *header, int *header_len)
 {
   int ctb;
@@ -313,7 +313,7 @@
 read_signature (struct buffer *bpin, struct buffer *bpout)
 {
   int pkttype;
-  unsigned long pktlen;
+  uint32_t pktlen;
   int partial;
   unsigned char header[20];
   int header_len = sizeof header;
@@ -353,7 +353,7 @@
 parse_signature (struct buffer *bpin, struct openpgp_signature *spout)
 {
   int pkttype;
-  unsigned long pktlen;
+  uint32_t pktlen;
   int partial;
   unsigned char header[20];
   int header_len = sizeof header;