* Minor and/or cosmetic changes made during x64 troubleshooting

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 060128543098982f8610f8a9e96acaa66472159a..24049771ea8565ade32855f26bc3eb5affb4b6be 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 629.7  2005/01/19 03:03:36  ajc
+ * Minor and/or cosmetic changes made during x64 troubleshooting
+
  Revision 629.6  2005/01/18 17:58:38  ajc
  * Trying to fix IMAP brokenness on Linux-x64.  Committing changes even
    though there are a lot of annoying trace messages in this tree, because
@@ -6277,4 +6280,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 d0d68b6fbd5714ebd297ed64497d1be6f6f01ef2..3dff0505e798a78f9fd80c974864e5d4f1a06ffc 100644 (file)
--- a/citadel/citadel_ipc.c
+++ b/citadel/citadel_ipc.c
@@ -2826,7 +2826,7 @@ static void CtdlIPC_getline(CtdlIPC* ipc, char *buf)
 
 void CtdlIPC_chat_recv(CtdlIPC* ipc, char* buf)
 {
-       return CtdlIPC_getline(ipc, buf);
+       CtdlIPC_getline(ipc, buf);
 }
 
 /*
@@ -2856,7 +2856,7 @@ static void CtdlIPC_putline(CtdlIPC *ipc, const char *buf)
 
 void CtdlIPC_chat_send(CtdlIPC* ipc, const char* buf)
 {
-       return CtdlIPC_putline(ipc, buf);
+       CtdlIPC_putline(ipc, buf);
 }
 
 

diff --git a/citadel/citadel_ipc.h b/citadel/citadel_ipc.h
index e077ea0528904266467c44ca31412bbc6e6b1330..10c5d589f4e8877efd0aba31e67bbc5385cbf170 100644 (file)
--- a/citadel/citadel_ipc.h
+++ b/citadel/citadel_ipc.h
@@ -157,7 +157,7 @@ enum RoomList {
        SubscribedRoomsWithNoNewMessages,
        UnsubscribedRooms,
        AllAccessibleRooms,
-       AllPublicRooms,
+       AllPublicRooms
 };
 #define AllFloors -1
 enum MessageList {
@@ -167,11 +167,11 @@ enum MessageList {
        LastMessages,
        FirstMessages,
        MessagesGreaterThan,
-       MessagesLessThan,
+       MessagesLessThan
 };
 enum MessageDirection {
        ReadReverse = -1,
-       ReadForward = 1,
+       ReadForward = 1
 };
 
 /* Shared Diffie-Hellman parameters */

diff --git a/citadel/citserver.c b/citadel/citserver.c
index eda6a754efb9fd26597d5cbb0959fcf9e6dc8780..967e863bd1e6a1ed316552c5b986a6d07efbde83 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -887,7 +887,7 @@ void begin_session(struct CitContext *con)
        strcpy(con->fake_hostname, "");
        strcpy(con->fake_roomname, "");
        generate_nonce(con);
