Remove __P() and __PMT() wrappers.

9 files changed, 208 insertions, 208 deletions

diff --git a/imap4d/auth_gsasl.c b/imap4d/auth_gsasl.c
index 2ac9637d8..42649d521 100644
--- a/imap4d/auth_gsasl.c
+++ b/imap4d/auth_gsasl.c
@@ -26,7 +26,7 @@
 static Gsasl_ctx *ctx;   
 static Gsasl_session_ctx *sess_ctx; 
 
-static void auth_gsasl_capa_init __P((int disable));
+static void auth_gsasl_capa_init (int disable);
 
 static int
 create_gsasl_stream (stream_t *newstr, stream_t transport, int flags)
diff --git a/imap4d/fetch.c b/imap4d/fetch.c
index bdf2b0b3b..2cbb4b0a2 100644
--- a/imap4d/fetch.c
+++ b/imap4d/fetch.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2005  Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,40 +36,40 @@
 
 struct fetch_command;
 
-static int fetch_all               __P ((struct fetch_command *, char**));
-static int fetch_full              __P ((struct fetch_command *, char**));
-static int fetch_fast              __P ((struct fetch_command *, char**));
-static int fetch_envelope          __P ((struct fetch_command *, char**));
-static int fetch_flags             __P ((struct fetch_command *, char**));
-static int fetch_internaldate      __P ((struct fetch_command *, char**));
-static int fetch_rfc822_header     __P ((struct fetch_command *, char**));
-static int fetch_rfc822_size       __P ((struct fetch_command *, char**));
-static int fetch_rfc822_text       __P ((struct fetch_command *, char**));
-static int fetch_rfc822            __P ((struct fetch_command *, char**));
-static int fetch_bodystructure     __P ((struct fetch_command *, char**));
-static int fetch_body              __P ((struct fetch_command *, char**));
-static int fetch_uid               __P ((struct fetch_command *, char**));
+static int fetch_all               (struct fetch_command *, char**);
+static int fetch_full              (struct fetch_command *, char**);
+static int fetch_fast              (struct fetch_command *, char**);
+static int fetch_envelope          (struct fetch_command *, char**);
+static int fetch_flags             (struct fetch_command *, char**);
+static int fetch_internaldate      (struct fetch_command *, char**);
+static int fetch_rfc822_header     (struct fetch_command *, char**);
+static int fetch_rfc822_size       (struct fetch_command *, char**);
+static int fetch_rfc822_text       (struct fetch_command *, char**);
+static int fetch_rfc822            (struct fetch_command *, char**);
+static int fetch_bodystructure     (struct fetch_command *, char**);
+static int fetch_body              (struct fetch_command *, char**);
+static int fetch_uid               (struct fetch_command *, char**);
 
 /* Helper functions.  */
