* Trying to fix IMAP brokenness on Linux-x64. Committing changes even

[citadel.git] / citadel / tools.h

diff --git a/citadel/tools.h b/citadel/tools.h
index 479bc054c3260383ec5e455b3717e51b610dff69..7beb1bb948aaeccaf2b8c5ac49c9dd49c31e18f1 100644 (file)
--- a/citadel/tools.h
+++ b/citadel/tools.h
@@ -1,15 +1,15 @@
 /* $Id$ */
 char *safestrncpy(char *dest, const char *src, size_t n);
 int num_tokens (const char *source, char tok);
-void extract_token(char *dest, const char *source, unsigned long parmnum, char separator);
-int extract_int (const char *source, unsigned long parmnum);
-long extract_long (const char *source, unsigned long parmnum);
-unsigned long extract_unsigned_long(const char *source, unsigned long parmnum);
+void extract_token(char *dest, const char *source, int parmnum, char separator);
+int extract_int (const char *source, int parmnum);
+long extract_long (const char *source, int parmnum);
+unsigned long extract_unsigned_long(const char *source, int parmnum);
 void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen);
 int CtdlDecodeBase64(char *dest, const char *source, size_t length);
 void striplt(char *);
 int haschar(const char *st, int ch);
-void remove_token(char *source, unsigned long parmnum, char separator);
+void remove_token(char *source, int parmnum, char separator);
 void fmt_date(char *buf, size_t n, time_t thetime, int seconds);
 int is_msg_in_mset(char *mset, long msgnum);
 char *memreadline(char *start, char *buf, int maxlen);
@@ -21,8 +21,8 @@ int strncasecmp(char *, char *, int);
 #define strcasecmp(x,y) strncasecmp(x,y,INT_MAX);
 #endif
 
-#define extract(dest,source,parmnum)   extract_token(dest,source,parmnum,'|')
-#define num_parms(source)              num_tokens(source, '|')
+#define extract(dest,source,parmnum)   extract_token(dest,source,parmnum,(char)'|')
+#define num_parms(source)              num_tokens(source,(char)'|')
 void stripout(char *str, char leftboundary, char rightboundary);
 void stripallbut(char *str, char leftboundary, char rightboundary);