Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 61c47d30 61c47d3087a2c292829fef1dd40f6973ae3d05c3 by Sam Roberts
Options

Removed redundant mu_ prefix from mailutils/mu_argp.h.

1 parent b44ce92a
Inline Side-by-side
Showing 13 changed files with 19 additions and 20 deletions
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
46 # include <strings.h> 46 # include <strings.h>
47 #endif 47 #endif
48 48
49 #include <mailutils/argp.h>
49 #include <mailutils/body.h> 50 #include <mailutils/body.h>
50 #include <mailutils/errno.h> 51 #include <mailutils/errno.h>
51 #include <mailutils/error.h> 52 #include <mailutils/error.h>
...@@ -56,7 +57,6 @@ ...@@ -56,7 +57,6 @@
56 #include <mailutils/mutil.h> 57 #include <mailutils/mutil.h>
57 #include <mailutils/registrar.h> 58 #include <mailutils/registrar.h>
58 #include <mailutils/stream.h> 59 #include <mailutils/stream.h>
59 #include <mailutils/mu_argp.h>
60 60
61 #include <argcv.h> 61 #include <argcv.h>
62 62
......
...@@ -26,9 +26,8 @@ ...@@ -26,9 +26,8 @@
26 #include <unistd.h> 26 #include <unistd.h>
27 #include "getopt.h" 27 #include "getopt.h"
28 28
29 #include <mailutils/mu_argp.h>
30
31 #include <mailutils/address.h> 29 #include <mailutils/address.h>
30 #include <mailutils/argp.h>
32 #include <mailutils/attribute.h> 31 #include <mailutils/attribute.h>
33 #include <mailutils/debug.h> 32 #include <mailutils/debug.h>
34 #include <mailutils/errno.h> 33 #include <mailutils/errno.h>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
34 #include <unistd.h> 34 #include <unistd.h>
35 35
36 #include <mailutils/address.h> 36 #include <mailutils/address.h>
37 #include <mailutils/argp.h>
37 #include <mailutils/debug.h> 38 #include <mailutils/debug.h>
38 #include <mailutils/errno.h> 39 #include <mailutils/errno.h>
39 #include <mailutils/header.h> 40 #include <mailutils/header.h>
...@@ -42,7 +43,6 @@ ...@@ -42,7 +43,6 @@
42 #include <mailutils/message.h> 43 #include <mailutils/message.h>
43 #include <mailutils/registrar.h> 44 #include <mailutils/registrar.h>
44 #include <mailutils/stream.h> 45 #include <mailutils/stream.h>
45 #include <mailutils/mu_argp.h>
46 46
47 const char *argp_program_version = "from (" PACKAGE ") " VERSION; 47 const char *argp_program_version = "from (" PACKAGE ") " VERSION;
48 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>"; 48 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
17 17
18 #include "guimb.h" 18 #include "guimb.h"
19 #include <mailutils/mu_argp.h> 19
20 #include <mailutils/argp.h>
20 21
21 char *program_file; 22 char *program_file;
22 char *program_expr; 23 char *program_expr;
......
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
70 #endif 70 #endif
71 71
72 #include <mailutils/address.h> 72 #include <mailutils/address.h>
73 #include <mailutils/argp.h>
73 #include <mailutils/attribute.h> 74 #include <mailutils/attribute.h>
74 #include <mailutils/body.h> 75 #include <mailutils/body.h>
75 #include <mailutils/envelope.h> 76 #include <mailutils/envelope.h>
...@@ -85,7 +86,6 @@ ...@@ -85,7 +86,6 @@
85 #include <mailutils/parse822.h> 86 #include <mailutils/parse822.h>
86 #include <mailutils/registrar.h> 87 #include <mailutils/registrar.h>
87 #include <mailutils/stream.h> 88 #include <mailutils/stream.h>
88 #include <mailutils/mu_argp.h>
89 89
90 90
91 #ifdef __cplusplus 91 #ifdef __cplusplus
......
1 pkginclude_HEADERS = \ 1 pkginclude_HEADERS = \
2 address.h \ 2 address.h \
3 argp.h \
3 attribute.h \ 4 attribute.h \
4 auth.h \ 5 auth.h \
5 body.h \ 6 body.h \
...@@ -7,7 +8,6 @@ pkginclude_HEADERS = \ ...@@ -7,7 +8,6 @@ pkginclude_HEADERS = \
7 envelope.h \ 8 envelope.h \
8 errno.h \ 9 errno.h \
9 error.h \ 10 error.h \
10 mu_features.h \
11 filter.h \ 11 filter.h \
12 folder.h \ 12 folder.h \
13 header.h \ 13 header.h \
...@@ -20,7 +20,6 @@ pkginclude_HEADERS = \ ...@@ -20,7 +20,6 @@ pkginclude_HEADERS = \
20 message.h \ 20 message.h \
21 mime.h \ 21 mime.h \
22 monitor.h \ 22 monitor.h \
23 mu_argp.h \
24 mutil.h \ 23 mutil.h \
25 observer.h \ 24 observer.h \
26 parse822.h \ 25 parse822.h \
......
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
15 along with this program; if not, write to the Free Software 15 along with this program; if not, write to the Free Software
16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
17 17
18 #ifndef MU_ARGP_H 18 #ifndef _MAILUTILS_ARGP_H
19 #define MU_ARGP_H 1 19 #define _MAILUTILS_ARGP_H
20
21 #include <mailutils/types.h>
20 22
21 #include <mailutils/mailbox.h>
22 #include <argp.h> 23 #include <argp.h>
23 24
24 #define MODE_INTERACTIVE 0 25 #define MODE_INTERACTIVE 0
...@@ -37,15 +38,14 @@ extern char *pam_service; ...@@ -37,15 +38,14 @@ extern char *pam_service;
37 extern int log_facility; 38 extern int log_facility;
38 extern int mu_argp_error_code; 39 extern int mu_argp_error_code;
39 40
40 extern void mu_create_argcv __P((const char *capa[], 41 extern void mu_create_argcv __P ((const char *capa[],
41 int argc, char **argv, 42 int argc, char **argv,
42 int *p_argc, char ***p_argv)); 43 int *p_argc, char ***p_argv));
43 extern error_t mu_argp_parse __P((const struct argp *argp, 44 extern error_t mu_argp_parse __P ((const struct argp * argp,
44 int *p_argc, char ***p_argv, 45 int *p_argc, char ***p_argv,
45 unsigned flags, 46 unsigned flags,
46 const char *capa[], 47 const char *capa[],
47 int *arg_index, 48 int *arg_index, void *input));
48 void *input));
49 49
50 #endif 50 #endif
51 51
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 16 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
17 17
18 #include <mailutils/address.h> 18 #include <mailutils/address.h>
19 #include <mailutils/argp.h>
19 #include <mailutils/attribute.h> 20 #include <mailutils/attribute.h>
20 #include <mailutils/auth.h> 21 #include <mailutils/auth.h>
21 #include <mailutils/body.h> 22 #include <mailutils/body.h>
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
68 # define INADDR_LOOPBAK 0x7f000001 68 # define INADDR_LOOPBAK 0x7f000001
69 #endif 69 #endif
70 70
71 #include <mailutils/argp.h>
71 #include <mailutils/attribute.h> 72 #include <mailutils/attribute.h>
72 #include <mailutils/errno.h> 73 #include <mailutils/errno.h>
73 #include <mailutils/error.h> 74 #include <mailutils/error.h>
...@@ -79,7 +80,6 @@ ...@@ -79,7 +80,6 @@
79 #include <mailutils/registrar.h> 80 #include <mailutils/registrar.h>
80 #include <mailutils/stream.h> 81 #include <mailutils/stream.h>
81 #include <mailutils/url.h> 82 #include <mailutils/url.h>
82 #include <mailutils/mu_argp.h>
83 83
84 #include <mu_dbm.h> 84 #include <mu_dbm.h>
85 85
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
59 #endif 59 #endif
60 60
61 #include <mailutils/address.h> 61 #include <mailutils/address.h>
62 #include <mailutils/argp.h>
62 #include <mailutils/attribute.h> 63 #include <mailutils/attribute.h>
63 #include <mailutils/body.h> 64 #include <mailutils/body.h>
64 #include <mailutils/debug.h> 65 #include <mailutils/debug.h>
...@@ -75,7 +76,6 @@ ...@@ -75,7 +76,6 @@
75 #include <mailutils/registrar.h> 76 #include <mailutils/registrar.h>
76 #include <mailutils/stream.h> 77 #include <mailutils/stream.h>
77 #include <mailutils/url.h> 78 #include <mailutils/url.h>
78 #include <mailutils/mu_argp.h>
79 79
80 #include <argcv.h> 80 #include <argcv.h>
81 #include <getline.h> 81 #include <getline.h>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
20 #endif 20 #endif
21 21
22 #include <mailutils/mailutils.h> 22 #include <mailutils/mailutils.h>
23 #include <mailutils/mu_argp.h>
24 23
25 #include <stdio.h> 24 #include <stdio.h>
26 25
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
109 # include <strings.h> 109 # include <strings.h>
110 #endif 110 #endif
111 111
112 #include <mailutils/argp.h>
112 #include <mailutils/attribute.h> 113 #include <mailutils/attribute.h>
113 #include <mailutils/body.h> 114 #include <mailutils/body.h>
114 #include <mailutils/errno.h> 115 #include <mailutils/errno.h>
...@@ -121,7 +122,6 @@ ...@@ -121,7 +122,6 @@
121 #include <mailutils/mutil.h> 122 #include <mailutils/mutil.h>
122 #include <mailutils/registrar.h> 123 #include <mailutils/registrar.h>
123 #include <mailutils/url.h> 124 #include <mailutils/url.h>
124 #include <mailutils/mu_argp.h>
125 125
126 /* For Berkley DB2 APOP password file */ 126 /* For Berkley DB2 APOP password file */
127 #ifdef HAVE_DB_H 127 #ifdef HAVE_DB_H
......
...@@ -39,6 +39,7 @@ sieve script interpreter. ...@@ -39,6 +39,7 @@ sieve script interpreter.
39 39
40 #include "sieve.h" 40 #include "sieve.h"
41 41
42 #include <mailutils/argp.h>
42 #include <mailutils/auth.h> 43 #include <mailutils/auth.h>
43 #include <mailutils/errno.h> 44 #include <mailutils/errno.h>
44 #include <mailutils/folder.h> 45 #include <mailutils/folder.h>
...@@ -47,7 +48,6 @@ sieve script interpreter. ...@@ -47,7 +48,6 @@ sieve script interpreter.
47 #include <mailutils/mutil.h> 48 #include <mailutils/mutil.h>
48 #include <mailutils/registrar.h> 49 #include <mailutils/registrar.h>
49 #include <mailutils/stream.h> 50 #include <mailutils/stream.h>
50 #include <mailutils/mu_argp.h>
51 51
52 void mutil_register_all_mbox_formats(void); 52 void mutil_register_all_mbox_formats(void);
53 53
......