From 61c47d3087a2c292829fef1dd40f6973ae3d05c3 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Tue, 14 May 2002 03:25:05 +0000 Subject: Removed redundant mu_ prefix from mailutils/mu_argp.h. --- comsat/comsat.h | 2 +- frm/frm.c | 3 +-- from/from.c | 2 +- guimb/main.c | 3 ++- imap4d/imap4d.h | 2 +- include/mailutils/Makefile.am | 3 +-- include/mailutils/argp.h | 51 +++++++++++++++++++++++++++++++++++++++++++ include/mailutils/mailutils.h | 1 + include/mailutils/mu_argp.h | 51 ------------------------------------------- mail.local/mail.local.h | 2 +- mail/mail.h | 2 +- messages/messages.c | 1 - pop3d/pop3d.h | 2 +- sieve/sieve.c | 2 +- 14 files changed, 63 insertions(+), 64 deletions(-) create mode 100644 include/mailutils/argp.h delete mode 100644 include/mailutils/mu_argp.h diff --git a/comsat/comsat.h b/comsat/comsat.h index 6298d1448..223c5f87e 100644 --- a/comsat/comsat.h +++ b/comsat/comsat.h @@ -46,6 +46,7 @@ # include #endif +#include #include #include #include @@ -56,7 +57,6 @@ #include #include #include -#include #include diff --git a/frm/frm.c b/frm/frm.c index f248245ea..e5cfa0eb6 100644 --- a/frm/frm.c +++ b/frm/frm.c @@ -26,9 +26,8 @@ #include #include "getopt.h" -#include - #include +#include #include #include #include diff --git a/from/from.c b/from/from.c index 87d0d5c18..4d5cc1310 100644 --- a/from/from.c +++ b/from/from.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -42,7 +43,6 @@ #include #include #include -#include const char *argp_program_version = "from (" PACKAGE ") " VERSION; const char *argp_program_bug_address = ""; diff --git a/guimb/main.c b/guimb/main.c index ffd2692e9..5108ba6af 100644 --- a/guimb/main.c +++ b/guimb/main.c @@ -16,7 +16,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "guimb.h" -#include + +#include char *program_file; char *program_expr; diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h index 1892e4b5d..2f4f42709 100644 --- a/imap4d/imap4d.h +++ b/imap4d/imap4d.h @@ -70,6 +70,7 @@ #endif #include +#include #include #include #include @@ -85,7 +86,6 @@ #include #include #include -#include #ifdef __cplusplus diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am index 8bafa156a..b64ea4e45 100644 --- a/include/mailutils/Makefile.am +++ b/include/mailutils/Makefile.am @@ -1,5 +1,6 @@ pkginclude_HEADERS = \ address.h \ + argp.h \ attribute.h \ auth.h \ body.h \ @@ -7,7 +8,6 @@ pkginclude_HEADERS = \ envelope.h \ errno.h \ error.h \ - mu_features.h \ filter.h \ folder.h \ header.h \ @@ -20,7 +20,6 @@ pkginclude_HEADERS = \ message.h \ mime.h \ monitor.h \ - mu_argp.h \ mutil.h \ observer.h \ parse822.h \ diff --git a/include/mailutils/argp.h b/include/mailutils/argp.h new file mode 100644 index 000000000..56b998d4b --- /dev/null +++ b/include/mailutils/argp.h @@ -0,0 +1,51 @@ +/* GNU mailutils - a suite of utilities for electronic mail + Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef _MAILUTILS_ARGP_H +#define _MAILUTILS_ARGP_H + +#include + +#include + +#define MODE_INTERACTIVE 0 +#define MODE_DAEMON 1 + +struct daemon_param { + int mode; + size_t maxchildren; + unsigned int port; + unsigned int timeout; +}; + +#ifdef USE_LIBPAM +extern char *pam_service; +#endif +extern int log_facility; +extern int mu_argp_error_code; + +extern void mu_create_argcv __P ((const char *capa[], + int argc, char **argv, + int *p_argc, char ***p_argv)); +extern error_t mu_argp_parse __P ((const struct argp * argp, + int *p_argc, char ***p_argv, + unsigned flags, + const char *capa[], + int *arg_index, void *input)); + +#endif + diff --git a/include/mailutils/mailutils.h b/include/mailutils/mailutils.h index e06aea323..a8aa877c2 100644 --- a/include/mailutils/mailutils.h +++ b/include/mailutils/mailutils.h @@ -16,6 +16,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include +#include #include #include #include diff --git a/include/mailutils/mu_argp.h b/include/mailutils/mu_argp.h deleted file mode 100644 index e56418d8a..000000000 --- a/include/mailutils/mu_argp.h +++ /dev/null @@ -1,51 +0,0 @@ -/* GNU mailutils - a suite of utilities for electronic mail - Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -#ifndef MU_ARGP_H -#define MU_ARGP_H 1 - -#include -#include - -#define MODE_INTERACTIVE 0 -#define MODE_DAEMON 1 - -struct daemon_param { - int mode; - size_t maxchildren; - unsigned int port; - unsigned int timeout; -}; - -#ifdef USE_LIBPAM -extern char *pam_service; -#endif -extern int log_facility; -extern int mu_argp_error_code; - -extern void mu_create_argcv __P((const char *capa[], - int argc, char **argv, - int *p_argc, char ***p_argv)); -extern error_t mu_argp_parse __P((const struct argp *argp, - int *p_argc, char ***p_argv, - unsigned flags, - const char *capa[], - int *arg_index, - void *input)); - -#endif - diff --git a/mail.local/mail.local.h b/mail.local/mail.local.h index fc04ad74d..cbd50b1ee 100644 --- a/mail.local/mail.local.h +++ b/mail.local/mail.local.h @@ -68,6 +68,7 @@ # define INADDR_LOOPBAK 0x7f000001 #endif +#include #include #include #include @@ -79,7 +80,6 @@ #include #include #include -#include #include diff --git a/mail/mail.h b/mail/mail.h index eaaef18db..1f69b055b 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -59,6 +59,7 @@ #endif #include +#include #include #include #include @@ -75,7 +76,6 @@ #include #include #include -#include #include #include diff --git a/messages/messages.c b/messages/messages.c index 9a1701387..18c4af4df 100644 --- a/messages/messages.c +++ b/messages/messages.c @@ -20,7 +20,6 @@ #endif #include -#include #include diff --git a/pop3d/pop3d.h b/pop3d/pop3d.h index decef7be8..ea1354754 100644 --- a/pop3d/pop3d.h +++ b/pop3d/pop3d.h @@ -109,6 +109,7 @@ # include #endif +#include #include #include #include @@ -121,7 +122,6 @@ #include #include #include -#include /* For Berkley DB2 APOP password file */ #ifdef HAVE_DB_H diff --git a/sieve/sieve.c b/sieve/sieve.c index c1a252a25..632459963 100644 --- a/sieve/sieve.c +++ b/sieve/sieve.c @@ -39,6 +39,7 @@ sieve script interpreter. #include "sieve.h" +#include #include #include #include @@ -47,7 +48,6 @@ sieve script interpreter. #include #include #include -#include void mutil_register_all_mbox_formats(void); -- cgit v1.2.1