fix regression. make the hook types be ints.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/curs_lib.c b/curs_lib.c
index 451a6b1..e938adf 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -581,10 +581,10 @@ int mutt_addwch (wchar_t wc)
  * when printed.
  */
 
-void mutt_format_string (char *dest, size_t destlen,
-                         unsigned int min_width, int max_width,
+void mutt_format_string (char *dest, ssize_t destlen,
+                         int min_width, int max_width,
                          int right_justify, char m_pad_char,
-                         const char *s, size_t n, int arboreal)
+                         const char *s, ssize_t n, int arboreal)
 {
   char *p;
   wchar_t wc;

diff --git a/hook.c b/hook.c
index 7347939..e763f14 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -33,7 +33,7 @@
 #define ERROR_STOP      0
 
 typedef struct hook {
-  unsigned long type;           /* hook type */
+  int type;                     /* hook type */
   rx_t rx;                      /* regular expression */
   char *command;                /* filename, command or pattern to execute */
   pattern_t *pattern;           /* used for fcc,save,send-hook */
@@ -301,7 +301,7 @@ void mutt_folder_hook (char *path)
   current_hook_type = 0;
 }
 
-char *mutt_find_hook (unsigned long type, const char *pat)
+char *mutt_find_hook (int type, const char *pat)
 {
   HOOK *tmp = Hooks;
 
@@ -313,7 +313,7 @@ char *mutt_find_hook (unsigned long type, const char *pat)
   return (NULL);
 }
 
-void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, unsigned long type)
+void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
 {
   BUFFER err, token;
   HOOK *hook;

diff --git a/protos.h b/protos.h
index 8178944..d4b6bea 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -95,7 +95,7 @@ char *mutt_charset_hook (const char *);
 char *mutt_iconv_hook (const char *);
 char *mutt_expand_path (char *, size_t);
 char *_mutt_expand_path (char *, size_t, int);
-char *mutt_find_hook (unsigned long, const char *);
+char *mutt_find_hook (int, const char *);
 char *mutt_gecos_name (char *, size_t, struct passwd *);
 char *mutt_gen_msgid (void);
 char *mutt_get_body_charset (char *, size_t, BODY *);
@@ -134,8 +134,8 @@ void mutt_expand_fmt (char *, size_t, const char *, const char *);
 void mutt_expand_link (char *, const char *, const char *);
 void mutt_fix_reply_recipients (ENVELOPE * env);
 void mutt_folder_hook (char *);
-void mutt_format_string (char *, size_t, unsigned int, int, int, char, const char *,
-                         size_t, int);
+void mutt_format_string (char *, ssize_t, int, int, int, char, const char *,
+                         ssize_t, int);
 void mutt_format_s (char *, size_t, const char *, const char *);
 void mutt_format_s_tree (char *, size_t, const char *, const char *);
 void mutt_forward_intro (FILE * fp, HEADER * cur);
@@ -181,7 +181,7 @@ void mutt_select_fcc (char *, size_t, HEADER *);
 
 #define mutt_select_file(A,B,C) _mutt_select_file(A,B,C,NULL,NULL)
 void _mutt_select_file (char *, size_t, int, char ***, int *);
-void mutt_message_hook (CONTEXT *, HEADER *, unsigned long);
+void mutt_message_hook (CONTEXT *, HEADER *, int);
 void _mutt_set_flag (CONTEXT *, HEADER *, int, int, int);
 
 #define mutt_set_flag(a,b,c,d) _mutt_set_flag(a,b,c,d,1)