further format string cleanups (for i686-linux type sizes)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7ee100478fcc539d63f65884f323b3cdedae62c2..173d752132e965a6dfce57a8f79eb6c6d3a496b8 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 580.66  2001/10/17 21:07:20  nbryant
+ further format string cleanups (for i686-linux type sizes)
+
  Revision 580.65  2001/10/17 20:41:07  nbryant
   - declare *printf format specifiers if gcc detected
   - format string fixes (compiles w/o warnings on alpha osf/1)
@@ -2828,3 +2831,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 2fc7ffe81277d76d65f93f7bc81ffba09f497046..f1c3dac417cdfa537945e9442174a026f07f7328 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -617,7 +617,7 @@ void imap_fetch_bodystructure_part(
        }
        cprintf(" ");
 
-       cprintf("%ld ", length);        /* bytes */
+       cprintf("%ld ", (long)length);  /* bytes */
        cprintf("NIL) ");               /* lines */
 }
 

diff --git a/citadel/imap_tools.c b/citadel/imap_tools.c
index 4f9809879a30262213e6fd84f8b88be96c81b724..ce4a6af9fdb4067b1fb43dd7a29ebc584f0143fb 100644 (file)
--- a/citadel/imap_tools.c
+++ b/citadel/imap_tools.c
@@ -41,7 +41,7 @@ void imap_strout(char *buf)
        }
 
        if (is_literal) {
-               cprintf("{%ld}\r\n%s", strlen(buf), buf);
+               cprintf("{%ld}\r\n%s", (long)strlen(buf), buf);
        } else {
                cprintf("\"%s\"", buf);
        }

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index f367cbf1b0add38470c2808c092805af97823e95..b96aec1dcbca7985735ac23ec0967da783550364 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -497,7 +497,7 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
        msg->cm_format_type = FMT_RFC822;       /* internet message */
        msg->cm_fields['M'] = rfc822;
 
-       lprintf(9, "Unconverted RFC822 message length = %ld\n", strlen(rfc822));
+       lprintf(9, "Unconverted RFC822 message length = %ld\n", (long)strlen(rfc822));
        pos = 0;
        done = 0;
 
@@ -557,7 +557,7 @@ struct CtdlMessage *convert_internet_message(char *rfc822) {
        }
 
        lprintf(9, "RFC822 length remaining after conversion = %ld\n",
-               strlen(rfc822));
+               (long)strlen(rfc822));
        return msg;
 }
 

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index fc8133df670e53f74c69afda529c07ded79f7f9f..62f0397d43610cfce65a74b6643035ffba9a90ee 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -413,7 +413,7 @@ void the_mime_parser(char *partnum,
                /* Truncate if the header told us to */
                if ( (content_length > 0) && (length > content_length) ) {
                        length = content_length;
-                       lprintf(9, "truncated to %ld\n", content_length);
+                       lprintf(9, "truncated to %ld\n", (long)content_length);
                }
                
                mime_decode(partnum,

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index ff346d3d71f5996db4aa912085d256c414744902..bd02692ab15cc7a26fd7a2a910b1a153a5fca77a 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -680,7 +680,7 @@ void list_this_part(char *name, char *filename, char *partnum, char *disp,
 {
 
        cprintf("part=%s|%s|%s|%s|%s|%ld\n",
-               name, filename, partnum, disp, cbtype, length);
+               name, filename, partnum, disp, cbtype, (long)length);
 }
 
 
@@ -908,7 +908,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp,
                }
                else if (strncasecmp(cbtype, "multipart/", 10)) {
                        cprintf("Part %s: %s (%s) (%ld bytes)\r\n",
-                               partnum, filename, cbtype, length);
+                               partnum, filename, cbtype, (long)length);
                }
        }
 
@@ -1342,7 +1342,7 @@ void cmd_msg3(char *cmdbuf)
                return;
        }
 
-       cprintf("%d %ld\n", BINARY_FOLLOWS, smr.len);
+       cprintf("%d %ld\n", BINARY_FOLLOWS, (long)smr.len);
        client_write(smr.ser, smr.len);
        phree(smr.ser);
 }
@@ -1579,7 +1579,7 @@ void serialize_message(struct ser_ret *ret,               /* return values */
                ret->len = ret->len +
                        strlen(msg->cm_fields[(int)forder[i]]) + 2;
 
-       lprintf(9, "serialize_message() calling malloc(%ld)\n", ret->len);
+       lprintf(9, "serialize_message() calling malloc(%ld)\n", (long)ret->len);
        ret->ser = mallok(ret->len);
        if (ret->ser == NULL) {
                ret->len = 0;
@@ -1597,7 +1597,7 @@ void serialize_message(struct ser_ret *ret,               /* return values */
                wlen = wlen + strlen(msg->cm_fields[(int)forder[i]]) + 1;
        }
        if (ret->len != wlen) lprintf(3, "ERROR: len=%ld wlen=%ld\n",
-               ret->len, wlen);
+               (long)ret->len, (long)wlen);
 
        return;
 }
@@ -2015,7 +2015,7 @@ char *CtdlReadMessageBody(char *terminator,       /* token signalling EOT */
                        } else {
                                buffer_len = (buffer_len * 2);
                                m = ptr;
-                               lprintf(9, "buffer_len is %ld\n", buffer_len);
+                               lprintf(9, "buffer_len is %ld\n", (long)buffer_len);
                        }
                }
 