-static int fetch_envelope0         __P ((message_t));
-static int fetch_bodystructure0    __P ((message_t, int));
-static int bodystructure           __P ((message_t, int));
-static void send_parameter_list    __P ((const char *));
-static int fetch_operation         __P ((message_t, char **, int));
-static int fetch_message           __P ((message_t, unsigned long, unsigned long));
-static int fetch_header            __P ((message_t, unsigned long, unsigned long));
-static int fetch_body_content      __P ((message_t, unsigned long, unsigned long));
-static int fetch_io                __P ((stream_t, unsigned long, unsigned long, unsigned long));
-static int fetch_header_fields     __P ((message_t, char **, unsigned long, unsigned long));
-static int fetch_header_fields_not __P ((message_t, char **, unsigned long, unsigned long));
-static int fetch_send_address      __P ((const char *));
-
-static struct fetch_command* fetch_getcommand __P ((char *, struct fetch_command*));
+static int fetch_envelope0         (message_t);
+static int fetch_bodystructure0    (message_t, int);
+static int bodystructure           (message_t, int);
+static void send_parameter_list    (const char *);
+static int fetch_operation         (message_t, char **, int);
+static int fetch_message           (message_t, unsigned long, unsigned long);
+static int fetch_header            (message_t, unsigned long, unsigned long);
+static int fetch_body_content      (message_t, unsigned long, unsigned long);
+static int fetch_io                (stream_t, unsigned long, unsigned long, unsigned long);
+static int fetch_header_fields     (message_t, char **, unsigned long, unsigned long);
+static int fetch_header_fields_not (message_t, char **, unsigned long, unsigned long);
+static int fetch_send_address      (const char *);
+
+static struct fetch_command* fetch_getcommand (char *, struct fetch_command*);
 
 struct fetch_command
 {
   const char *name;
-  int (*func) __P ((struct fetch_command *, char **));
+  int (*func) (struct fetch_command *, char **);
   message_t msg;
 } fetch_command_table [] =
 {
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index a2ef25aef..0a1de3001 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -90,9 +90,9 @@ static const char *imap4d_capa[] = {
   NULL
 };
 
-static void imap4d_daemon_init __P ((void));
-static void imap4d_daemon __P ((unsigned int, unsigned int));
-static int imap4d_mainloop __P ((int, FILE *, FILE *));
+static void imap4d_daemon_init (void);
+static void imap4d_daemon (unsigned int, unsigned int);
+static int imap4d_mainloop (int, FILE *, FILE *);
 
 static error_t
 imap4d_parse_opt (int key, char *arg, struct argp_state *state)
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index a4c80c95b..40ed9c5f8 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -103,7 +103,7 @@ extern "C" {
 struct imap4d_command
 {
   const char *name;
-  int (*func) __P ((struct imap4d_command *, char *));
+  int (*func) (struct imap4d_command *, char *);
   int states;
   int failure;
   int success;
@@ -166,157 +166,157 @@ extern int login_disabled;
 extern int tls_required;
 
 #ifndef HAVE_STRTOK_R
-extern char *strtok_r __P((char *s, const char *delim, char **save_ptr));
+extern char *strtok_r (char *s, const char *delim, char **save_ptr);
 #endif
   
 /* Imap4 commands */
-extern int  imap4d_append __P ((struct imap4d_command *, char *));
-extern int  imap4d_append0 __P((mailbox_t mbox, int flags, char *text));
-extern int  imap4d_authenticate __P ((struct imap4d_command *, char *));
-extern void imap4d_auth_capability __P((void));
-extern int  imap4d_capability __P ((struct imap4d_command *, char *));
-extern int  imap4d_check __P ((struct imap4d_command *, char *));
-extern int  imap4d_close __P ((struct imap4d_command *, char *));
-extern int  imap4d_copy __P ((struct imap4d_command *, char *));
-extern int  imap4d_copy0 __P ((char *, int, char *, size_t));
-extern int  imap4d_create __P ((struct imap4d_command *, char *));
-extern int  imap4d_delete __P ((struct imap4d_command *, char *));
-extern int  imap4d_examine __P ((struct imap4d_command *, char *));
-extern int  imap4d_expunge __P ((struct imap4d_command *, char *));
-extern int  imap4d_fetch __P ((struct imap4d_command *, char *));
-extern int  imap4d_fetch0 __P ((char *, int, char *, size_t));
-extern int  imap4d_list __P ((struct imap4d_command *, char *));
-extern int  imap4d_lsub __P ((struct imap4d_command *, char *));
-extern int  imap4d_login __P ((struct imap4d_command *, char *));
-extern int  imap4d_logout __P ((struct imap4d_command *, char *));
-extern int  imap4d_noop __P ((struct imap4d_command *, char *));
-extern int  imap4d_rename __P ((struct imap4d_command *, char *));
-extern int  imap4d_search __P ((struct imap4d_command *, char *));
-extern int  imap4d_search0 __P((char *arg, int isuid, char *replybuf, size_t replysize));
-extern int  imap4d_select __P ((struct imap4d_command *, char *));
-extern int  imap4d_select0 __P ((struct imap4d_command *, char *, int));
-extern int  imap4d_select_status __P((void));
+extern int  imap4d_append (struct imap4d_command *, char *);
+extern int  imap4d_append0 (mailbox_t mbox, int flags, char *text);
+extern int  imap4d_authenticate (struct imap4d_command *, char *);
+extern void imap4d_auth_capability (void);
+extern int  imap4d_capability (struct imap4d_command *, char *);
+extern int  imap4d_check (struct imap4d_command *, char *);
+extern int  imap4d_close (struct imap4d_command *, char *);
+extern int  imap4d_copy (struct imap4d_command *, char *);
+extern int  imap4d_copy0 (char *, int, char *, size_t);
+extern int  imap4d_create (struct imap4d_command *, char *);
+extern int  imap4d_delete (struct imap4d_command *, char *);
+extern int  imap4d_examine (struct imap4d_command *, char *);
+extern int  imap4d_expunge (struct imap4d_command *, char *);
+extern int  imap4d_fetch (struct imap4d_command *, char *);
+extern int  imap4d_fetch0 (char *, int, char *, size_t);
+extern int  imap4d_list (struct imap4d_command *, char *);
+extern int  imap4d_lsub (struct imap4d_command *, char *);
+extern int  imap4d_login (struct imap4d_command *, char *);
+extern int  imap4d_logout (struct imap4d_command *, char *);
+extern int  imap4d_noop (struct imap4d_command *, char *);
+extern int  imap4d_rename (struct imap4d_command *, char *);
+extern int  imap4d_search (struct imap4d_command *, char *);
+extern int  imap4d_search0 (char *arg, int isuid, char *replybuf, size_t replysize);
+extern int  imap4d_select (struct imap4d_command *, char *);
+extern int  imap4d_select0 (struct imap4d_command *, char *, int);
+extern int  imap4d_select_status (void);
 #ifdef WITH_TLS
-extern int  imap4d_starttls __P ((struct imap4d_command *, char *));
-extern void starttls_init __P((void));
+extern int  imap4d_starttls (struct imap4d_command *, char *);
+extern void starttls_init (void);
 #endif /* WITH_TLS */
-extern int  imap4d_status __P ((struct imap4d_command *, char *));
-extern int  imap4d_store __P ((struct imap4d_command *, char *));
-extern int  imap4d_store0 __P ((char *, int, char *, size_t));
-extern int  imap4d_subscribe __P ((struct imap4d_command *, char *));
-extern int  imap4d_uid __P ((struct imap4d_command *, char *));
-extern int  imap4d_unsubscribe __P ((struct imap4d_command *, char *));
-extern int  imap4d_namespace __P ((struct imap4d_command *, char *));
-extern int  imap4d_version __P ((struct imap4d_command *, char *));
-extern int  imap4d_idle __P ((struct imap4d_command *, char *));
+extern int  imap4d_status (struct imap4d_command *, char *);
+extern int  imap4d_store (struct imap4d_command *, char *);
+extern int  imap4d_store0 (char *, int, char *, size_t);
+extern int  imap4d_subscribe (struct imap4d_command *, char *);
+extern int  imap4d_uid (struct imap4d_command *, char *);
+extern int  imap4d_unsubscribe (struct imap4d_command *, char *);
+extern int  imap4d_namespace (struct imap4d_command *, char *);
+extern int  imap4d_version (struct imap4d_command *, char *);
+extern int  imap4d_idle (struct imap4d_command *, char *);
   
 /* Shared between fetch and store */  
 extern void fetch_flags0 (const char *prefix, message_t msg, int isuid);
 
 /* Synchronisation on simultaneous access.  */
-extern int imap4d_sync __P ((void));
-extern int imap4d_sync_flags __P ((size_t));
-extern size_t uid_to_msgno __P ((size_t));
+extern int imap4d_sync (void);
+extern int imap4d_sync_flags (size_t);
+extern size_t uid_to_msgno (size_t);
 extern void imap4d_set_observer (mailbox_t mbox);
   
 /* Signal handling.  */
-extern RETSIGTYPE imap4d_sigchld __P ((int));
-extern RETSIGTYPE imap4d_signal __P ((int));
-extern int imap4d_bye __P ((int));
-extern int imap4d_bye0 __P ((int reason, struct imap4d_command *command));
+extern RETSIGTYPE imap4d_sigchld (int);
+extern RETSIGTYPE imap4d_signal (int);
+extern int imap4d_bye (int);
+extern int imap4d_bye0 (int reason, struct imap4d_command *command);
 
 /* Namespace functions */
-extern int set_namespace __P((int i, char *str));
-extern int namespace_init __P((char *path));
-extern char * namespace_getfullpath __P((char *name, const char *delim));
-extern char * namespace_checkfullpath __P((char *name, const char *pattern,
-					   const char *delim));
+extern int set_namespace (int i, char *str);
+extern int namespace_init (char *path);
+extern char * namespace_getfullpath (char *name, const char *delim);
+extern char * namespace_checkfullpath (char *name, const char *pattern,
+				       const char *delim);
 /* Capability functions */
-extern void imap4d_capability_add __P((const char *str));
-extern void imap4d_capability_remove __P((const char *str));
-extern void imap4d_capability_init __P((void));
+extern void imap4d_capability_add (const char *str);
+extern void imap4d_capability_remove (const char *str);
+extern void imap4d_capability_init (void);
   
 /* Helper functions.  */
-extern int  util_out __P ((int, const char *, ...));
-extern int  util_send __P ((const char *, ...));
-extern int  util_send_qstring __P ((const char *));
-extern int  util_send_literal __P ((const char *));
-extern int  util_start __P ((char *));
-extern int  util_finish __P ((struct imap4d_command *, int, const char *, ...));
-extern int  util_getstate __P ((void));
-extern int  util_do_command __P ((char *));
-extern char *imap4d_readline __P ((void));
-extern char *imap4d_readline_ex __P ((void));
-extern char *util_getword __P ((char *, char **));
-extern char *util_getitem __P ((char *, const char *, char **));
-extern int  util_token __P ((char *, size_t, char **));
-extern void util_unquote __P ((char **));
-extern char *util_tilde_expansion __P ((const char *, const char *));
-extern char *util_getfullpath __P ((char *, const char *));
-extern int  util_msgset __P ((char *, size_t **, int *, int));
-extern int  util_upper __P ((char *));
-extern struct imap4d_command *util_getcommand __P ((char *,
-						    struct imap4d_command []));
-extern int util_parse_internal_date0 __P((char *date, time_t *timep, char **endp));
-extern int util_parse_internal_date __P((char *date, time_t *timep));
-extern int util_parse_822_date __P((char *date, time_t *timep));
-extern int util_parse_ctime_date __P((const char *date, time_t *timep));
-extern char *util_strcasestr __P((const char *haystack, const char *needle));
-extern int util_parse_attributes __P((char *items, char **save, int *flags));
-
-extern int util_base64_encode __P((const unsigned char *input,
-				   size_t input_len,
-				   unsigned char **output,
-				   size_t *output_len));
-extern int util_base64_decode __P((const unsigned char *input,
-				   size_t input_len,
-				   unsigned char **output,
-				   size_t *output_len));
-extern char *util_localname __P((void));
-
-extern int util_wcard_match __P((const char *string, const char *pattern,
-				 const char *delim));
-void util_print_flags __P((attribute_t attr));
-int util_attribute_to_type __P((const char *item, int *type));
-int util_type_to_attribute __P((int type, char **attr_str));
-int util_attribute_matches_flag __P((attribute_t attr, const char *item));
-int util_uidvalidity __P((mailbox_t smbox, unsigned long *uidvp));
-
-void util_setio __P((FILE*, FILE*));
-void util_flush_output __P((void));
-void util_get_input __P((stream_t *pstr));
-void util_get_output __P((stream_t *pstr));
-void util_set_input __P((stream_t str));
-void util_set_output __P((stream_t str));
-int util_wait_input __P((int));
+extern int  util_out (int, const char *, ...);
+extern int  util_send (const char *, ...);
+extern int  util_send_qstring (const char *);
+extern int  util_send_literal (const char *);
+extern int  util_start (char *);
+extern int  util_finish (struct imap4d_command *, int, const char *, ...);
+extern int  util_getstate (void);
+extern int  util_do_command (char *);
+extern char *imap4d_readline (void);
+extern char *imap4d_readline_ex (void);
+extern char *util_getword (char *, char **);
+extern char *util_getitem (char *, const char *, char **);
+extern int  util_token (char *, size_t, char **);
+extern void util_unquote (char **);
+extern char *util_tilde_expansion (const char *, const char *);
+extern char *util_getfullpath (char *, const char *);
+extern int  util_msgset (char *, size_t **, int *, int);
+extern int  util_upper (char *);
+extern struct imap4d_command *util_getcommand (char *, 
+                                               struct imap4d_command []);
+extern int util_parse_internal_date0 (char *date, time_t *timep, char **endp);
+extern int util_parse_internal_date (char *date, time_t *timep);
+extern int util_parse_822_date (char *date, time_t *timep);
+extern int util_parse_ctime_date (const char *date, time_t *timep);
+extern char *util_strcasestr (const char *haystack, const char *needle);
+extern int util_parse_attributes (char *items, char **save, int *flags);
+
+extern int util_base64_encode (const unsigned char *input,
+			       size_t input_len,
+			       unsigned char **output,
+			       size_t *output_len);
+extern int util_base64_decode (const unsigned char *input,
+			       size_t input_len,
+			       unsigned char **output,
+			       size_t *output_len);
+extern char *util_localname (void);
+
+extern int util_wcard_match (const char *string, const char *pattern,
+			     const char *delim);
+void util_print_flags (attribute_t attr);
+int util_attribute_to_type (const char *item, int *type);
+int util_type_to_attribute (int type, char **attr_str);
+int util_attribute_matches_flag (attribute_t attr, const char *item);
+int util_uidvalidity (mailbox_t smbox, unsigned long *uidvp);
+
+void util_setio (FILE*, FILE*);
+void util_flush_output (void);
+void util_get_input (stream_t *pstr);
+void util_get_output (stream_t *pstr);
+void util_set_input (stream_t str);
+void util_set_output (stream_t str);
+int util_wait_input (int);
   
-void util_register_event __P((int old_state, int new_state,
-			      list_action_t *action, void *data));
-void util_event_remove __P((void *id));
-void util_run_events __P((int old_state, int new_state));
+void util_register_event (int old_state, int new_state,
+			  list_action_t *action, void *data);
+void util_event_remove (void *id);
+void util_run_events (int old_state, int new_state);
   
-int util_is_master __P((void));
-void util_bye __P((void));  
-void util_atexit __P((void (*fp) __PMT((void))));
+int util_is_master (void);
+void util_bye (void);  
+void util_atexit (void (*fp) (void));
 
 #ifdef WITH_TLS
-int imap4d_init_tls_server __P((void));
+int imap4d_init_tls_server (void);
 #endif /* WITH_TLS */
 
-typedef int (*imap4d_auth_handler_fp) __PMT((struct imap4d_command *,
-					     char *, char *, char **));
+typedef int (*imap4d_auth_handler_fp) (struct imap4d_command *,
+				       char *, char *, char **);
   
-extern void auth_add __P((char *name, imap4d_auth_handler_fp handler));
-extern void auth_remove __P((char *name));
+extern void auth_add (char *name, imap4d_auth_handler_fp handler);
+extern void auth_remove (char *name);
 
 #ifdef WITH_GSSAPI  
-extern void auth_gssapi_init __P((void));
+extern void auth_gssapi_init (void);
 #else
 # define auth_gssapi_init()  
 #endif
 
 #ifdef WITH_GSASL
-extern void auth_gsasl_init __P((void));
+extern void auth_gsasl_init (void);
 #else
 # define auth_gsasl_init()
 #endif
diff --git a/imap4d/list.c b/imap4d/list.c
index b07ac64ac..6e4ea523f 100644
--- a/imap4d/list.c
+++ b/imap4d/list.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2005  Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,10 +53,10 @@ struct inode_list
   at this position.  The charcater "%" is similar to "*",
   but it does not match ahierarchy delimiter.  */
 
-static int  match __P ((const char *, const char *, const char *));
-static void list_file __P ((const char *, const char *, const char *, const char *, struct inode_list *));
-static void print_file __P ((const char *, const char *, const char *));
-static void print_dir __P ((const char *, const char *, const char *));
+static int  match (const char *, const char *, const char *);
+static void list_file (const char *, const char *, const char *, const char *, struct inode_list *);
+static void print_file (const char *, const char *, const char *);
+static void print_dir (const char *, const char *, const char *);
 
 int
 imap4d_list (struct imap4d_command *command, char *arg)
diff --git a/imap4d/namespace.c b/imap4d/namespace.c
index b1f8c7439..3c453e111 100644
--- a/imap4d/namespace.c
+++ b/imap4d/namespace.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2005  Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #include "imap4d.h"
 
 /*FIXME: should be global? */
-typedef int (*nsfp_t) __P ((void *closure, int ns, char *path, int delim));
+typedef int (*nsfp_t) (void *closure, int ns, char *path, int delim);
 
 struct namespace_t
 {
diff --git a/imap4d/search.c b/imap4d/search.c
index ec3f7c338..8fc60360b 100644
--- a/imap4d/search.c
+++ b/imap4d/search.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2005  Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,32 +38,32 @@
    search queries. */
 
 struct parsebuf;
-typedef void (*inst_t) __P((struct parsebuf *pb));
-
-static void cond_and __P((struct parsebuf *pb));
-static void cond_or __P((struct parsebuf *pb));
-static void cond_not __P((struct parsebuf *pb));
-
-static void cond_all __P((struct parsebuf *pb));                      
-static void cond_msgset __P((struct parsebuf *pb));                      
-static void cond_bcc __P((struct parsebuf *pb));                      
-static void cond_before __P((struct parsebuf *pb));                   
-static void cond_body __P((struct parsebuf *pb));                     
-static void cond_cc __P((struct parsebuf *pb));                       
-static void cond_from __P((struct parsebuf *pb));                     
-static void cond_header __P((struct parsebuf *pb));                   
-static void cond_keyword __P((struct parsebuf *pb));                  
-static void cond_larger __P((struct parsebuf *pb));                   
-static void cond_on __P((struct parsebuf *pb));                       
-static void cond_sentbefore __P((struct parsebuf *pb));               
-static void cond_senton __P((struct parsebuf *pb));                   
-static void cond_sentsince __P((struct parsebuf *pb));                
-static void cond_since __P((struct parsebuf *pb));                    
-static void cond_smaller __P((struct parsebuf *pb));                  
-static void cond_subject __P((struct parsebuf *pb));                  
-static void cond_text __P((struct parsebuf *pb));                     
-static void cond_to __P((struct parsebuf *pb));                       
-static void cond_uid __P((struct parsebuf *pb));                      
+typedef void (*inst_t) (struct parsebuf *pb);
+
+static void cond_and (struct parsebuf *pb);
+static void cond_or (struct parsebuf *pb);
+static void cond_not (struct parsebuf *pb);
+
+static void cond_all (struct parsebuf *pb);                      
+static void cond_msgset (struct parsebuf *pb);                      
+static void cond_bcc (struct parsebuf *pb);                      
+static void cond_before (struct parsebuf *pb);                   
+static void cond_body (struct parsebuf *pb);                     
+static void cond_cc (struct parsebuf *pb);                       
+static void cond_from (struct parsebuf *pb);                     
+static void cond_header (struct parsebuf *pb);                   
+static void cond_keyword (struct parsebuf *pb);                  
+static void cond_larger (struct parsebuf *pb);                   
+static void cond_on (struct parsebuf *pb);                       
+static void cond_sentbefore (struct parsebuf *pb);               
+static void cond_senton (struct parsebuf *pb);                   
+static void cond_sentsince (struct parsebuf *pb);                
+static void cond_since (struct parsebuf *pb);                    
+static void cond_smaller (struct parsebuf *pb);                  
+static void cond_subject (struct parsebuf *pb);                  
+static void cond_text (struct parsebuf *pb);                     
+static void cond_to (struct parsebuf *pb);                       
+static void cond_uid (struct parsebuf *pb);                      
 
 /* A basic condition structure */
 struct cond
@@ -178,16 +178,16 @@ struct parsebuf
   message_t msg;                /* Current message */ 
 };
 
-static void put_code __P((struct parsebuf *pb, inst_t inst));
-static void parse_free_mem __P((struct parsebuf *pb));
-static void *parse_regmem __P((struct parsebuf *pb, void *mem));
-static char *parse_strdup __P((struct parsebuf *pb, char *s));
-static void *parse_alloc __P((struct parsebuf *pb, size_t size));
-static int parse_search_key_list __P((struct parsebuf *pb));
-static int parse_search_key __P((struct parsebuf *pb));
-static int parse_gettoken __P((struct parsebuf *pb, int req));
-static int search_run __P((struct parsebuf *pb));
-static void do_search __P((struct parsebuf *pb));
+static void put_code (struct parsebuf *pb, inst_t inst);
+static void parse_free_mem (struct parsebuf *pb);
+static void *parse_regmem (struct parsebuf *pb, void *mem);
+static char *parse_strdup (struct parsebuf *pb, char *s);
+static void *parse_alloc (struct parsebuf *pb, size_t size);
+static int parse_search_key_list (struct parsebuf *pb);
+static int parse_search_key (struct parsebuf *pb);
+static int parse_gettoken (struct parsebuf *pb, int req);
+static int search_run (struct parsebuf *pb);
+static void do_search (struct parsebuf *pb);
 
 int
 imap4d_search (struct imap4d_command *command, char *arg)
diff --git a/imap4d/status.c b/imap4d/status.c
index 294bd8aa1..41ecc1ccc 100644
--- a/imap4d/status.c
+++ b/imap4d/status.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2005  Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,13 +22,13 @@
  *  
  */
 
-typedef int (*status_funcp) __P ((mailbox_t));
+typedef int (*status_funcp) (mailbox_t);
 
-static int status_messages    __P ((mailbox_t));
-static int status_recent      __P ((mailbox_t));
-static int status_uidnext     __P ((mailbox_t));
-static int status_uidvalidity __P ((mailbox_t));
-static int status_unseen      __P ((mailbox_t));
+static int status_messages    (mailbox_t);
+static int status_recent      (mailbox_t);
+static int status_uidnext     (mailbox_t);
+static int status_uidvalidity (mailbox_t);
+static int status_unseen      (mailbox_t);
 
 struct status_table {
   char *name;
diff --git a/imap4d/util.c b/imap4d/util.c
index 19ac9cb33..58770bffb 100644
--- a/imap4d/util.c
+++ b/imap4d/util.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 static stream_t istream;
 static stream_t ostream;
 
-static int add2set __P ((size_t **, int *, unsigned long));
-static const char *sc2string __P ((int));
+static int add2set (size_t **, int *, unsigned long);
+static const char *sc2string (int);
 
 /* Get the next space/CR/NL separated word, some words are between double
    quotes, strtok() can not handle it.  */