-       snprintf(con->temp, sizeof con->temp, tmpnam(NULL));
+       safestrncpy(con->temp, tmpnam(NULL), sizeof con->temp);
        safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
        safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
        con->cs_host[sizeof con->cs_host - 1] = 0;

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index 94fc73ee10f4904fb29470241578cd8ef5b505af..b2b2a691f17556b70592d94b308b0e738b9277c9 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -466,9 +466,9 @@ void cdb_decompress_if_necessary(struct cdbdata *cdb) {
        uncompressed_data = malloc(zheader.uncompressed_len);
 
        if (uncompress( (Bytef *) uncompressed_data,
-                       &destLen,
-                       compressed_data,
-                       sourceLen
+                       (uLongf *)&destLen,
+                       (const Bytef *)compressed_data,
+                       (uLong)sourceLen
        ) != Z_OK) {
                lprintf(CTDL_EMERG, "uncompress() error\n");
                abort();
@@ -761,7 +761,7 @@ void cdb_rewind(int cdb)
        if (MYCURSORS[cdb] != NULL) {
                lprintf(CTDL_EMERG, "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
                abort();
-               //cclose(MYCURSORS[cdb]);
+               /* cclose(MYCURSORS[cdb]); */
        }
 
        /*

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 810948244e148f0c1c355902861e8ff43011b5ef..86088b79c3865be51237f1bb725518e6347dd31d 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -936,8 +936,7 @@ void imap_fetch_bodystructure (long msgnum, char *item,
  * imap_do_fetch() calls imap_do_fetch_msg() to output the data of an
  * individual message, once it has been selected for output.
  */
-void imap_do_fetch_msg(int seq,
-                       int num_items, char **itemlist) {
+void imap_do_fetch_msg(int seq, int num_items, char **itemlist) {
        int i;
        struct CtdlMessage *msg = NULL;
 

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index 3bcecf5a5874000cb2787cb8ef394698e7ae32f5..c19f92316dd88c9f04b1b1b1c66218bc30e08eb9 100644 (file)
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -140,7 +140,7 @@ int rbl_check(char *message_to_spammer) {
        struct sockaddr_in sin;
        int len;        /* should be socklen_t but doesn't work on Macintosh */
 
-       if (!getpeername(CC->client_socket, (struct sockaddr *) &sin, &len)) {
+       if (!getpeername(CC->client_socket, (struct sockaddr *) &sin, (socklen_t *)&len)) {
                return(rbl_check_addr(&sin.sin_addr, message_to_spammer));
        }
        return(0);

diff --git a/citadel/messages.c b/citadel/messages.c
index f3e6ccc3759c32308239763b43c9dee40bf6e80a..8e1f12884ca668e11f2ef0e09f33d8af54200df9 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -1426,7 +1426,7 @@ void image_view(CtdlIPC *ipc, unsigned long msg)
                                void *file = NULL; /* The downloaded file */
                                int r;
        
-                               // view image
+                               /* view image */
                                found = -found;
                                r = CtdlIPCAttachmentDownload(ipc, msg, ptr->number, &file, progress, buf);
                                if (r / 100 != 2) {

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index 321a2df32a80120649e800241cd4a0a89bf4f2bd..fa691c37029b02ffade24adbd765b6e808e6a7ba 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -71,7 +71,7 @@ int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
        char buf[SIZ];
        int buf_length = 0;
        int soft_line_break = 0;
-       int ch;
+       unsigned int ch;
        int decoded_length = 0;
        int i;
 

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index ec06acacaadfdb6bb3ebf52b2861bf7ef9486809..e8e51eb935e8ace1ce68590a8707425f63259758 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1580,7 +1580,7 @@ void cmd_msg3(char *cmdbuf)
        }
 
        cprintf("%d %ld\n", BINARY_FOLLOWS, (long)smr.len);
-       client_write(smr.ser, smr.len);
+       client_write((char *)smr.ser, (int)smr.len);
        free(smr.ser);
 }
 
@@ -1859,7 +1859,7 @@ void serialize_message(struct ser_ret *ret,               /* return values */
 
        for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
                ret->ser[wlen++] = (char)forder[i];
-               strcpy(&ret->ser[wlen], msg->cm_fields[(int)forder[i]]);
+               strcpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]]);
                wlen = wlen + strlen(msg->cm_fields[(int)forder[i]]) + 1;
        }
        if (ret->len != wlen) lprintf(CTDL_ERR, "ERROR: len=%ld wlen=%ld\n",

diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index bd0904e0d39f7b292900d697df119696f973e07c..a165bd8c5f31cbd1047937cb09a7f0cc359ae00f 100644 (file)
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -12,6 +12,7 @@
  */
 char *serv_bio_init(void);
 char *serv_calendar_init(void);
+char *serv_notes_init(void);
 char *serv_ldap_init(void);
 char *serv_chat_init(void);
 char *serv_expire_init(void);

diff --git a/citadel/server.h b/citadel/server.h
index c1761e30bba520a0738ff5038ee218ef81fe0769..e0b5335bcec74b76b564157edbfa080530fe5ad0 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -165,7 +165,7 @@ typedef struct CitContext t_context;
 enum {
        CON_IDLE,               /* This context is doing nothing */
        CON_READY,              /* This context needs attention */
-       CON_EXECUTING,          /* This context is bound to a thread */
+       CON_EXECUTING           /* This context is bound to a thread */
 };
 
 
@@ -454,7 +454,7 @@ struct MetaData {
  */
 struct ser_ret {
         size_t len;
-        char *ser;
+        unsigned char *ser;
 };
 
 

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index fa486391cd0546f0b181da3312c05b83483ec48b..94d98d5dad0379f997429cba6f009de56533dc80 100644 (file)
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -30,7 +30,7 @@ enum LogLevel {
        /* Unimportant progress messages, etc. */
         CTDL_INFO,     /* informational */
        /* Debugging messages */
-        CTDL_DEBUG,    /* debug-level messages */
+        CTDL_DEBUG     /* debug-level messages */
 };
 
 #ifdef __GNUC__

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 211907a48ea1ef4b3a4d79e6134e815f8417936e..72ebc12986080952a3f6839d844958fe86fdb4b2 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -704,8 +704,6 @@ void cmd_pass(char *buf)
        case pass_ok:
                logged_in_response();
                return;
-               cprintf("%d Can't find user record!\n",
-                       ERROR + INTERNAL_ERROR);
        }
 }