Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 553c8585 553c8585bba52eac5e1ba43fecbde82f22273896 by Sergey Poznyakoff
Options

Use MU_ARG_UNUSED to mark unused formal parameters.

1 parent 15947da1
Inline Side-by-side
Showing 54 changed files with 135 additions and 133 deletions
...@@ -58,7 +58,7 @@ static int _perr = 0; ...@@ -58,7 +58,7 @@ static int _perr = 0;
58 58
59 static int 59 static int
60 mu_pam_conv (int num_msg, const struct pam_message **msg, 60 mu_pam_conv (int num_msg, const struct pam_message **msg,
61 struct pam_response **resp, void *appdata_ptr ARG_UNUSED) 61 struct pam_response **resp, void *appdata_ptr MU_ARG_UNUSED)
62 { 62 {
63 int replies = 0; 63 int replies = 0;
64 struct pam_response *reply = NULL; 64 struct pam_response *reply = NULL;
...@@ -102,9 +102,9 @@ mu_pam_conv (int num_msg, const struct pam_message **msg, ...@@ -102,9 +102,9 @@ mu_pam_conv (int num_msg, const struct pam_message **msg,
102 static struct pam_conv PAM_conversation = { &mu_pam_conv, NULL }; 102 static struct pam_conv PAM_conversation = { &mu_pam_conv, NULL };
103 103
104 int 104 int
105 mu_authenticate_pam (struct mu_auth_data **return_data ARG_UNUSED, 105 mu_authenticate_pam (struct mu_auth_data **return_data MU_ARG_UNUSED,
106 const void *key, 106 const void *key,
107 void *func_data ARG_UNUSED, 107 void *func_data MU_ARG_UNUSED,
108 void *call_data) 108 void *call_data)
109 { 109 {
110 const struct mu_auth_data *auth_data = key; 110 const struct mu_auth_data *auth_data = key;
...@@ -164,10 +164,10 @@ struct argp mu_pam_argp = { ...@@ -164,10 +164,10 @@ struct argp mu_pam_argp = {
164 #else 164 #else
165 165
166 int 166 int
167 mu_authenticate_pam (struct mu_auth_data **return_data ARG_UNUSED, 167 mu_authenticate_pam (struct mu_auth_data **return_data MU_ARG_UNUSED,
168 const void *key ARG_UNUSED, 168 const void *key MU_ARG_UNUSED,
169 void *func_data ARG_UNUSED, 169 void *func_data MU_ARG_UNUSED,
170 void *call_data ARG_UNUSED) 170 void *call_data MU_ARG_UNUSED)
171 { 171 {
172 errno = ENOSYS; 172 errno = ENOSYS;
173 return 1; 173 return 1;
......
...@@ -447,9 +447,9 @@ decode_reply (grad_request_t *reply, const char *user_name, char *password, ...@@ -447,9 +447,9 @@ decode_reply (grad_request_t *reply, const char *user_name, char *password,
447 } 447 }
448 448
449 int 449 int
450 mu_radius_authenticate (struct mu_auth_data **return_data ARG_UNUSED, 450 mu_radius_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED,
451 const void *key, 451 const void *key,
452 void *func_data ARG_UNUSED, void *call_data) 452 void *func_data MU_ARG_UNUSED, void *call_data)
453 { 453 {
454 int rc; 454 int rc;
455 grad_request_t *reply; 455 grad_request_t *reply;
...@@ -569,18 +569,18 @@ struct argp mu_radius_argp = { ...@@ -569,18 +569,18 @@ struct argp mu_radius_argp = {
569 569
570 #else 570 #else
571 static int 571 static int
572 mu_radius_authenticate (struct mu_auth_data **return_data ARG_UNUSED, 572 mu_radius_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED,
573 const void *key, 573 const void *key,
574 void *func_data ARG_UNUSED, void *call_data) 574 void *func_data MU_ARG_UNUSED, void *call_data)
575 { 575 {
576 return ENOSYS; 576 return ENOSYS;
577 } 577 }
578 578
579 static int 579 static int
580 mu_auth_radius_user_by_name (struct mu_auth_data **return_data ARG_UNUSED, 580 mu_auth_radius_user_by_name (struct mu_auth_data **return_data MU_ARG_UNUSED,
581 const void *key ARG_UNUSED, 581 const void *key MU_ARG_UNUSED,
582 void *func_data ARG_UNUSED, 582 void *func_data MU_ARG_UNUSED,
583 void *call_data ARG_UNUSED) 583 void *call_data MU_ARG_UNUSED)
584 { 584 {
585 return ENOSYS; 585 return ENOSYS;
586 } 586 }
......
...@@ -487,8 +487,8 @@ decode_tuple (mu_sql_connection_t conn, int n, ...@@ -487,8 +487,8 @@ decode_tuple (mu_sql_connection_t conn, int n,
487 static int 487 static int
488 mu_auth_sql_by_name (struct mu_auth_data **return_data, 488 mu_auth_sql_by_name (struct mu_auth_data **return_data,
489 const void *key, 489 const void *key,
490 void *func_data ARG_UNUSED, 490 void *func_data MU_ARG_UNUSED,
491 void *call_data ARG_UNUSED) 491 void *call_data MU_ARG_UNUSED)
492 { 492 {
493 int status, rc; 493 int status, rc;
494 char *query_str = NULL; 494 char *query_str = NULL;
...@@ -567,8 +567,8 @@ mu_auth_sql_by_name (struct mu_auth_data **return_data, ...@@ -567,8 +567,8 @@ mu_auth_sql_by_name (struct mu_auth_data **return_data,
567 static int 567 static int
568 mu_auth_sql_by_uid (struct mu_auth_data **return_data, 568 mu_auth_sql_by_uid (struct mu_auth_data **return_data,
569 const void *key, 569 const void *key,
570 void *func_data ARG_UNUSED, 570 void *func_data MU_ARG_UNUSED,
571 void *call_data ARG_UNUSED) 571 void *call_data MU_ARG_UNUSED)
572 { 572 {
573 char uidstr[64]; 573 char uidstr[64];
574 int status, rc; 574 int status, rc;
...@@ -731,9 +731,9 @@ mu_sql_getpass (const char *username, char **passwd) ...@@ -731,9 +731,9 @@ mu_sql_getpass (const char *username, char **passwd)
731 } 731 }
732 732
733 static int 733 static int
734 mu_sql_authenticate (struct mu_auth_data **return_data ARG_UNUSED, 734 mu_sql_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED,
735 const void *key, 735 const void *key,
736 void *func_data ARG_UNUSED, void *call_data) 736 void *func_data MU_ARG_UNUSED, void *call_data)
737 { 737 {
738 const struct mu_auth_data *auth_data = key; 738 const struct mu_auth_data *auth_data = key;
739 char *pass = call_data; 739 char *pass = call_data;
......
...@@ -203,10 +203,10 @@ struct argp mu_virt_argp = { ...@@ -203,10 +203,10 @@ struct argp mu_virt_argp = {
203 203
204 #else 204 #else
205 static int 205 static int
206 mu_auth_virt_domain_by_name (struct mu_auth_data **return_data ARG_UNUSED, 206 mu_auth_virt_domain_by_name (struct mu_auth_data **return_data MU_ARG_UNUSED,
207 const void *key ARG_UNUSED, 207 const void *key MU_ARG_UNUSED,
208 void *func_data ARG_UNUSED, 208 void *func_data MU_ARG_UNUSED,
209 void *call_data ARG_UNUSED) 209 void *call_data MU_ARG_UNUSED)
210 { 210 {
211 return ENOSYS; 211 return ENOSYS;
212 } 212 }
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 MA 02110-1301 USA */ 20 MA 02110-1301 USA */
21 21
22 #ifdef HAVE_CONFIG_H 22 #ifdef HAVE_CONFIG_H
23 # include <config.h> /* For ARG_UNUSED only */ 23 # include <config.h> /* For MU_ARG_UNUSED only */
24 #endif 24 #endif
25 #include <sys/types.h> 25 #include <sys/types.h>
26 #include <unistd.h> 26 #include <unistd.h>
...@@ -242,14 +242,14 @@ readline (char *prompt) ...@@ -242,14 +242,14 @@ readline (char *prompt)
242 } 242 }
243 243
244 void 244 void
245 add_history (const char *s ARG_UNUSED) 245 add_history (const char *s MU_ARG_UNUSED)
246 { 246 {
247 } 247 }
248 #endif 248 #endif
249 249
250 250
251 int 251 int
252 main (int argc ARG_UNUSED, char **argv) 252 main (int argc MU_ARG_UNUSED, char **argv)
253 { 253 {
254 char *line, *s; 254 char *line, *s;
255 255
...@@ -398,7 +398,7 @@ int com_mode (char *arg) ...@@ -398,7 +398,7 @@ int com_mode (char *arg)
398 } 398 }
399 399
400 int 400 int
401 com_mode_reader (char *arg ARG_UNUSED) 401 com_mode_reader (char *arg MU_ARG_UNUSED)
402 { 402 {
403 return mu_nntp_mode_reader (nntp); 403 return mu_nntp_mode_reader (nntp);
404 } 404 }
...@@ -561,7 +561,7 @@ int com_list (char *arg) ...@@ -561,7 +561,7 @@ int com_list (char *arg)
561 } 561 }
562 562
563 int 563 int
564 com_list_extensions (char *arg ARG_UNUSED) 564 com_list_extensions (char *arg MU_ARG_UNUSED)
565 { 565 {
566 mu_iterator_t iterator = NULL; 566 mu_iterator_t iterator = NULL;
567 int status = mu_nntp_list_extensions (nntp, &iterator); 567 int status = mu_nntp_list_extensions (nntp, &iterator);
...@@ -660,7 +660,7 @@ com_list_active_times (char *arg) ...@@ -660,7 +660,7 @@ com_list_active_times (char *arg)
660 } 660 }
661 661
662 int 662 int
663 com_list_distributions (char *arg ARG_UNUSED) 663 com_list_distributions (char *arg MU_ARG_UNUSED)
664 { 664 {
665 mu_iterator_t iterator = NULL; 665 mu_iterator_t iterator = NULL;
666 int status = mu_nntp_list_distributions (nntp, arg, &iterator); 666 int status = mu_nntp_list_distributions (nntp, arg, &iterator);
...@@ -694,7 +694,7 @@ com_list_distributions (char *arg ARG_UNUSED) ...@@ -694,7 +694,7 @@ com_list_distributions (char *arg ARG_UNUSED)
694 } 694 }
695 695
696 int 696 int
697 com_list_distrib_pats (char *arg ARG_UNUSED) 697 com_list_distrib_pats (char *arg MU_ARG_UNUSED)
698 { 698 {
699 mu_iterator_t iterator = NULL; 699 mu_iterator_t iterator = NULL;
700 int status = mu_nntp_list_distrib_pats (nntp, &iterator); 700 int status = mu_nntp_list_distrib_pats (nntp, &iterator);
...@@ -764,7 +764,7 @@ com_list_newsgroups (char *arg) ...@@ -764,7 +764,7 @@ com_list_newsgroups (char *arg)
764 } 764 }
765 765
766 int 766 int
767 com_last (char *arg ARG_UNUSED) 767 com_last (char *arg MU_ARG_UNUSED)
768 { 768 {
769 char *mid = NULL; 769 char *mid = NULL;
770 unsigned long number = 0; 770 unsigned long number = 0;
...@@ -779,7 +779,7 @@ com_last (char *arg ARG_UNUSED) ...@@ -779,7 +779,7 @@ com_last (char *arg ARG_UNUSED)
779 } 779 }
780 780
781 int 781 int
782 com_next (char *arg ARG_UNUSED) 782 com_next (char *arg MU_ARG_UNUSED)
783 { 783 {
784 char *mid = NULL; 784 char *mid = NULL;
785 unsigned long number = 0; 785 unsigned long number = 0;
...@@ -922,7 +922,7 @@ com_stat (char *arg) ...@@ -922,7 +922,7 @@ com_stat (char *arg)
922 } 922 }
923 923
924 int 924 int
925 com_date (char *arg ARG_UNUSED) 925 com_date (char *arg MU_ARG_UNUSED)
926 { 926 {
927 unsigned int year, month, day, hour, min, sec; 927 unsigned int year, month, day, hour, min, sec;
928 int status; 928 int status;
...@@ -950,7 +950,7 @@ com_ihave (char *arg) ...@@ -950,7 +950,7 @@ com_ihave (char *arg)
950 } 950 }
951 951
952 int 952 int
953 com_help (char *arg ARG_UNUSED) 953 com_help (char *arg MU_ARG_UNUSED)
954 { 954 {
955 mu_stream_t stream = NULL; 955 mu_stream_t stream = NULL;
956 int status; 956 int status;
...@@ -1054,7 +1054,7 @@ com_connect (char *arg) ...@@ -1054,7 +1054,7 @@ com_connect (char *arg)
1054 } 1054 }
1055 1055
1056 int 1056 int
1057 com_disconnect (char *arg ARG_UNUSED) 1057 com_disconnect (char *arg MU_ARG_UNUSED)
1058 { 1058 {
1059 (void) arg; 1059 (void) arg;
1060 if (nntp) 1060 if (nntp)
...@@ -1067,7 +1067,7 @@ com_disconnect (char *arg ARG_UNUSED) ...@@ -1067,7 +1067,7 @@ com_disconnect (char *arg ARG_UNUSED)
1067 } 1067 }
1068 1068
1069 int 1069 int
1070 com_quit (char *arg ARG_UNUSED) 1070 com_quit (char *arg MU_ARG_UNUSED)
1071 { 1071 {
1072 int status = 0; 1072 int status = 0;
1073 if (nntp) 1073 if (nntp)
...@@ -1087,7 +1087,7 @@ com_quit (char *arg ARG_UNUSED) ...@@ -1087,7 +1087,7 @@ com_quit (char *arg ARG_UNUSED)
1087 } 1087 }
1088 1088
1089 int 1089 int
1090 com_exit (char *arg ARG_UNUSED) 1090 com_exit (char *arg MU_ARG_UNUSED)
1091 { 1091 {
1092 if (nntp) 1092 if (nntp)
1093 { 1093 {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 MA 02110-1301 USA */ 20 MA 02110-1301 USA */
21 21
22 #ifdef HAVE_CONFIG_H 22 #ifdef HAVE_CONFIG_H
23 # include <config.h> /* For ARG_UNUSED only */ 23 # include <config.h> /* For MU_ARG_UNUSED only */
24 #endif 24 #endif
25 #include <sys/types.h> 25 #include <sys/types.h>
26 #include <unistd.h> 26 #include <unistd.h>
...@@ -229,14 +229,14 @@ readline (char *prompt) ...@@ -229,14 +229,14 @@ readline (char *prompt)
229 } 229 }
230 230
231 void 231 void
232 add_history (const char *s ARG_UNUSED) 232 add_history (const char *s MU_ARG_UNUSED)
233 { 233 {
234 } 234 }
235 #endif 235 #endif
236 236
237 237
238 int 238 int
239 main (int argc ARG_UNUSED, char **argv) 239 main (int argc MU_ARG_UNUSED, char **argv)
240 { 240 {
241 char *line, *s; 241 char *line, *s;
242 242
...@@ -398,7 +398,7 @@ com_apop (char *arg) ...@@ -398,7 +398,7 @@ com_apop (char *arg)
398 } 398 }
399 399
400 int 400 int
401 com_capa (char *arg ARG_UNUSED) 401 com_capa (char *arg MU_ARG_UNUSED)
402 { 402 {
403 mu_iterator_t iterator = NULL; 403 mu_iterator_t iterator = NULL;
404 int status = mu_pop3_capa (pop3, &iterator); 404 int status = mu_pop3_capa (pop3, &iterator);
...@@ -483,7 +483,7 @@ com_list (char *arg) ...@@ -483,7 +483,7 @@ com_list (char *arg)
483 } 483 }
484 484
485 int 485 int
486 com_noop (char *arg ARG_UNUSED) 486 com_noop (char *arg MU_ARG_UNUSED)
487 { 487 {
488 return mu_pop3_noop (pop3); 488 return mu_pop3_noop (pop3);
489 } 489 }
...@@ -526,7 +526,7 @@ com_pass (char *arg) ...@@ -526,7 +526,7 @@ com_pass (char *arg)
526 } 526 }
527 527
528 int 528 int
529 com_stat (char *arg ARG_UNUSED) 529 com_stat (char *arg MU_ARG_UNUSED)
530 { 530 {
531 unsigned count, size; 531 unsigned count, size;
532 int status = 0; 532 int status = 0;
...@@ -588,7 +588,7 @@ com_help (char *arg) ...@@ -588,7 +588,7 @@ com_help (char *arg)
588 } 588 }
589 589
590 int 590 int
591 com_rset (char *arg ARG_UNUSED) 591 com_rset (char *arg MU_ARG_UNUSED)
592 { 592 {
593 return mu_pop3_rset (pop3); 593 return mu_pop3_rset (pop3);
594 } 594 }
...@@ -694,7 +694,7 @@ com_connect (char *arg) ...@@ -694,7 +694,7 @@ com_connect (char *arg)
694 } 694 }
695 695
696 int 696 int
697 com_disconnect (char *arg ARG_UNUSED) 697 com_disconnect (char *arg MU_ARG_UNUSED)
698 { 698 {
699 (void) arg; 699 (void) arg;
700 if (pop3) 700 if (pop3)
...@@ -707,7 +707,7 @@ com_disconnect (char *arg ARG_UNUSED) ...@@ -707,7 +707,7 @@ com_disconnect (char *arg ARG_UNUSED)
707 } 707 }
708 708
709 int 709 int
710 com_quit (char *arg ARG_UNUSED) 710 com_quit (char *arg MU_ARG_UNUSED)
711 { 711 {
712 int status = 0; 712 int status = 0;
713 if (pop3) 713 if (pop3)
...@@ -727,7 +727,7 @@ com_quit (char *arg ARG_UNUSED) ...@@ -727,7 +727,7 @@ com_quit (char *arg ARG_UNUSED)
727 } 727 }
728 728
729 int 729 int
730 com_exit (char *arg ARG_UNUSED) 730 com_exit (char *arg MU_ARG_UNUSED)
731 { 731 {
732 if (pop3) 732 if (pop3)
733 { 733 {
......
...@@ -67,7 +67,7 @@ print_capa (void *item, void *data) ...@@ -67,7 +67,7 @@ print_capa (void *item, void *data)
67 } 67 }
68 68
69 int 69 int
70 imap4d_capability (struct imap4d_command *command, char *arg ARG_UNUSED) 70 imap4d_capability (struct imap4d_command *command, char *arg MU_ARG_UNUSED)
71 { 71 {
72 util_send ("* CAPABILITY"); 72 util_send ("* CAPABILITY");
73 73
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27 int 27 int
28 imap4d_check (struct imap4d_command *command, char *arg ARG_UNUSED) 28 imap4d_check (struct imap4d_command *command, char *arg MU_ARG_UNUSED)
29 { 29 {
30 return util_finish (command, RESP_OK, "Completed"); 30 return util_finish (command, RESP_OK, "Completed");
31 } 31 }
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 mailbox all messages that have the \\Deleted flag set, and returns 25 mailbox all messages that have the \\Deleted flag set, and returns
26 to authenticated state from selected state. */ 26 to authenticated state from selected state. */
27 int 27 int
28 imap4d_close (struct imap4d_command *command, char *arg ARG_UNUSED) 28 imap4d_close (struct imap4d_command *command, char *arg MU_ARG_UNUSED)
29 { 29 {
30 const char *msg = NULL; 30 const char *msg = NULL;
31 int status, flags; 31 int status, flags;
......
...@@ -280,7 +280,7 @@ fetch_fast (struct fetch_command *command, char **arg) ...@@ -280,7 +280,7 @@ fetch_fast (struct fetch_command *command, char **arg)
280 Header: Date, Subject, From, Sender, Reply-To, To, Cc, Bcc, In-Reply-To, 280 Header: Date, Subject, From, Sender, Reply-To, To, Cc, Bcc, In-Reply-To,
281 and Message-Id. */ 281 and Message-Id. */
282 static int 282 static int
283 fetch_envelope (struct fetch_command *command, char **arg ARG_UNUSED) 283 fetch_envelope (struct fetch_command *command, char **arg MU_ARG_UNUSED)
284 { 284 {
285 int status; 285 int status;
286 util_send ("%s (", command->name); 286 util_send ("%s (", command->name);
...@@ -347,7 +347,7 @@ fetch_flags (struct fetch_command *command, char **arg) ...@@ -347,7 +347,7 @@ fetch_flags (struct fetch_command *command, char **arg)
347 ;; from the given time will give the UT form. 347 ;; from the given time will give the UT form.
348 ;; The Universal Time zone is "+0000". */ 348 ;; The Universal Time zone is "+0000". */
349 static int 349 static int
350 fetch_internaldate (struct fetch_command *command, char **arg ARG_UNUSED) 350 fetch_internaldate (struct fetch_command *command, char **arg MU_ARG_UNUSED)
351 { 351 {
352 char date[128]; 352 char date[128];
353 mu_envelope_t env = NULL; 353 mu_envelope_t env = NULL;
...@@ -378,7 +378,7 @@ fetch_internaldate (struct fetch_command *command, char **arg ARG_UNUSED) ...@@ -378,7 +378,7 @@ fetch_internaldate (struct fetch_command *command, char **arg ARG_UNUSED)
378 Functionally equivalent to BODY.PEEK[HEADER], differing in the syntax of 378 Functionally equivalent to BODY.PEEK[HEADER], differing in the syntax of
379 the resulting untagged FETCH data (RFC822.HEADER is returned). */ 379 the resulting untagged FETCH data (RFC822.HEADER is returned). */
380 static int 380 static int
381 fetch_rfc822_header (struct fetch_command *command, char **arg ARG_UNUSED) 381 fetch_rfc822_header (struct fetch_command *command, char **arg MU_ARG_UNUSED)
382 { 382 {
383 char buffer[32]; 383 char buffer[32];
384 char *p = buffer; 384 char *p = buffer;
...@@ -391,7 +391,7 @@ fetch_rfc822_header (struct fetch_command *command, char **arg ARG_UNUSED) ...@@ -391,7 +391,7 @@ fetch_rfc822_header (struct fetch_command *command, char **arg ARG_UNUSED)
391 Functionally equivalent to BODY[TEXT], differing in the syntax of the 391 Functionally equivalent to BODY[TEXT], differing in the syntax of the
392 resulting untagged FETCH data (RFC822.TEXT is returned). */ 392 resulting untagged FETCH data (RFC822.TEXT is returned). */
393 static int 393 static int
394 fetch_rfc822_text (struct fetch_command *command, char **arg ARG_UNUSED) 394 fetch_rfc822_text (struct fetch_command *command, char **arg MU_ARG_UNUSED)
395 { 395 {
396 char buffer[16]; 396 char buffer[16];
397 char *p = buffer; 397 char *p = buffer;
...@@ -402,7 +402,7 @@ fetch_rfc822_text (struct fetch_command *command, char **arg ARG_UNUSED) ...@@ -402,7 +402,7 @@ fetch_rfc822_text (struct fetch_command *command, char **arg ARG_UNUSED)
402 402
403 /* The [RFC-822] size of the message. */ 403 /* The [RFC-822] size of the message. */
404 static int 404 static int
405 fetch_rfc822_size (struct fetch_command *command, char **arg ARG_UNUSED) 405 fetch_rfc822_size (struct fetch_command *command, char **arg MU_ARG_UNUSED)
406 { 406 {
407 size_t size = 0; 407 size_t size = 0;
408 size_t lines = 0; 408 size_t lines = 0;
...@@ -457,7 +457,7 @@ fetch_rfc822 (struct fetch_command *command, char **arg) ...@@ -457,7 +457,7 @@ fetch_rfc822 (struct fetch_command *command, char **arg)
457 457
458 /* UID: The unique identifier for the message. */ 458 /* UID: The unique identifier for the message. */
459 static int 459 static int
460 fetch_uid (struct fetch_command *command, char **arg ARG_UNUSED) 460 fetch_uid (struct fetch_command *command, char **arg MU_ARG_UNUSED)
461 { 461 {
462 size_t uid = 0; 462 size_t uid = 0;
463 463
...@@ -471,7 +471,7 @@ fetch_uid (struct fetch_command *command, char **arg ARG_UNUSED) ...@@ -471,7 +471,7 @@ fetch_uid (struct fetch_command *command, char **arg ARG_UNUSED)
471 server by parsing the [MIME-IMB] header fields in the [RFC-822] header and 471 server by parsing the [MIME-IMB] header fields in the [RFC-822] header and
472 [MIME-IMB] headers. */ 472 [MIME-IMB] headers. */
473 static int 473 static int
474 fetch_bodystructure (struct fetch_command *command, char **arg ARG_UNUSED) 474 fetch_bodystructure (struct fetch_command *command, char **arg MU_ARG_UNUSED)
475 { 475 {
476 util_send ("%s (", command->name); 476 util_send ("%s (", command->name);
477 fetch_bodystructure0 (command->msg, 1); /* 1 means with extension data. */ 477 fetch_bodystructure0 (command->msg, 1); /* 1 means with extension data. */
......
...@@ -1952,21 +1952,21 @@ imap_fetch (f_imap_t f_imap) ...@@ -1952,21 +1952,21 @@ imap_fetch (f_imap_t f_imap)
1952 } 1952 }
1953 1953
1954 static int 1954 static int
1955 imap_search (f_imap_t f_imap ARG_UNUSED) 1955 imap_search (f_imap_t f_imap MU_ARG_UNUSED)
1956 { 1956 {
1957 /* Not implemented. No provision for this in the API, yet. */ 1957 /* Not implemented. No provision for this in the API, yet. */
1958 return 0; 1958 return 0;
1959 } 1959 }
1960 1960
1961 static int 1961 static int
1962 imap_status (f_imap_t f_imap ARG_UNUSED) 1962 imap_status (f_imap_t f_imap MU_ARG_UNUSED)
1963 { 1963 {
1964 /* Not implemented. No provision for this in the API, yet. */ 1964 /* Not implemented. No provision for this in the API, yet. */
1965 return 0; 1965 return 0;
1966 } 1966 }
1967 1967
1968 static int 1968 static int
1969 imap_expunge (f_imap_t f_imap ARG_UNUSED, unsigned msgno ARG_UNUSED) 1969 imap_expunge (f_imap_t f_imap MU_ARG_UNUSED, unsigned msgno MU_ARG_UNUSED)
1970 { 1970 {
1971 /* We should not have this, since do not send the expunge, but rather 1971 /* We should not have this, since do not send the expunge, but rather
1972 use SELECT/CLOSE. */ 1972 use SELECT/CLOSE. */
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 static void url_imap_destroy (mu_url_t url); 36 static void url_imap_destroy (mu_url_t url);
37 37
38 static void 38 static void
39 url_imap_destroy (mu_url_t url ARG_UNUSED) 39 url_imap_destroy (mu_url_t url MU_ARG_UNUSED)
40 { 40 {
41 } 41 }
42 42
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 #include <amd.h> 36 #include <amd.h>
37 37
38 static int 38 static int
39 _maildir_folder_init (mu_folder_t folder ARG_UNUSED) 39 _maildir_folder_init (mu_folder_t folder MU_ARG_UNUSED)
40 { 40 {
41 return 0; 41 return 0;
42 } 42 }
......
...@@ -580,7 +580,7 @@ maildir_scan_dir (struct _amd_data *amd, DIR *dir) ...@@ -580,7 +580,7 @@ maildir_scan_dir (struct _amd_data *amd, DIR *dir)
580 } 580 }
581 581
582 static int 582 static int
583 maildir_scan0 (mu_mailbox_t mailbox, size_t msgno ARG_UNUSED, size_t *pcount, 583 maildir_scan0 (mu_mailbox_t mailbox, size_t msgno MU_ARG_UNUSED, size_t *pcount,
584 int do_notify) 584 int do_notify)
585 { 585 {
586 struct _amd_data *amd = mailbox->data; 586 struct _amd_data *amd = mailbox->data;
......
...@@ -193,7 +193,7 @@ folder_mbox_destroy (mu_folder_t folder) ...@@ -193,7 +193,7 @@ folder_mbox_destroy (mu_folder_t folder)
193 193
194 /* Noop. */ 194 /* Noop. */
195 static int 195 static int
196 folder_mbox_open (mu_folder_t folder, int flags ARG_UNUSED) 196 folder_mbox_open (mu_folder_t folder, int flags MU_ARG_UNUSED)
197 { 197 {
198 fmbox_t fmbox = folder->data; 198 fmbox_t fmbox = folder->data;
199 if (flags & MU_STREAM_CREAT) 199 if (flags & MU_STREAM_CREAT)
...@@ -205,7 +205,7 @@ folder_mbox_open (mu_folder_t folder, int flags ARG_UNUSED) ...@@ -205,7 +205,7 @@ folder_mbox_open (mu_folder_t folder, int flags ARG_UNUSED)
205 205
206 /* Noop. */ 206 /* Noop. */
207 static int 207 static int
208 folder_mbox_close (mu_folder_t folder ARG_UNUSED) 208 folder_mbox_close (mu_folder_t folder MU_ARG_UNUSED)
209 { 209 {
210 return 0; 210 return 0;
211 } 211 }
...@@ -406,7 +406,7 @@ folder_mbox_list (mu_folder_t folder, const char *dirname, const char *pattern, ...@@ -406,7 +406,7 @@ folder_mbox_list (mu_folder_t folder, const char *dirname, const char *pattern,
406 } 406 }
407 407
408 static int 408 static int
409 folder_mbox_lsub (mu_folder_t folder, const char *ref ARG_UNUSED, 409 folder_mbox_lsub (mu_folder_t folder, const char *ref MU_ARG_UNUSED,
410 const char *name, 410 const char *name,
411 mu_list_t flist) 411 mu_list_t flist)
412 { 412 {
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 static void url_mbox_destroy (mu_url_t purl); 37 static void url_mbox_destroy (mu_url_t purl);
38 38
39 static void 39 static void
40 url_mbox_destroy (mu_url_t url ARG_UNUSED) 40 url_mbox_destroy (mu_url_t url MU_ARG_UNUSED)
41 { 41 {
42 } 42 }
43 43
...@@ -259,7 +259,7 @@ _url_mbox_init (mu_url_t url) ...@@ -259,7 +259,7 @@ _url_mbox_init (mu_url_t url)
259 } 259 }
260 260
261 static void 261 static void
262 url_path_destroy (mu_url_t url ARG_UNUSED) 262 url_path_destroy (mu_url_t url MU_ARG_UNUSED)
263 { 263 {
264 } 264 }
265 265
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 #include <mailutils/mutil.h> 39 #include <mailutils/mutil.h>
40 40
41 static int 41 static int
42 _mh_folder_init (mu_folder_t folder ARG_UNUSED) 42 _mh_folder_init (mu_folder_t folder MU_ARG_UNUSED)
43 { 43 {
44 return 0; 44 return 0;
45 } 45 }
......
...@@ -127,7 +127,7 @@ _mh_get_message_seq (struct _amd_data *amd, size_t seq) ...@@ -127,7 +127,7 @@ _mh_get_message_seq (struct _amd_data *amd, size_t seq)
127 127
128 /* Scan the mailbox */ 128 /* Scan the mailbox */
129 static int 129 static int
130 mh_scan0 (mu_mailbox_t mailbox, size_t msgno ARG_UNUSED, size_t *pcount, 130 mh_scan0 (mu_mailbox_t mailbox, size_t msgno MU_ARG_UNUSED, size_t *pcount,
131 int do_notify) 131 int do_notify)
132 { 132 {
133 struct _amd_data *amd = mailbox->data; 133 struct _amd_data *amd = mailbox->data;
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 static void url_nntp_destroy (mu_url_t url); 37 static void url_nntp_destroy (mu_url_t url);
38 38
39 static void 39 static void
40 url_nntp_destroy (mu_url_t url ARG_UNUSED) 40 url_nntp_destroy (mu_url_t url MU_ARG_UNUSED)
41 { 41 {
42 } 42 }
43 43
......
...@@ -1848,7 +1848,7 @@ fill_buffer (pop_data_t mpd, char *buffer, size_t buflen) ...@@ -1848,7 +1848,7 @@ fill_buffer (pop_data_t mpd, char *buffer, size_t buflen)
1848 /* The heart of most funtions. Send the RETR and skip different parts. */ 1848 /* The heart of most funtions. Send the RETR and skip different parts. */
1849 static int 1849 static int
1850 pop_retr (pop_message_t mpm, char *buffer, size_t buflen, 1850 pop_retr (pop_message_t mpm, char *buffer, size_t buflen,
1851 mu_off_t offset ARG_UNUSED, size_t *pnread) 1851 mu_off_t offset MU_ARG_UNUSED, size_t *pnread)
1852 { 1852 {
1853 pop_data_t mpd; 1853 pop_data_t mpd;
1854 size_t nread = 0; 1854 size_t nread = 0;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 static void url_pop_destroy (mu_url_t url); 36 static void url_pop_destroy (mu_url_t url);
37 37
38 static void 38 static void
39 url_pop_destroy (mu_url_t url ARG_UNUSED) 39 url_pop_destroy (mu_url_t url MU_ARG_UNUSED)
40 { 40 {
41 } 41 }
42 42
......
...@@ -253,7 +253,7 @@ spamd_abort (mu_sieve_machine_t mach, mu_stream_t *stream, signal_handler handle ...@@ -253,7 +253,7 @@ spamd_abort (mu_sieve_machine_t mach, mu_stream_t *stream, signal_handler handle
253 static int got_sigpipe; 253 static int got_sigpipe;
254 254
255 static RETSIGTYPE 255 static RETSIGTYPE
256 sigpipe_handler (int sig ARG_UNUSED) 256 sigpipe_handler (int sig MU_ARG_UNUSED)
257 { 257 {
258 got_sigpipe = 1; 258 got_sigpipe = 1;
259 } 259 }
......
...@@ -352,7 +352,8 @@ sieve_print_value (mu_sieve_value_t *val, mu_sieve_printf_t printer, void *data) ...@@ -352,7 +352,8 @@ sieve_print_value (mu_sieve_value_t *val, mu_sieve_printf_t printer, void *data)
352 break; 352 break;
353 353
354 case SVT_NUMBER: 354 case SVT_NUMBER:
355 sieve_debug_internal (printer, data, "%ld", val->v.number); 355 sieve_debug_internal (printer, data, "%lu",
356 (unsigned long) val->v.number);
356 break; 357 break;
357 358
358 case SVT_TAG: 359 case SVT_TAG:
......
...@@ -73,7 +73,8 @@ display_message (mu_message_t mesg, msgset_t *msgset, void *arg) ...@@ -73,7 +73,8 @@ display_message (mu_message_t mesg, msgset_t *msgset, void *arg)
73 } 73 }
74 74
75 static void 75 static void
76 display_headers (FILE *out, mu_message_t mesg, const msgset_t *msgset ARG_UNUSED, 76 display_headers (FILE *out, mu_message_t mesg,
77 const msgset_t *msgset MU_ARG_UNUSED,
77 int select_hdr) 78 int select_hdr)
78 { 79 {
79 mu_header_t hdr = NULL; 80 mu_header_t hdr = NULL;
......
...@@ -215,7 +215,7 @@ escape_command (int argc, char **argv, compose_env_t *env) ...@@ -215,7 +215,7 @@ escape_command (int argc, char **argv, compose_env_t *env)
215 215
216 /* ~? */ 216 /* ~? */
217 int 217 int
218 escape_help (int argc, char **argv, compose_env_t *env ARG_UNUSED) 218 escape_help (int argc, char **argv, compose_env_t *env MU_ARG_UNUSED)
219 { 219 {
220 int status; 220 int status;
221 if (argc < 2) 221 if (argc < 2)
...@@ -230,7 +230,7 @@ escape_help (int argc, char **argv, compose_env_t *env ARG_UNUSED) ...@@ -230,7 +230,7 @@ escape_help (int argc, char **argv, compose_env_t *env ARG_UNUSED)
230 /* ~A */ 230 /* ~A */
231 /* ~a */ 231 /* ~a */
232 int 232 int
233 escape_sign (int argc ARG_UNUSED, char **argv, compose_env_t *env ARG_UNUSED) 233 escape_sign (int argc MU_ARG_UNUSED, char **argv, compose_env_t *env MU_ARG_UNUSED)
234 { 234 {
235 char *p; 235 char *p;
236 236
...@@ -286,8 +286,8 @@ escape_cc (int argc, char **argv, compose_env_t *env) ...@@ -286,8 +286,8 @@ escape_cc (int argc, char **argv, compose_env_t *env)
286 286
287 /* ~d */ 287 /* ~d */
288 int 288 int
289 escape_deadletter (int argc ARG_UNUSED, char **argv ARG_UNUSED, 289 escape_deadletter (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED,
290 compose_env_t *env ARG_UNUSED) 290 compose_env_t *env MU_ARG_UNUSED)
291 { 291 {
292 FILE *dead = fopen (getenv ("DEAD"), "r"); 292 FILE *dead = fopen (getenv ("DEAD"), "r");
293 int c; 293 int c;
...@@ -379,7 +379,7 @@ escape_visual (int argc, char **argv, compose_env_t *env) ...@@ -379,7 +379,7 @@ escape_visual (int argc, char **argv, compose_env_t *env)
379 /* ~f[mesg-list] */ 379 /* ~f[mesg-list] */
380 /* ~F[mesg-list] */ 380 /* ~F[mesg-list] */
381 int 381 int
382 escape_print (int argc, char **argv, compose_env_t *env ARG_UNUSED) 382 escape_print (int argc, char **argv, compose_env_t *env MU_ARG_UNUSED)
383 { 383 {
384 return mail_print (argc, argv); 384 return mail_print (argc, argv);
385 } 385 }
...@@ -408,7 +408,7 @@ escape_headers (int argc, char **argv, compose_env_t *env) ...@@ -408,7 +408,7 @@ escape_headers (int argc, char **argv, compose_env_t *env)
408 408
409 /* ~i[var-name] */ 409 /* ~i[var-name] */
410 int 410 int
411 escape_insert (int argc, char **argv, compose_env_t *send_env ARG_UNUSED) 411 escape_insert (int argc, char **argv, compose_env_t *send_env MU_ARG_UNUSED)
412 { 412 {
413 struct mail_env_entry *env; 413 struct mail_env_entry *env;
414 414
...@@ -533,7 +533,7 @@ escape_type_input (int argc, char **argv, compose_env_t *env) ...@@ -533,7 +533,7 @@ escape_type_input (int argc, char **argv, compose_env_t *env)
533 533
534 /* ~r[filename] */ 534 /* ~r[filename] */
535 int 535 int
536 escape_read (int argc, char **argv, compose_env_t *env ARG_UNUSED) 536 escape_read (int argc, char **argv, compose_env_t *env MU_ARG_UNUSED)
537 { 537 {
538 char *filename; 538 char *filename;
539 FILE *inf; 539 FILE *inf;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 #include "mail.h" 19 #include "mail.h"
20 20
21 int 21 int
22 mail_exit (int argc ARG_UNUSED, char **argv ARG_UNUSED) 22 mail_exit (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
23 { 23 {
24 mu_mailbox_close (mbox); 24 mu_mailbox_close (mbox);
25 exit (0); 25 exit (0);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25 int 25 int
26 mail_folders (int argc ARG_UNUSED, char **argv ARG_UNUSED) 26 mail_folders (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
27 { 27 {
28 char *path; 28 char *path;
29 29
......
...@@ -127,7 +127,7 @@ mail_if (int argc, char **argv) ...@@ -127,7 +127,7 @@ mail_if (int argc, char **argv)
127 127
128 128
129 int 129 int
130 mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED) 130 mail_else (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
131 { 131 {
132 int cond; 132 int cond;
133 133
...@@ -145,7 +145,7 @@ mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED) ...@@ -145,7 +145,7 @@ mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED)
145 } 145 }
146 146
147 int 147 int
148 mail_endif (int argc ARG_UNUSED, char **argv ARG_UNUSED) 148 mail_endif (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
149 { 149 {
150 if (_cond_level == 0) 150 if (_cond_level == 0)
151 { 151 {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25 int 25 int
26 mail_inc (int argc ARG_UNUSED, char **argv ARG_UNUSED) 26 mail_inc (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
27 { 27 {
28 if (!mu_mailbox_is_updated (mbox)) 28 if (!mu_mailbox_is_updated (mbox))
29 { 29 {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 */ 24 */
25 25
26 int 26 int
27 mail_list (int argc ARG_UNUSED, char **argv ARG_UNUSED) 27 mail_list (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
28 { 28 {
29 mail_command_list (); 29 mail_command_list ();
30 return 0; 30 return 0;
......
...@@ -185,7 +185,7 @@ static const char *mail_capa[] = { ...@@ -185,7 +185,7 @@ static const char *mail_capa[] = {
185 }; 185 };
186 186
187 static char * 187 static char *
188 mail_cmdline (void *closure, int cont ARG_UNUSED) 188 mail_cmdline (void *closure, int cont MU_ARG_UNUSED)
189 { 189 {
190 char *prompt = (char*) closure; 190 char *prompt = (char*) closure;
191 char *rc; 191 char *rc;
...@@ -543,7 +543,7 @@ mail_mainloop (char *(*input) (void *, int), ...@@ -543,7 +543,7 @@ mail_mainloop (char *(*input) (void *, int),
543 } 543 }
544 544
545 int 545 int
546 mail_warranty (int argc ARG_UNUSED, char **argv ARG_UNUSED) 546 mail_warranty (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
547 { 547 {
548 fputs (_("GNU Mailutils -- a suite of utilities for electronic mail\n" 548 fputs (_("GNU Mailutils -- a suite of utilities for electronic mail\n"
549 "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,\n" 549 "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,\n"
......
...@@ -305,7 +305,7 @@ ml_attempted_completion_over () ...@@ -305,7 +305,7 @@ ml_attempted_completion_over ()
305 305
306 /* Completion functions */ 306 /* Completion functions */
307 char ** 307 char **
308 no_compl (int argc ARG_UNUSED, char **argv ARG_UNUSED, int ws ARG_UNUSED) 308 no_compl (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED, int ws MU_ARG_UNUSED)
309 { 309 {
310 ml_attempted_completion_over (); 310 ml_attempted_completion_over ();
311 return NULL; 311 return NULL;
...@@ -320,7 +320,7 @@ msglist_compl (int argc, char **argv, int ws) ...@@ -320,7 +320,7 @@ msglist_compl (int argc, char **argv, int ws)
320 } 320 }
321 321
322 char ** 322 char **
323 msglist_file_compl (int argc, char **argv, int ws ARG_UNUSED) 323 msglist_file_compl (int argc, char **argv, int ws MU_ARG_UNUSED)
324 { 324 {
325 if (argc == 1) 325 if (argc == 1)
326 ml_attempted_completion_over (); 326 ml_attempted_completion_over ();
...@@ -989,7 +989,7 @@ readline (char *prompt) ...@@ -989,7 +989,7 @@ readline (char *prompt)
989 } 989 }
990 990
991 void 991 void
992 ml_set_completion_append_character (int c ARG_UNUSED) 992 ml_set_completion_append_character (int c MU_ARG_UNUSED)
993 { 993 {
994 } 994 }
995 995
......
...@@ -653,7 +653,7 @@ select_body (mu_message_t msg, void *closure) ...@@ -653,7 +653,7 @@ select_body (mu_message_t msg, void *closure)
653 } 653 }
654 654
655 int 655 int
656 select_sender (mu_message_t msg ARG_UNUSED, void *closure ARG_UNUSED) 656 select_sender (mu_message_t msg MU_ARG_UNUSED, void *closure MU_ARG_UNUSED)
657 { 657 {
658 /* char *sender = (char*) closure; */ 658 /* char *sender = (char*) closure; */
659 /* FIXME: all messages from sender argv[i] */ 659 /* FIXME: all messages from sender argv[i] */
...@@ -691,7 +691,7 @@ select_type (mu_message_t msg, void *closure) ...@@ -691,7 +691,7 @@ select_type (mu_message_t msg, void *closure)
691 } 691 }
692 692
693 int 693 int
694 select_deleted (mu_message_t msg, void *closure ARG_UNUSED) 694 select_deleted (mu_message_t msg, void *closure MU_ARG_UNUSED)
695 { 695 {
696 mu_attribute_t attr= NULL; 696 mu_attribute_t attr= NULL;
697 int rc; 697 int rc;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27 int 27 int
28 mail_quit (int argc ARG_UNUSED, char **argv ARG_UNUSED) 28 mail_quit (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
29 { 29 {
30 if (mail_mbox_close ()) 30 if (mail_mbox_close ())
31 return 1; 31 return 1;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 21
22 static char * 22 static char *
23 source_readline (void *closure, int cont ARG_UNUSED) 23 source_readline (void *closure, int cont MU_ARG_UNUSED)
24 { 24 {
25 FILE *fp = closure; 25 FILE *fp = closure;
26 size_t s = 0; 26 size_t s = 0;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 The side effect is that it sets the cursor 23 The side effect is that it sets the cursor
24 to the newest or read message number. */ 24 to the newest or read message number. */
25 int 25 int
26 mail_summary (int argc ARG_UNUSED, char **argv ARG_UNUSED) 26 mail_summary (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
27 { 27 {
28 mu_message_t msg; 28 mu_message_t msg;
29 mu_attribute_t attr; 29 mu_attribute_t attr;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 /* unt[ag] [msglist] */ 23 /* unt[ag] [msglist] */
24 24
25 static int 25 static int
26 tag_message (mu_message_t mesg, msgset_t *msgset ARG_UNUSED, void *arg) 26 tag_message (mu_message_t mesg, msgset_t *msgset MU_ARG_UNUSED, void *arg)
27 { 27 {
28 mu_attribute_t attr; 28 mu_attribute_t attr;
29 int *action = arg; 29 int *action = arg;
......
...@@ -38,7 +38,7 @@ static const char *with_defs[] = ...@@ -38,7 +38,7 @@ static const char *with_defs[] =
38 38
39 39
40 int 40 int
41 mail_version (int argc ARG_UNUSED, char **argv ARG_UNUSED) 41 mail_version (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
42 { 42 {
43 fprintf (ofile, "%s", argp_program_version); 43 fprintf (ofile, "%s", argp_program_version);
44 if (with_defs[0] != NULL) 44 if (with_defs[0] != NULL)
......
...@@ -1107,7 +1107,7 @@ amd_is_updated (mu_mailbox_t mailbox) ...@@ -1107,7 +1107,7 @@ amd_is_updated (mu_mailbox_t mailbox)
1107 } 1107 }
1108 1108
1109 static int 1109 static int
1110 amd_get_size (mu_mailbox_t mailbox ARG_UNUSED, mu_off_t *psize ARG_UNUSED) 1110 amd_get_size (mu_mailbox_t mailbox MU_ARG_UNUSED, mu_off_t *psize MU_ARG_UNUSED)
1111 { 1111 {
1112 /*FIXME*/ 1112 /*FIXME*/
1113 return ENOSYS; 1113 return ENOSYS;
...@@ -1482,7 +1482,7 @@ amd_envelope_sender (mu_envelope_t envelope, char *buf, size_t len, size_t *psiz ...@@ -1482,7 +1482,7 @@ amd_envelope_sender (mu_envelope_t envelope, char *buf, size_t len, size_t *psiz
1482 } 1482 }
1483 1483
1484 static void 1484 static void
1485 amd_url_destroy (mu_url_t url ARG_UNUSED) 1485 amd_url_destroy (mu_url_t url MU_ARG_UNUSED)
1486 { 1486 {
1487 } 1487 }
1488 1488
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 #include <auth0.h> 30 #include <auth0.h>
31 31
32 static int 32 static int
33 _authenticate_null (mu_authority_t auth ARG_UNUSED) 33 _authenticate_null (mu_authority_t auth MU_ARG_UNUSED)
34 { 34 {
35 return 0; 35 return 0;
36 } 36 }
......
...@@ -707,7 +707,7 @@ _prog_stream_unregister (struct _prog_stream *stream) ...@@ -707,7 +707,7 @@ _prog_stream_unregister (struct _prog_stream *stream)
707 } 707 }
708 708
709 static int 709 static int
710 _prog_waitpid (void *item, void *data ARG_UNUSED) 710 _prog_waitpid (void *item, void *data MU_ARG_UNUSED)
711 { 711 {
712 struct _prog_stream *str = item; 712 struct _prog_stream *str = item;
713 int status; 713 int status;
......
...@@ -332,7 +332,7 @@ copy_pass (struct icvt_stream *s, char *optr, size_t osize, size_t *pnbytes) ...@@ -332,7 +332,7 @@ copy_pass (struct icvt_stream *s, char *optr, size_t osize, size_t *pnbytes)
332 332
333 static int 333 static int
334 _icvt_read (mu_stream_t stream, char *optr, size_t osize, 334 _icvt_read (mu_stream_t stream, char *optr, size_t osize,
335 mu_off_t offset ARG_UNUSED, size_t *pnbytes) 335 mu_off_t offset MU_ARG_UNUSED, size_t *pnbytes)
336 { 336 {
337 struct icvt_stream *s = mu_stream_get_owner (stream); 337 struct icvt_stream *s = mu_stream_get_owner (stream);
338 338
......
...@@ -168,7 +168,7 @@ static const char _hexdigits[] = "0123456789ABCDEF"; ...@@ -168,7 +168,7 @@ static const char _hexdigits[] = "0123456789ABCDEF";
168 168
169 static int 169 static int
170 qp_decode (const char *iptr, size_t isize, char *optr, size_t osize, 170 qp_decode (const char *iptr, size_t isize, char *optr, size_t osize,
171 size_t *nbytes, int *line_len ARG_UNUSED) 171 size_t *nbytes, int *line_len MU_ARG_UNUSED)
172 { 172 {
173 char c; 173 char c;
174 int last_char = 0; 174 int last_char = 0;
...@@ -413,7 +413,7 @@ b64_input (char c) ...@@ -413,7 +413,7 @@ b64_input (char c)
413 413
414 static int 414 static int
415 base64_decode (const char *iptr, size_t isize, char *optr, size_t osize, 415 base64_decode (const char *iptr, size_t isize, char *optr, size_t osize,
416 size_t *nbytes, int *line_len ARG_UNUSED) 416 size_t *nbytes, int *line_len MU_ARG_UNUSED)
417 { 417 {
418 int i = 0, tmp = 0, pad = 0; 418 int i = 0, tmp = 0, pad = 0;
419 size_t consumed = 0; 419 size_t consumed = 0;
...@@ -578,7 +578,7 @@ static struct _mu_filter_record _B_filter = ...@@ -578,7 +578,7 @@ static struct _mu_filter_record _B_filter =
578 /* RFC 2047 "Q" Encoding */ 578 /* RFC 2047 "Q" Encoding */
579 static int 579 static int
580 Q_decode (const char *iptr, size_t isize, char *optr, size_t osize, 580 Q_decode (const char *iptr, size_t isize, char *optr, size_t osize,
581 size_t *nbytes, int *line_len ARG_UNUSED) 581 size_t *nbytes, int *line_len MU_ARG_UNUSED)
582 { 582 {
583 char c; 583 char c;
584 size_t consumed = 0; 584 size_t consumed = 0;
......
...@@ -392,7 +392,7 @@ _body_stream_size (mu_stream_t stream, mu_off_t *psize) ...@@ -392,7 +392,7 @@ _body_stream_size (mu_stream_t stream, mu_off_t *psize)
392 } 392 }
393 393
394 static int 394 static int
395 _body_stream_flush (mu_stream_t str ARG_UNUSED) 395 _body_stream_flush (mu_stream_t str MU_ARG_UNUSED)
396 { 396 {
397 return 0; 397 return 0;
398 } 398 }
......
...@@ -193,13 +193,13 @@ mu_monitor_unlock (mu_monitor_t monitor) ...@@ -193,13 +193,13 @@ mu_monitor_unlock (mu_monitor_t monitor)
193 } 193 }
194 194
195 int 195 int
196 mu_monitor_wait (mu_monitor_t monitor ARG_UNUSED) 196 mu_monitor_wait (mu_monitor_t monitor MU_ARG_UNUSED)
197 { 197 {
198 return ENOSYS; 198 return ENOSYS;
199 } 199 }
200 200
201 int 201 int
202 mu_monitor_notify (mu_monitor_t monitor ARG_UNUSED) 202 mu_monitor_notify (mu_monitor_t monitor MU_ARG_UNUSED)
203 { 203 {
204 return ENOSYS; 204 return ENOSYS;
205 } 205 }
......
...@@ -175,10 +175,10 @@ mu_auth_runlist (mu_list_t flist, struct mu_auth_data **return_data, ...@@ -175,10 +175,10 @@ mu_auth_runlist (mu_list_t flist, struct mu_auth_data **return_data,
175 } 175 }
176 176
177 int 177 int
178 mu_auth_nosupport (struct mu_auth_data **return_data ARG_UNUSED, 178 mu_auth_nosupport (struct mu_auth_data **return_data MU_ARG_UNUSED,
179 const void *key ARG_UNUSED, 179 const void *key MU_ARG_UNUSED,
180 void *func_data ARG_UNUSED, 180 void *func_data MU_ARG_UNUSED,
181 void *call_data ARG_UNUSED) 181 void *call_data MU_ARG_UNUSED)
182 { 182 {
183 return ENOSYS; 183 return ENOSYS;
184 } 184 }
......
...@@ -789,7 +789,7 @@ static SYMBOL const mil_tz_tab[] = { ...@@ -789,7 +789,7 @@ static SYMBOL const mil_tz_tab[] = {
789 789
790 /* ARGSUSED */ 790 /* ARGSUSED */
791 static int 791 static int
792 yyerror (char *s ARG_UNUSED) 792 yyerror (char *s MU_ARG_UNUSED)
793 { 793 {
794 return 0; 794 return 0;
795 } 795 }
......
...@@ -75,8 +75,8 @@ mu_auth_system (struct mu_auth_data **return_data, const struct passwd *pw) ...@@ -75,8 +75,8 @@ mu_auth_system (struct mu_auth_data **return_data, const struct passwd *pw)
75 int 75 int
76 mu_auth_system_by_name (struct mu_auth_data **return_data, 76 mu_auth_system_by_name (struct mu_auth_data **return_data,
77 const void *key, 77 const void *key,
78 void *func_data ARG_UNUSED, 78 void *func_data MU_ARG_UNUSED,
79 void *call_data ARG_UNUSED) 79 void *call_data MU_ARG_UNUSED)
80 { 80 {
81 if (!key) 81 if (!key)
82 return EINVAL; 82 return EINVAL;
...@@ -86,8 +86,8 @@ mu_auth_system_by_name (struct mu_auth_data **return_data, ...@@ -86,8 +86,8 @@ mu_auth_system_by_name (struct mu_auth_data **return_data,
86 static int 86 static int
87 mu_auth_system_by_uid (struct mu_auth_data **return_data, 87 mu_auth_system_by_uid (struct mu_auth_data **return_data,
88 const void *key, 88 const void *key,
89 void *func_data ARG_UNUSED, 89 void *func_data MU_ARG_UNUSED,
90 void *call_data ARG_UNUSED) 90 void *call_data MU_ARG_UNUSED)
91 { 91 {
92 if (!key) 92 if (!key)
93 return EINVAL; 93 return EINVAL;
...@@ -95,9 +95,9 @@ mu_auth_system_by_uid (struct mu_auth_data **return_data, ...@@ -95,9 +95,9 @@ mu_auth_system_by_uid (struct mu_auth_data **return_data,
95 } 95 }
96 96
97 static int 97 static int
98 mu_authenticate_generic (struct mu_auth_data **return_data ARG_UNUSED, 98 mu_authenticate_generic (struct mu_auth_data **return_data MU_ARG_UNUSED,
99 const void *key, 99 const void *key,
100 void *func_data ARG_UNUSED, 100 void *func_data MU_ARG_UNUSED,
101 void *call_data) 101 void *call_data)
102 { 102 {
103 const struct mu_auth_data *auth_data = key; 103 const struct mu_auth_data *auth_data = key;
...@@ -113,9 +113,9 @@ mu_authenticate_generic (struct mu_auth_data **return_data ARG_UNUSED, ...@@ -113,9 +113,9 @@ mu_authenticate_generic (struct mu_auth_data **return_data ARG_UNUSED,
113 113
114 /* Called only if generic fails */ 114 /* Called only if generic fails */
115 static int 115 static int
116 mu_authenticate_system (struct mu_auth_data **return_data ARG_UNUSED, 116 mu_authenticate_system (struct mu_auth_data **return_data MU_ARG_UNUSED,
117 const void *key, 117 const void *key,
118 void *func_data ARG_UNUSED, 118 void *func_data MU_ARG_UNUSED,
119 void *call_data) 119 void *call_data)
120 { 120 {
121 const struct mu_auth_data *auth_data = key; 121 const struct mu_auth_data *auth_data = key;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 static void url_sendmail_destroy (mu_url_t purl); 40 static void url_sendmail_destroy (mu_url_t purl);
41 41
42 static void 42 static void
43 url_sendmail_destroy (mu_url_t url ARG_UNUSED) 43 url_sendmail_destroy (mu_url_t url MU_ARG_UNUSED)
44 { 44 {
45 } 45 }
46 46
......
...@@ -167,7 +167,7 @@ ali_print_name_list (mu_list_t list, int off) ...@@ -167,7 +167,7 @@ ali_print_name_list (mu_list_t list, int off)
167 } 167 }
168 168
169 static int 169 static int
170 ali_print_alias (char *name, mu_list_t alias, void *data ARG_UNUSED) 170 ali_print_alias (char *name, mu_list_t alias, void *data MU_ARG_UNUSED)
171 { 171 {
172 int n; 172 int n;
173 173
......
...@@ -89,7 +89,7 @@ mhparam_defval (char *comp) ...@@ -89,7 +89,7 @@ mhparam_defval (char *comp)
89 } 89 }
90 90
91 int 91 int
92 mhparam_iterator (const char *comp, const char *value, void *data ARG_UNUSED) 92 mhparam_iterator (const char *comp, const char *value, void *data MU_ARG_UNUSED)
93 { 93 {
94 if (display_comp_name) 94 if (display_comp_name)
95 printf("%s:\t", comp); 95 printf("%s:\t", comp);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 /* AUTH is not yet implemented */ 21 /* AUTH is not yet implemented */
22 22
23 int 23 int
24 pop3d_auth (const char *arg ARG_UNUSED) 24 pop3d_auth (const char *arg MU_ARG_UNUSED)
25 { 25 {
26 if (state != AUTHORIZATION) 26 if (state != AUTHORIZATION)
27 return ERR_WRONG_STATE; 27 return ERR_WRONG_STATE;
......
...@@ -35,7 +35,7 @@ process_cleanup () ...@@ -35,7 +35,7 @@ process_cleanup ()
35 } 35 }
36 36
37 RETSIGTYPE 37 RETSIGTYPE
38 pop3d_sigchld (int signo ARG_UNUSED) 38 pop3d_sigchld (int signo MU_ARG_UNUSED)
39 { 39 {
40 need_cleanup = 1; 40 need_cleanup = 1;
41 #ifndef HAVE_SIGACTION 41 #ifndef HAVE_SIGACTION
......
...@@ -179,7 +179,7 @@ store_result (mu_sql_connection_t conn) ...@@ -179,7 +179,7 @@ store_result (mu_sql_connection_t conn)
179 } 179 }
180 180
181 static int 181 static int
182 free_char_data (void *item, void *data ARG_UNUSED) 182 free_char_data (void *item, void *data MU_ARG_UNUSED)
183 { 183 {
184 free (item); 184 free (item);
185 return 0; 185 return 0;
......