diff --git a/citadel/serv_bio.c b/citadel/serv_bio.c
index bb435d2e51bc408859990bb096b633f48b4f29d7..635a48ed027eac6c75295e921a01b93b66c582df 100644 (file)
--- a/citadel/serv_bio.c
+++ b/citadel/serv_bio.c
@@ -89,9 +89,9 @@ void cmd_rbio(char *cmdbuf)
        }
        sprintf(buf,"./bio/%ld",ruser.usernum);
        
-       cprintf("%d OK|%s|%ld|%d|%d|%ld|%ld\n", LISTING_FOLLOWS,
+       cprintf("%d OK|%s|%ld|%d|%ld|%ld|%ld\n", LISTING_FOLLOWS,
                ruser.fullname, ruser.usernum, ruser.axlevel,
-               ruser.lastcall, ruser.timescalled, ruser.posted);
+               (long)ruser.lastcall, ruser.timescalled, ruser.posted);
        fp = fopen(buf,"r");
        if (fp == NULL)
                cprintf("%s has no bio on file.\n", ruser.fullname);

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 380974398f48b0b81f05102213a482df0897e9e4..026fc93d1b43d2eb1e57eb5eee0d4f695c34c34c 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -440,7 +440,7 @@ void network_spool_msg(long msgnum, void *userdata) {
                instr = mallok(instr_len);
                if (instr == NULL) {
                        lprintf(1, "Cannot allocate %ld bytes for instr...\n",
-                               instr_len);
+                               (long)instr_len);
                        abort();
                }
                sprintf(instr,

diff --git a/citadel/serv_pas2.c b/citadel/serv_pas2.c
index b988af94e81b17f24a8d0a9053fa706638d25b1a..592f661998dc44265acff1f3466b721980568cf4 100644 (file)
--- a/citadel/serv_pas2.c
+++ b/citadel/serv_pas2.c
@@ -63,7 +63,7 @@ void cmd_pas2(char *argbuf)
        
        if (strlen(pw) != (MD5_HEXSTRING_SIZE-1))
        {
-               cprintf("%d Auth string of length %ld is the wrong length (should be %d).\n", ERROR, strlen(pw), MD5_HEXSTRING_SIZE-1);
+               cprintf("%d Auth string of length %ld is the wrong length (should be %d).\n", ERROR, (long)strlen(pw), MD5_HEXSTRING_SIZE-1);
                return;
        }
        

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index c143e0d095792bfd10968d26f32e5a919cdacf82..a9d77be7197a0eaa95f572112843acccde9e39a8 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -296,7 +296,7 @@ void pop3_list(char *argbuf) {
                else {
                        cprintf("+OK %d %ld\r\n",
                                which_one,
-                               POP3->msgs[which_one-1].rfc822_length
+                               (long)POP3->msgs[which_one-1].rfc822_length
                                );
                        return;
                }
@@ -309,7 +309,7 @@ void pop3_list(char *argbuf) {
                        if (! POP3->msgs[i].deleted) {
                                cprintf("%d %ld\r\n",
                                        i+1,
-                                       POP3->msgs[i].rfc822_length);
+                                       (long)POP3->msgs[i].rfc822_length);
                        }
                }
                cprintf(".\r\n");
@@ -332,7 +332,7 @@ void pop3_stat(char *argbuf) {
                }
        }
 
-       cprintf("+OK %d %ld\r\n", total_msgs, total_octets);
+       cprintf("+OK %d %ld\r\n", total_msgs, (long)total_octets);
 }
 
 

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 1a07e6f02d2fb7f216efb37fc36aa2fb6f498d7a..23a305131f3211cfdc004138acffb95d1c83644e 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1123,11 +1123,11 @@ void ListThisUser(struct usersupp *usbuf, void *data)
                if ((CC->usersupp.axlevel >= 6)
                    || ((usbuf->flags & US_UNLISTED) == 0)
                    || ((CC->internal_pgm))) {
-                       cprintf("%s|%d|%ld|%d|%ld|%ld|",
+                       cprintf("%s|%d|%ld|%ld|%ld|%ld|",
                                usbuf->fullname,
                                usbuf->axlevel,
                                usbuf->usernum,
-                               usbuf->lastcall,
+                               (long)usbuf->lastcall,
                                usbuf->timescalled,
                                usbuf->posted);
                        if (CC->usersupp.axlevel >= 6)
@@ -1212,7 +1212,7 @@ void cmd_agup(char *cmdbuf)
                cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
                return;
        }
-       cprintf("%d %s|%s|%u|%ld|%ld|%d|%ld|%d|%d\n",
+       cprintf("%d %s|%s|%u|%ld|%ld|%d|%ld|%ld|%d\n",
                OK,
                usbuf.fullname,
                usbuf.password,
@@ -1221,7 +1221,7 @@ void cmd_agup(char *cmdbuf)
                usbuf.posted,
                (int) usbuf.axlevel,
                usbuf.usernum,
-               usbuf.lastcall,
+               (long)usbuf.lastcall,
                usbuf.USuserpurge);
 }