[patch] minor amd64 fixes

cyrus-imapd-2.1.15-amd64.patch (text/plain), 13.96 KB, created by Andreas Pokorny on 2004-06-29 04:37:55 UTC

diff -Naur cyrus-imapd-2.1.15/acap/acap.c cyrus-imapd-2.1.15-patched/acap/acap.c
--- cyrus-imapd-2.1.15/acap/acap.c	2004-06-29 11:18:34.374564609 +0000
+++ cyrus-imapd-2.1.15-patched/acap/acap.c	2004-06-29 10:53:52.865366714 +0000
@@ -1998,7 +1998,7 @@
 	prot_printf(conn->pout, "RETURN (");
 	for (i = 0; i < ret_attrs->n_attrs; i++) {
 	    if (i > 0) prot_putc(' ', conn->pout);
-	    prot_printf(conn->pout, "{%d+}\r\n%s", 
+	    prot_printf(conn->pout, "{%lu+}\r\n%s", 
 			strlen(ret_attrs->attrs[i].attrname), 
 			ret_attrs->attrs[i].attrname);
 
@@ -2034,7 +2034,7 @@
     if (sort_order) {
 	prot_printf(conn->pout, "SORT (");
 	while (sort_order) {
-	    prot_printf(conn->pout, "{%d+}\r\n%s {%d+}\r\n%s", 
+	    prot_printf(conn->pout, "{%lu+}\r\n%s {%lu+}\r\n%s", 
 			strlen(sort_order->attrname), sort_order->attrname,
 			strlen(sort_order->comparator),sort_order->comparator);
 	    if (sort_order->next) prot_putc(' ', conn->pout);
@@ -2119,7 +2119,7 @@
 	prot_printf(conn->pout, "RETURN (");
 	for (i = 0; i < ret_attrs->n_attrs; i++) {
 	    if (i > 0) prot_putc(' ', conn->pout);
-	    prot_printf(conn->pout, "{%d+}\r\n%s", 
+	    prot_printf(conn->pout, "{%lu+}\r\n%s", 
 			strlen(ret_attrs->attrs[i].attrname), 
 			ret_attrs->attrs[i].attrname);
 
@@ -2139,7 +2139,7 @@
     if (sort_order) {
 	prot_printf(conn->pout, "SORT (");
 	while (sort_order) {
-	    prot_printf(conn->pout, "{%d+}\r\n%s {%d+}\r\n%s", 
+	    prot_printf(conn->pout, "{%lu+}\r\n%s {%lu+}\r\n%s", 
 			strlen(sort_order->attrname), sort_order->attrname,
 			strlen(sort_order->comparator),sort_order->comparator);
 	    if (sort_order->next) prot_putc(' ', conn->pout);
diff -Naur cyrus-imapd-2.1.15/imap/imapd.c cyrus-imapd-2.1.15-patched/imap/imapd.c
--- cyrus-imapd-2.1.15/imap/imapd.c	2004-06-29 11:18:34.387562509 +0000
+++ cyrus-imapd-2.1.15-patched/imap/imapd.c	2004-06-29 11:04:45.942282179 +0000
@@ -5847,7 +5847,7 @@
     memset(&tmp, 0, sizeof(struct buf));
     memset(&user, 0, sizeof(struct buf));
 
-    prot_printf(pout, "ACL0 GETACL {%d+}\r\n%s\r\n",
+    prot_printf(pout, "ACL0 GETACL {%ld+}\r\n%s\r\n",
 		strlen(mailbox), mailbox);
 
     while(1) {
@@ -5898,7 +5898,7 @@
 
 		snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);
 		
-		prot_printf(pout, "%s DELETEACL {%d+}\r\n%s {%d+}\r\n%s\r\n",
+		prot_printf(pout, "%s DELETEACL {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
 			    tagbuf, strlen(mailbox), mailbox,
 			    strlen(user.s), user.s);
 		if(c == '\r') {
@@ -5975,7 +5975,7 @@
 
 	snprintf(tag, sizeof(tag), "SACL%d", tagnum++);
 	
-	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
+	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
 		    tag,
 		    mailboxlen, mailbox,
 		    strlen(acl), acl,
@@ -6093,10 +6093,10 @@
     if(!r) {
 	if(topart) {
 	    /* need to send partition as an atom */
-	    prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s %s\r\n",
+	    prot_printf(be->out, "LC1 LOCALCREATE {%ld+}\r\n%s %s\r\n",
 			strlen(name), name, topart);
 	} else {
-	    prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s\r\n",
+	    prot_printf(be->out, "LC1 LOCALCREATE {%ld+}\r\n%s\r\n",
 			strlen(name), name);
 	}
 	r = getresult(be->in, "LC1");
@@ -6131,7 +6131,7 @@
     if(!r) {
 	backout_mupdate = 1;
 
-	prot_printf(be->out, "D01 UNDUMP {%d+}\r\n%s ", strlen(name), name);
+	prot_printf(be->out, "D01 UNDUMP {%ld+}\r\n%s ", strlen(name), name);
 
 	r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,
 			 imapd_authstate);
@@ -6176,7 +6176,7 @@
 
 	/* 6.5) Kick remote server to correct mupdate entry */
 	/* Note that we don't really care if this succeeds or not */
-	prot_printf(be->out, "MP1 MUPDATEPUSH {%d+}\r\n%s\r\n",
+	prot_printf(be->out, "MP1 MUPDATEPUSH {%ld+}\r\n%s\r\n",
 		    strlen(name), name);
 	rerr = getresult(be->in, "MP1");
 	if(rerr) {
@@ -6215,7 +6215,7 @@
     }
     if(r && backout_remotebox) {
 	rerr = 0;
-	prot_printf(be->out, "LD1 LOCALDELETE {%d+}\r\n%s\r\n",
+	prot_printf(be->out, "LD1 LOCALDELETE {%ld+}\r\n%s\r\n",
 		    strlen(name), name);
 	rerr = getresult(be->in, "LD1");
  	if(rerr) {
@@ -6426,7 +6426,7 @@
 		if(!r) {
 		    /* note use of + to force the setting of a nonexistant
 		     * quotaroot */
-		    prot_printf(be->out, "Q01 SETQUOTA {%d+}\r\n" \
+		    prot_printf(be->out, "Q01 SETQUOTA {%ld+}\r\n" \
 				         "+%s (STORAGE %d)\r\n",
 				strlen(name)+1, name, quota.limit);
 		    r = getresult(be->in, "Q01");
@@ -6972,7 +6972,7 @@
 
     /* if it's too long, literal it */
     if (*p || len >= 1024) {
-	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);
+	prot_printf(imapd_out, "{%lu}\r\n%s", strlen(s), s);
     } else {
 	prot_printf(imapd_out, "\"%s\"", s);
     }
@@ -7002,7 +7002,7 @@
 
     /* if it's too long, literal it */
     if (*p || len >= 1024) {
-	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);
+	prot_printf(imapd_out, "{%lu}\r\n%s", strlen(s), s);
     } else {
 	prot_printf(imapd_out, "\"%s\"", s);
     }
diff -Naur cyrus-imapd-2.1.15/imap/mbdump.c cyrus-imapd-2.1.15-patched/imap/mbdump.c
--- cyrus-imapd-2.1.15/imap/mbdump.c	2003-04-17 16:46:50.000000000 +0000
+++ cyrus-imapd-2.1.15-patched/imap/mbdump.c	2004-06-29 11:12:06.672173565 +0000
@@ -239,7 +239,7 @@
 
 	/* send filename, size, and contents */
 	if(first) {
-	    prot_printf(pout, "{%d}\r\n",
+	    prot_printf(pout, "{%ld}\r\n",
 			strlen(name));
 
 	    if(!tag) {
@@ -260,7 +260,7 @@
 
 	    first = 0;
 	} else {
-	    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+	    prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
 			strlen(name),
 			(!tag ? "+" : ""),
 			name, len,
@@ -295,7 +295,7 @@
 
 	/* send filename, size, and contents */
 	if(first) {
-	    prot_printf(pout, "{%d}\r\n",
+	    prot_printf(pout, "{%ld}\r\n",
 			strlen(data_files[i]));
 	    
 	    if(!tag) {
@@ -315,7 +315,7 @@
 			(!tag ? "+" : ""));
 	    first = 0;
 	} else {
-	    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+	    prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
 			strlen(data_files[i]),
 			(!tag ? "+" : ""),
 			data_files[i], len,
@@ -425,7 +425,7 @@
 				snprintf(ext_fname, sizeof(ext_fname),
 					 "SIEVE-%s", next->d_name);
 			    }
-			    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+			    prot_printf(pout, " {%ld%s}\r\n%s {%lu%s}\r\n",
 					strlen(ext_fname), 
 					(!tag ? "+" : ""),
 					ext_fname,
diff -Naur cyrus-imapd-2.1.15/imap/message.c cyrus-imapd-2.1.15-patched/imap/message.c
--- cyrus-imapd-2.1.15/imap/message.c	2003-07-01 14:39:54.000000000 +0000
+++ cyrus-imapd-2.1.15-patched/imap/message.c	2004-06-29 11:11:28.597319434 +0000
@@ -2075,7 +2075,7 @@
     if (*p || len >= 1024) {
 	/* Write out as literal */
 	char buf[100];
-	snprintf(buf, sizeof(buf), "{%u}\r\n", strlen(s));
+	snprintf(buf, sizeof(buf), "{%lu}\r\n", strlen(s));
 	message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));
 	for (p = buf; *p; p++) *(ibuf->end)++ = *p;
 	for (p = s; *p; p++) *(ibuf->end)++ = *p;
diff -Naur cyrus-imapd-2.1.15/imap/mupdate-client.c cyrus-imapd-2.1.15-patched/imap/mupdate-client.c
--- cyrus-imapd-2.1.15/imap/mupdate-client.c	2004-06-29 11:18:34.391561863 +0000
+++ cyrus-imapd-2.1.15-patched/imap/mupdate-client.c	2004-06-29 11:11:16.239314098 +0000
@@ -156,7 +156,7 @@
 	if(r != SASL_OK) return 1;
 	
 	/* it's always ok to send the mechname quoted */
-	prot_printf(h->pout, "A01 AUTHENTICATE \"%s\" {%d+}\r\n%s\r\n",
+	prot_printf(h->pout, "A01 AUTHENTICATE \"%s\" {%ld+}\r\n%s\r\n",
 		    mechusing, strlen(buf), buf);
     } else {
         prot_printf(h->pout, "A01 AUTHENTICATE \"%s\"\r\n", mechusing);
@@ -428,7 +428,7 @@
     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
 
     prot_printf(handle->pout,
-		"X%u ACTIVATE {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+		"X%u ACTIVATE {%ld+}\r\n%s {%ld+}\r\n%s {%ld+}\r\n%s\r\n", 
 		handle->tagn++, strlen(mailbox), mailbox, 
 		strlen(server), server, strlen(acl), acl);
 
@@ -454,7 +454,7 @@
     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
 
     prot_printf(handle->pout,
-		"X%u RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",
+		"X%u RESERVE {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
 		handle->tagn++, strlen(mailbox), mailbox, 
 		strlen(server), server);
 
@@ -480,7 +480,7 @@
     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
 
     prot_printf(handle->pout,
-		"X%u DEACTIVATE {%d+}\r\n%s {%d+}\r\n%s\r\n",
+		"X%u DEACTIVATE {%ld+}\r\n%s {%ld+}\r\n%s\r\n",
 		handle->tagn++, strlen(mailbox), mailbox, 
 		strlen(server), server);
 
@@ -506,7 +506,7 @@
     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
 
     prot_printf(handle->pout,
-		"X%u DELETE {%d+}\r\n%s\r\n", handle->tagn++, 
+		"X%u DELETE {%ld+}\r\n%s\r\n", handle->tagn++, 
 		strlen(mailbox), mailbox);
 
     ret = mupdate_scarf(handle, mupdate_scarf_one, &called, 1, &response);
@@ -575,7 +575,7 @@
     if(!handle || !mailbox || !target) return MUPDATE_BADPARAM;
 
     prot_printf(handle->pout,
-		"X%u FIND {%d+}\r\n%s\r\n", handle->tagn++, 
+		"X%u FIND {%ld+}\r\n%s\r\n", handle->tagn++, 
 		strlen(mailbox), mailbox);
 
     memset(&(handle->mailboxdata_buf), 0, sizeof(handle->mailboxdata_buf));
@@ -608,7 +608,7 @@
 
     if(prefix) {
 	prot_printf(handle->pout,
-		    "X%u LIST {%d+}\r\n%s\r\n", handle->tagn++,
+		    "X%u LIST {%ld+}\r\n%s\r\n", handle->tagn++,
 		    strlen(prefix), prefix);
     } else {
 	prot_printf(handle->pout,
diff -Naur cyrus-imapd-2.1.15/imap/squat_build.c cyrus-imapd-2.1.15-patched/imap/squat_build.c
--- cyrus-imapd-2.1.15/imap/squat_build.c	2003-06-15 22:14:13.000000000 +0000
+++ cyrus-imapd-2.1.15-patched/imap/squat_build.c	2004-06-29 11:13:38.914282193 +0000
@@ -479,7 +479,7 @@
     for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
       SquatWordTableEntry* e = &(t->entries[i]);
       
-      if (e->leaf_presence != NULL && ((int)e->leaf_presence & 1) == 0) {
+      if (e->leaf_presence != NULL && ((long)e->leaf_presence & 1) == 0) {
         free(e->leaf_presence);
       }
     }
@@ -568,7 +568,7 @@
 
   if (word_entry == NULL) {
     /* We are in "per document" mode. */
-    if (((int)e->leaf_presence & 1) != 0) {
+    if (((long)e->leaf_presence & 1) != 0) {
       /* We currently have a singleton here. */
       int oldch = e->leaf_presence_singleton >> 1;
 
@@ -787,7 +787,7 @@
 
       word[0] = (char)i;
 
-      if (((int)e->leaf_presence & 1) != 0) {
+      if (((long)e->leaf_presence & 1) != 0) {
 	/* Got a singleton at this branch point. Just output the single word. */
         word[1] = (char)(e->leaf_presence_singleton >> 1);
         e->leaf_presence = NULL; /* clear the leaf out */
diff -Naur cyrus-imapd-2.1.15/imap/tls.c cyrus-imapd-2.1.15-patched/imap/tls.c
--- cyrus-imapd-2.1.15/imap/tls.c	2003-08-14 16:20:33.000000000 +0000
+++ cyrus-imapd-2.1.15-patched/imap/tls.c	2004-06-29 11:09:43.488283006 +0000
@@ -739,14 +739,14 @@
 	return (ret);
 
     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
-	printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))",
-	       (unsigned int) bio, (long unsigned int) argp,
+	printf("read from %08lX [%08lX] (%d bytes => %ld (0x%X))",
+	       (unsigned long) bio, (unsigned long) argp,
 	       argi, ret, (unsigned int) ret);
 	tls_dump(argp, (int) ret);
 	return (ret);
     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
-	printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))",
-	       (unsigned int) bio, (long unsigned int)argp,
+	printf("write to %08lX [%08lX] (%d bytes => %ld (0x%X))",
+	       (unsigned long) bio, (unsigned long)argp,
 	       argi, ret, (unsigned int) ret);
 	tls_dump(argp, (int) ret);
     }
diff -Naur cyrus-imapd-2.1.15/lib/cyrusdb_skiplist.c cyrus-imapd-2.1.15-patched/lib/cyrusdb_skiplist.c
--- cyrus-imapd-2.1.15/lib/cyrusdb_skiplist.c	2003-08-14 16:20:36.000000000 +0000
+++ cyrus-imapd-2.1.15-patched/lib/cyrusdb_skiplist.c	2004-06-29 11:03:08.818942527 +0000
@@ -1674,7 +1674,7 @@
     ptr = db->map_base + DUMMY_OFFSET(db);
     end = db->map_base + db->map_size;
     while (ptr < end) {
-	printf("%04X: ", ptr - db->map_base);
+	printf("%04lX: ", ptr - db->map_base);
 	switch (TYPE(ptr)) {
 	case DUMMY:
 	    printf("DUMMY ");
@@ -1747,10 +1747,10 @@
 
 	    if (offset > db->map_size) {
 		fprintf(stdout, 
-			"skiplist inconsistent: %04X: ptr %d is %04X; "
-			"eof is %04X\n", 
+			"skiplist inconsistent: %04lX: ptr %d is %04X; "
+			"eof is %04lX\n", 
 			ptr - db->map_base,
-			i, offset, (unsigned int) db->map_size);
+			i, offset, (unsigned long) db->map_size);
 		return CYRUSDB_INTERNAL;
 	    }
 
@@ -1762,7 +1762,7 @@
 		cmp = compare(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q));
 		if (cmp >= 0) {
 		    fprintf(stdout, 
-			    "skiplist inconsistent: %04X: ptr %d is %04X; "
+			    "skiplist inconsistent: %04lX: ptr %d is %04X; "
 			    "compare() = %d\n", 
 			    ptr - db->map_base,
 			    i,
diff -Naur cyrus-imapd-2.1.15/master/master.c cyrus-imapd-2.1.15-patched/master/master.c
--- cyrus-imapd-2.1.15/master/master.c	2004-06-29 11:18:34.428555887 +0000
+++ cyrus-imapd-2.1.15-patched/master/master.c	2004-06-29 11:01:01.435566562 +0000
@@ -964,7 +964,7 @@
 
 void add_service(const char *name, struct entry *e, void *rock)
 {
-    int ignore_err = (int) rock;
+    long ignore_err = (long)rock;
     char *cmd = mystrdup(masterconf_getstring(e, "cmd", NULL));
     int prefork = masterconf_getint(e, "prefork", 0);
     int babysit = masterconf_getswitch(e, "babysit", 0);
@@ -1143,7 +1143,7 @@
 
 void add_event(const char *name, struct entry *e, void *rock)
 {
-    int ignore_err = (int) rock;
+    long ignore_err = (long) rock;
     char *cmd = mystrdup(masterconf_getstring(e, "cmd", NULL));
     int period = 60 * masterconf_getint(e, "period", 0);
     int at = masterconf_getint(e, "at", -1), hour, min;
diff -Naur cyrus-imapd-2.1.15/timsieved/actions.c cyrus-imapd-2.1.15-patched/timsieved/actions.c
--- cyrus-imapd-2.1.15/timsieved/actions.c	2003-06-25 03:34:03.000000000 +0000
+++ cyrus-imapd-2.1.15-patched/timsieved/actions.c	2004-06-29 11:13:49.989494040 +0000
@@ -336,7 +336,7 @@
 
   if (result != TIMSIEVE_OK) {
       if (errstr && *errstr) { 
-	  prot_printf(conn, "NO {%d}\r\n%s\r\n", strlen(errstr), errstr);
+	  prot_printf(conn, "NO {%ld}\r\n%s\r\n", strlen(errstr), errstr);
 	  free(errstr);
       } else {
 	  if (errstr) free(errstr);