* More signed/unsigned fixes (for the new progress gauge)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 8c6554a23cbecdce0b3cb03e7e07d0f40e729e1c..943dd06bcf4dd2437a73b2c0e83cfeaf62c13b37 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.36  2002/10/18 10:33:09  error
+ * More signed/unsigned fixes (for the new progress gauge)
+
  Revision 601.35  2002/10/18 07:56:30  error
  * fix self-service account creation at login prompt (accidentally called
    CREU instead of NEWU).
@@ -4106,4 +4109,3 @@ 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/citadel_ipc.c b/citadel/citadel_ipc.c
index 456a2a269a37646f0ecb73a8640728717993ba36..8a25853f3926c1ee1ce28d298fee4f8b0eca70df 100644 (file)
--- a/citadel/citadel_ipc.c
+++ b/citadel/citadel_ipc.c
@@ -66,11 +66,11 @@ void setCryptoStatusHook(void (*hook)(char *s)) {
 char express_msgs = 0;
 
 
-static void serv_read(CtdlIPC *ipc, char *buf, int bytes);
-static void serv_write(CtdlIPC *ipc, const char *buf, int nbytes);
+static void serv_read(CtdlIPC *ipc, char *buf, unsigned int bytes);
+static void serv_write(CtdlIPC *ipc, const char *buf, unsigned int nbytes);
 #ifdef HAVE_OPENSSL
-static void serv_read_ssl(CtdlIPC *ipc, char *buf, int bytes);
-static void serv_write_ssl(CtdlIPC *ipc, const char *buf, int nbytes);
+static void serv_read_ssl(CtdlIPC *ipc, char *buf, unsigned int bytes);
+static void serv_write_ssl(CtdlIPC *ipc, const char *buf, unsigned int nbytes);
 static void ssl_lock(int mode, int n, const char *file, int line);
 static void endtls(SSL *ssl);
 #ifdef THREADED_CLIENT
@@ -403,11 +403,11 @@ int CtdlIPCGotoRoom(CtdlIPC *ipc, const char *room, const char *passwd,
 /* MSGS */
 /* which is 0 = all, 1 = old, 2 = new, 3 = last, 4 = first, 5 = gt, 6 = lt */
 /* whicharg is number of messages, applies to last, first, gt, lt */
-int CtdlIPCGetMessages(CtdlIPC *ipc, int which, int whicharg, const char *template,
-               long **mret, char *cret)
+int CtdlIPCGetMessages(CtdlIPC *ipc, int which, int whicharg,
+               const char *mtemplate, long **mret, char *cret)
 {
        register int ret;
-       register long count = 0;
+       register unsigned long count = 0;
        static char *proto[] =
                { "ALL", "OLD", "NEW", "LAST", "FIRST", "GT", "LT" };
        char aaa[33];
@@ -421,12 +421,12 @@ int CtdlIPCGetMessages(CtdlIPC *ipc, int which, int whicharg, const char *templa
 
        if (which <= 2)
                sprintf(aaa, "MSGS %s||%d", proto[which],
-                               (template) ? 1 : 0);
+                               (mtemplate) ? 1 : 0);
        else
                sprintf(aaa, "MSGS %s|%d|%d", proto[which], whicharg,
-                               (template) ? 1 : 0);
-       if (template) count = strlen(template);
-       ret = CtdlIPCGenericCommand(ipc, aaa, template, count, &bbb, &bbbsize, cret);
+                               (mtemplate) ? 1 : 0);
+       if (mtemplate) count = strlen(mtemplate);
+       ret = CtdlIPCGenericCommand(ipc, aaa, mtemplate, count, &bbb, &bbbsize, cret);
        count = 0;
        while (strlen(bbb)) {
                int a;
@@ -1119,7 +1119,8 @@ int CtdlIPCOnlineUsers(CtdlIPC *ipc, char **listing, time_t *stamp, char *cret)
 
 /* OPEN */
 int CtdlIPCFileDownload(CtdlIPC *ipc, const char *filename, void **buf,
-               size_t resume, void (*progress_gauge_callback)(long, long),
+               size_t resume,
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
                char *cret)
 {
        register int ret;
@@ -1157,8 +1158,10 @@ int CtdlIPCFileDownload(CtdlIPC *ipc, const char *filename, void **buf,
 
 
 /* OPNA */
-int CtdlIPCAttachmentDownload(CtdlIPC *ipc, long msgnum, const char *part, void **buf,
-               void (*progress_gauge_callback)(long, long), char *cret)
+int CtdlIPCAttachmentDownload(CtdlIPC *ipc, long msgnum, const char *part,
+               void **buf,
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret)
 {
        register int ret;
        size_t bytes;
@@ -1197,7 +1200,8 @@ int CtdlIPCAttachmentDownload(CtdlIPC *ipc, long msgnum, const char *part, void
 
 /* OIMG */
 int CtdlIPCImageDownload(CtdlIPC *ipc, const char *filename, void **buf,
-               void (*progress_gauge_callback)(long, long), char *cret)
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret)
 {
        register int ret;
        size_t bytes;
@@ -1234,7 +1238,8 @@ int CtdlIPCImageDownload(CtdlIPC *ipc, const char *filename, void **buf,
 
 /* UOPN */
 int CtdlIPCFileUpload(CtdlIPC *ipc, const char *save_as, const char *comment,
-               const char *path, void (*progress_gauge_callback)(long, long),
+               const char *path,
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
                char *cret)
 {
        register int ret;
@@ -1266,7 +1271,8 @@ int CtdlIPCFileUpload(CtdlIPC *ipc, const char *save_as, const char *comment,
 /* UIMG */
 int CtdlIPCImageUpload(CtdlIPC *ipc, int for_real, const char *path,
                const char *save_as,
-               void (*progress_gauge_callback)(long, long), char *cret)
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret)
 {
        register int ret;
        char *aaa;
@@ -2059,10 +2065,10 @@ size_t CtdlIPCPartialRead(CtdlIPC *ipc, void **buf, size_t offset, size_t bytes,
        register size_t len = 0;
        char aaa[SIZ];
 
-       if (!buf) return -1;
-       if (!cret) return -1;
-       if (bytes < 1) return -1;
-       if (offset < 0) return -1;
+       if (!buf) return 0;
+       if (!cret) return 0;
+       if (bytes < 1) return 0;
+       if (offset < 0) return 0;
 
        CtdlIPC_lock(ipc);
        sprintf(aaa, "READ %d|%d", (int)offset, (int)bytes);
@@ -2079,7 +2085,7 @@ size_t CtdlIPCPartialRead(CtdlIPC *ipc, void **buf, size_t offset, size_t bytes,
                } else {
                        /* We have to read regardless */
                        serv_read(ipc, aaa, len);
-                       len = -1;
+                       len = 0;
                }
        }
        CtdlIPC_unlock(ipc);
@@ -2116,7 +2122,8 @@ int CtdlIPCSpecifyPreferredFormats(CtdlIPC *ipc, char *cret, char *formats) {
 
 /* READ */
 int CtdlIPCReadDownload(CtdlIPC *ipc, void **buf, size_t bytes, size_t resume,
-              void (*progress_gauge_callback)(long, long), char *cret)
+              void (*progress_gauge_callback)(unsigned long, unsigned long),
+              char *cret)
 {
        register size_t len;
 
@@ -2132,7 +2139,7 @@ int CtdlIPCReadDownload(CtdlIPC *ipc, void **buf, size_t bytes, size_t resume,
                register size_t block;
 
                block = CtdlIPCPartialRead(ipc, buf, len, 4096, cret);
-               if (block == -1) {
+               if (block == 0) {
                        free(*buf);
                        return 0;
                }
@@ -2146,7 +2153,8 @@ int CtdlIPCReadDownload(CtdlIPC *ipc, void **buf, size_t bytes, size_t resume,
 
 /* READ - pipelined */
 int CtdlIPCHighSpeedReadDownload(CtdlIPC *ipc, void **buf, size_t bytes,
-              size_t resume, void (*progress_gauge_callback)(long, long),
+              size_t resume,
+              void (*progress_gauge_callback)(unsigned long, unsigned long),
               char *cret)
 {
        register size_t len;
@@ -2213,7 +2221,8 @@ int CtdlIPCEndUpload(CtdlIPC *ipc, int discard, char *cret)
 
 /* WRIT */
 int CtdlIPCWriteUpload(CtdlIPC *ipc, const char *path,
-               void (*progress_gauge_callback)(long, long), char *cret)
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret)
 {
        register int ret = -1;
        register size_t offset = 0;
@@ -2257,7 +2266,8 @@ int CtdlIPCWriteUpload(CtdlIPC *ipc, const char *path,
                        if (progress_gauge_callback)
                                progress_gauge_callback(offset, bytes);
                        /* Detect short reads and back up if needed */
-                       fseek(fd, offset, SEEK_SET);
+                       /* offset will never be negative anyway */
+                       fseek(fd, (signed)offset, SEEK_SET);
                } else {
                        break;
                }
@@ -2496,9 +2506,9 @@ static int uds_connectsock(int *isLocal, char *sockpath)
 /*
  * input binary data from socket
  */
-static void serv_read(CtdlIPC *ipc, char *buf, int bytes)
+static void serv_read(CtdlIPC *ipc, char *buf, unsigned int bytes)
 {
-       int len, rlen;
+       unsigned int len, rlen;
 
 #if defined(HAVE_OPENSSL)
        if (ipc->ssl) {
@@ -2521,9 +2531,9 @@ static void serv_read(CtdlIPC *ipc, char *buf, int bytes)
 /*
  * send binary to server
  */
-static void serv_write(CtdlIPC *ipc, const char *buf, int nbytes)
+static void serv_write(CtdlIPC *ipc, const char *buf, unsigned int nbytes)
 {
-       int bytes_written = 0;
+       unsigned int bytes_written = 0;
        int retval;
 
 #if defined(HAVE_OPENSSL)
@@ -2548,7 +2558,7 @@ static void serv_write(CtdlIPC *ipc, const char *buf, int nbytes)
 /*
  * input binary data from encrypted connection
  */
-static void serv_read_ssl(CtdlIPC* ipc, char *buf, int bytes)
+static void serv_read_ssl(CtdlIPC* ipc, char *buf, unsigned int bytes)
 {
        int len, rlen;
        char junk[1];
@@ -2589,9 +2599,9 @@ static void serv_read_ssl(CtdlIPC* ipc, char *buf, int bytes)
 /*
  * send binary to server encrypted
  */
-static void serv_write_ssl(CtdlIPC *ipc, const char *buf, int nbytes)
+static void serv_write_ssl(CtdlIPC *ipc, const char *buf, unsigned int nbytes)
 {
-       int bytes_written = 0;
+       unsigned int bytes_written = 0;
        int retval;
        char junk[1];
 

diff --git a/citadel/citadel_ipc.h b/citadel/citadel_ipc.h
index 98ea5a40da5b9e02debb824c66b0c475fbd7f7c7..33e8401423d46325a909c72c6149a2535e25b764 100644 (file)
--- a/citadel/citadel_ipc.h
+++ b/citadel/citadel_ipc.h
@@ -132,14 +132,17 @@ int CtdlIPCLogout(CtdlIPC *ipc);
 int CtdlIPCTryLogin(CtdlIPC *ipc, const char *username, char *cret);
 int CtdlIPCTryPassword(CtdlIPC *ipc, const char *passwd, char *cret);
 int CtdlIPCTryApopPassword(CtdlIPC *ipc, const char *response, char *cret);
-int CtdlIPCCreateUser(CtdlIPC *ipc, const char *username, int selfservice, char *cret);
+int CtdlIPCCreateUser(CtdlIPC *ipc, const char *username, int selfservice,
+               char *cret);
 int CtdlIPCChangePassword(CtdlIPC *ipc, const char *passwd, char *cret);
-int CtdlIPCKnownRooms(CtdlIPC *ipc, enum RoomList which, int floor, struct march **listing, char *cret);
+int CtdlIPCKnownRooms(CtdlIPC *ipc, enum RoomList which, int floor,
+               struct march **listing, char *cret);
 int CtdlIPCGetConfig(CtdlIPC *ipc, struct usersupp **uret, char *cret);
 int CtdlIPCSetConfig(CtdlIPC *ipc, struct usersupp *uret, char *cret);
 int CtdlIPCGotoRoom(CtdlIPC *ipc, const char *room, const char *passwd,
                struct ctdlipcroom **rret, char *cret);
-int CtdlIPCGetMessages(CtdlIPC *ipc, int which, int whicharg, const char *template,
+int CtdlIPCGetMessages(CtdlIPC *ipc, int which, int whicharg,
+               const char *mtemplate,
                long **mret, char *cret);
 int CtdlIPCGetSingleMessage(CtdlIPC *ipc, long msgnum, int headers, int as_mime,
                struct ctdlipcmessage **mret, char *cret);
@@ -150,55 +153,74 @@ int CtdlIPCSetLastRead(CtdlIPC *ipc, long msgnum, char *cret);
 int CtdlIPCInviteUserToRoom(CtdlIPC *ipc, const char *username, char *cret);
 int CtdlIPCKickoutUserFromRoom(CtdlIPC *ipc, const char *username, char *cret);
 int CtdlIPCGetRoomAttributes(CtdlIPC *ipc, struct quickroom **qret, char *cret);
-int CtdlIPCSetRoomAttributes(CtdlIPC *ipc, int forget, struct quickroom *qret, char *cret);
+int CtdlIPCSetRoomAttributes(CtdlIPC *ipc, int forget, struct quickroom *qret,
+               char *cret);
 int CtdlIPCGetRoomAide(CtdlIPC *ipc, char *cret);
 int CtdlIPCSetRoomAide(CtdlIPC *ipc, const char *username, char *cret);
-int CtdlIPCPostMessage(CtdlIPC *ipc, int flag, const struct ctdlipcmessage *mr, char *cret);
+int CtdlIPCPostMessage(CtdlIPC *ipc, int flag, const struct ctdlipcmessage *mr,
+               char *cret);
 int CtdlIPCRoomInfo(CtdlIPC *ipc, char **iret, char *cret);
 int CtdlIPCDeleteMessage(CtdlIPC *ipc, long msgnum, char *cret);
-int CtdlIPCMoveMessage(CtdlIPC *ipc, int copy, long msgnum, const char *destroom, char *cret);
+int CtdlIPCMoveMessage(CtdlIPC *ipc, int copy, long msgnum,
+               const char *destroom, char *cret);
 int CtdlIPCDeleteRoom(CtdlIPC *ipc, int for_real, char *cret);
-int CtdlIPCCreateRoom(CtdlIPC *ipc, int for_real, const char *roomname, int type,
-               const char *password, int floor, char *cret);
+int CtdlIPCCreateRoom(CtdlIPC *ipc, int for_real, const char *roomname,
+               int type, const char *password, int floor, char *cret);
 int CtdlIPCForgetRoom(CtdlIPC *ipc, char *cret);
-int CtdlIPCSystemMessage(CtdlIPC *ipc, const char *message, char **mret, char *cret);
+int CtdlIPCSystemMessage(CtdlIPC *ipc, const char *message, char **mret,
+               char *cret);
 int CtdlIPCNextUnvalidatedUser(CtdlIPC *ipc, char *cret);
-int CtdlIPCGetUserRegistration(CtdlIPC *ipc, const char *username, char **rret, char *cret);
-int CtdlIPCValidateUser(CtdlIPC *ipc, const char *username, int axlevel, char *cret);
-int CtdlIPCSetRoomInfo(CtdlIPC *ipc, int for_real, const char *info, char *cret);
+int CtdlIPCGetUserRegistration(CtdlIPC *ipc, const char *username, char **rret,
+               char *cret);
+int CtdlIPCValidateUser(CtdlIPC *ipc, const char *username, int axlevel,
+               char *cret);
+int CtdlIPCSetRoomInfo(CtdlIPC *ipc, int for_real, const char *info,
+               char *cret);
 int CtdlIPCUserListing(CtdlIPC *ipc, char **list, char *cret);
 int CtdlIPCSetRegistration(CtdlIPC *ipc, const char *info, char *cret);
 int CtdlIPCMiscCheck(CtdlIPC *ipc, struct ctdlipcmisc *chek, char *cret);
 int CtdlIPCDeleteFile(CtdlIPC *ipc, const char *filename, char *cret);
-int CtdlIPCMoveFile(CtdlIPC *ipc, const char *filename, const char *destroom, char *cret);
-int CtdlIPCNetSendFile(CtdlIPC *ipc, const char *filename, const char *destnode, char *cret);
+int CtdlIPCMoveFile(CtdlIPC *ipc, const char *filename, const char *destroom,
+               char *cret);
+int CtdlIPCNetSendFile(CtdlIPC *ipc, const char *filename,
+               const char *destnode, char *cret);
 int CtdlIPCOnlineUsers(CtdlIPC *ipc, char **listing, time_t *stamp, char *cret);
 int CtdlIPCFileDownload(CtdlIPC *ipc, const char *filename, void **buf,
-               size_t resume, void (*progress_gauge_callback)(long, long),
+               size_t resume,
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret);
+int CtdlIPCAttachmentDownload(CtdlIPC *ipc, long msgnum, const char *part,
+               void **buf,
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
                char *cret);
-int CtdlIPCAttachmentDownload(CtdlIPC *ipc, long msgnum, const char *part, void **buf,
-               void (*progress_gauge_callback)(long, long), char *cret);
 int CtdlIPCImageDownload(CtdlIPC *ipc, const char *filename, void **buf,
-               void (*progress_gauge_callback)(long, long), char *cret);
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret);
 int CtdlIPCFileUpload(CtdlIPC *ipc, const char *save_as, const char *comment,
-               const char *path, void (*progress_gauge_callback)(long, long),
+               const char *path,
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
                char *cret);
 int CtdlIPCImageUpload(CtdlIPC *ipc, int for_real, const char *path,
                const char *save_as,
-               void (*progress_gauge_callback)(long, long), char *cret);
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret);
 int CtdlIPCQueryUsername(CtdlIPC *ipc, const char *username, char *cret);
 int CtdlIPCFloorListing(CtdlIPC *ipc, char **listing, char *cret);
-int CtdlIPCCreateFloor(CtdlIPC *ipc, int for_real, const char *name, char *cret);
+int CtdlIPCCreateFloor(CtdlIPC *ipc, int for_real, const char *name,
+               char *cret);
 int CtdlIPCDeleteFloor(CtdlIPC *ipc, int for_real, int floornum, char *cret);
-int CtdlIPCEditFloor(CtdlIPC *ipc, int floornum, const char *floorname, char *cret);
-int CtdlIPCIdentifySoftware(CtdlIPC *ipc, int developerid, int clientid, int revision,
-               const char *software_name, const char *hostname, char *cret);
-int CtdlIPCSendInstantMessage(CtdlIPC *ipc, const char *username, const char *text,
+int CtdlIPCEditFloor(CtdlIPC *ipc, int floornum, const char *floorname,
                char *cret);
+int CtdlIPCIdentifySoftware(CtdlIPC *ipc, int developerid, int clientid,
+               int revision, const char *software_name, const char *hostname,
+               char *cret);
+int CtdlIPCSendInstantMessage(CtdlIPC *ipc, const char *username,
+               const char *text, char *cret);
 int CtdlIPCGetInstantMessage(CtdlIPC *ipc, char **listing, char *cret);
 int CtdlIPCEnableInstantMessageReceipt(CtdlIPC *ipc, int mode, char *cret);
 int CtdlIPCSetBio(CtdlIPC *ipc, char *bio, char *cret);
-int CtdlIPCGetBio(CtdlIPC *ipc, const char *username, char **listing, char *cret);
+int CtdlIPCGetBio(CtdlIPC *ipc, const char *username, char **listing,
+               char *cret);
 int CtdlIPCListUsersWithBios(CtdlIPC *ipc, char **listing, char *cret);
 int CtdlIPCStealthMode(CtdlIPC *ipc, int mode, char *cret);
 int CtdlIPCTerminateSession(CtdlIPC *ipc, int sid, char *cret);
@@ -243,12 +265,15 @@ size_t CtdlIPCPartialRead(CtdlIPC *ipc, void **buf, size_t offset,
                size_t bytes, char *cret);
 int CtdlIPCEndUpload(CtdlIPC *ipc, int discard, char *cret);
 int CtdlIPCWriteUpload(CtdlIPC *ipc, const char *path,
-               void (*progress_gauge_callback)(long, long), char *cret);
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret);
 int CtdlIPCEndDownload(CtdlIPC *ipc, char *cret);
 int CtdlIPCReadDownload(CtdlIPC *ipc, void **buf, size_t bytes, size_t resume,
-               void (*progress_gauge_callback)(long, long), char *cret);
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
+               char *cret);
 int CtdlIPCHighSpeedReadDownload(CtdlIPC *ipc, void **buf, size_t bytes,
-               size_t resume, void (*progress_gauge_callback)(long, long),
+               size_t resume,
+               void (*progress_gauge_callback)(unsigned long, unsigned long),
                char *cret);
 int CtdlIPCGenericCommand(CtdlIPC *ipc, const char *command,
                const char *to_send, size_t bytes_to_send, char **to_receive,