Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 6929560d 6929560d4d9dc95813022b9350da0f98f03e95c1 by Sergey Poznyakoff
Options

Fix-up structure names from types.h

1 parent 6a1cb4d4
Inline Side-by-side
Showing 40 changed files with 151 additions and 130 deletions
1 2005-08-29 Sergey Poznyakoff <gray@gnu.org.ua> 1 2005-08-29 Sergey Poznyakoff <gray@gnu.org.ua>
2 2
3 * configure.ac: Raise version number to 0.6.92
4 Raise library current interface version to 1
5
6 * include/mailutils/filter.h,
7 include/mailutils/registrar.h, include/mailutils/types.h,
8 mailbox/filter.c, mailbox/filter_rfc822.c, mailbox/filter_trans.c,
9 mailbox/folder.c, mailbox/getopt.h, mailbox/locker.c,
10 mailbox/parse822.c, mailbox/registrar.c, mailbox/sendmail.c,
11 mailbox/smtp.c, mailbox/url.c, mailbox/imap/folder.c,
12 mailbox/include/address0.h, mailbox/include/attribute0.h,
13 mailbox/include/auth0.h, mailbox/include/body0.h,
14 mailbox/include/debug0.h, mailbox/include/envelope0.h,
15 mailbox/include/filter0.h, mailbox/include/folder0.h,
16 mailbox/include/header0.h, mailbox/include/iterator0.h,
17 mailbox/include/list0.h, mailbox/include/mailbox0.h,
18 mailbox/include/mailer0.h, mailbox/include/message0.h,
19 mailbox/include/mime0.h, mailbox/include/observer0.h,
20 mailbox/include/property0.h, mailbox/include/stream0.h,
21 mailbox/include/url0.h, mailbox/maildir/folder.c,
22 mailbox/mbox/folder.c, mailbox/mh/folder.c, mailbox/nntp/folder.c,
23 mailbox/pop/folder.c: Fix-up structure names from types.h
24
3 Final seasoning: Replace munre_ with mu_unre_ 25 Final seasoning: Replace munre_ with mu_unre_
4 26
5 * include/mailutils/mutil.h 27 * include/mailutils/mutil.h
......
...@@ -34,15 +34,15 @@ extern "C" { ...@@ -34,15 +34,15 @@ extern "C" {
34 #define MU_FILTER_WRITE MU_STREAM_WRITE 34 #define MU_FILTER_WRITE MU_STREAM_WRITE
35 #define MU_FILTER_RDWR MU_STREAM_RDWR 35 #define MU_FILTER_RDWR MU_STREAM_RDWR
36 36
37 struct mu_filter_record 37 struct _mu_filter_record
38 { 38 {
39 const char *name; 39 const char *name;
40 int (*_filter) (mu_filter_t); 40 int (*_mu_filter) (mu_filter_t);
41 void *data; 41 void *data;
42 42
43 /* Stub function return the fields. */ 43 /* Stub function return the fields. */
44 int (*_is_filter) (mu_filter_record_t, const char *); 44 int (*_is_filter) (mu_filter_record_t, const char *);
45 int (*_get_filter) (mu_filter_record_t, int (*(*_filter)) (mu_filter_t)); 45 int (*_get_filter) (mu_filter_record_t, int (*(*_mu_filter)) (mu_filter_t));
46 }; 46 };
47 47
48 48
......
...@@ -26,22 +26,22 @@ extern "C" { ...@@ -26,22 +26,22 @@ extern "C" {
26 #endif 26 #endif
27 27
28 /* Public Interface, to allow static initialization. */ 28 /* Public Interface, to allow static initialization. */
29 struct mu__record 29 struct _mu_record
30 { 30 {
31 int priority; /* Higher priority records are scanned first */ 31 int priority; /* Higher priority records are scanned first */
32 const char *scheme; 32 const char *scheme;
33 int (*_url) (mu_url_t); 33 int (*_mu_url) (mu_url_t);
34 int (*_mailbox) (mu_mailbox_t); 34 int (*_mu_mailbox) (mu_mailbox_t);
35 int (*_mailer) (mu_mailer_t); 35 int (*_mu_mailer) (mu_mailer_t);
36 int (*_folder) (mu_folder_t); 36 int (*_mu_folder) (mu_folder_t);
37 void *data; /* back pointer. */ 37 void *data; /* back pointer. */
38 38
39 /* Stub functions to override. The default is to return the fields. */ 39 /* Stub functions to override. The default is to return the fields. */
40 int (*_is_scheme) (mu_record_t, const char *, int); 40 int (*_is_scheme) (mu_record_t, const char *, int);
41 int (*_get_url) (mu_record_t, int (*(*_url)) (mu_url_t)); 41 int (*_get_url) (mu_record_t, int (*(*_mu_url)) (mu_url_t));
42 int (*_get_mailbox) (mu_record_t, int (*(*_mailbox)) (mu_mailbox_t)); 42 int (*_get_mailbox) (mu_record_t, int (*(*_mu_mailbox)) (mu_mailbox_t));
43 int (*_get_mailer) (mu_record_t, int (*(*_mailer)) (mu_mailer_t)); 43 int (*_get_mailer) (mu_record_t, int (*(*_mu_mailer)) (mu_mailer_t));
44 int (*_get_folder) (mu_record_t, int (*(*_folder)) (mu_folder_t)); 44 int (*_get_folder) (mu_record_t, int (*(*_mu_folder)) (mu_folder_t));
45 }; 45 };
46 46
47 /* Registration. */ 47 /* Registration. */
......
...@@ -25,63 +25,63 @@ ...@@ -25,63 +25,63 @@
25 extern "C" { 25 extern "C" {
26 #endif 26 #endif
27 27
28 struct _address; 28 struct _mu_address;
29 struct _attribute; 29 struct _mu_attribute;
30 struct _authority; 30 struct _mu_authority;
31 struct _body; 31 struct _mu_body;
32 struct _debug; 32 struct _mu_debug;
33 struct _envelope; 33 struct _mu_envelope;
34 struct _filter; 34 struct _mu_filter;
35 struct mu_filter_record; 35 struct _mu_filter_record;
36 struct _folder; 36 struct _mu_folder;
37 struct _header; 37 struct _mu_header;
38 struct _iterator; 38 struct _mu_iterator;
39 struct _list; 39 struct _mu_list;
40 struct _locker; 40 struct _mu_locker;
41 struct _mailbox; 41 struct _mu_mailbox;
42 struct _mailer; 42 struct _mu_mailer;
43 struct _message; 43 struct _mu_message;
44 struct _mime; 44 struct _mu_mime;
45 struct _mu_mailcap; 45 struct _mu_mailcap;
46 struct _mu_mailcap_entry; 46 struct _mu_mailcap_entry;
47 struct _mu_refcount; 47 struct _mu_refcount;
48 struct _observable; 48 struct _mu_observable;
49 struct _observer; 49 struct _mu_observer;
50 struct _property; 50 struct _mu_property;
51 struct mu__record; 51 struct _mu_record;
52 struct _stream; 52 struct _mu_stream;
53 struct _ticket; 53 struct _mu_ticket;
54 struct _url; 54 struct _mu_url;
55 struct _wicket; 55 struct _mu_wicket;
56 56
57 typedef struct _address *mu_address_t; 57 typedef struct _mu_address *mu_address_t;
58 typedef struct _attribute *mu_attribute_t; 58 typedef struct _mu_attribute *mu_attribute_t;
59 typedef struct _authority *mu_authority_t; 59 typedef struct _mu_authority *mu_authority_t;
60 typedef struct _body *mu_body_t; 60 typedef struct _mu_body *mu_body_t;
61 typedef struct _debug *mu_debug_t; 61 typedef struct _mu_debug *mu_debug_t;
62 typedef struct _envelope *mu_envelope_t; 62 typedef struct _mu_envelope *mu_envelope_t;
63 typedef struct _filter *mu_filter_t; 63 typedef struct _mu_filter *mu_filter_t;
64 typedef struct mu_filter_record *mu_filter_record_t; 64 typedef struct _mu_filter_record *mu_filter_record_t;
65 typedef struct _folder *mu_folder_t; 65 typedef struct _mu_folder *mu_folder_t;
66 typedef struct _header * mu_header_t; 66 typedef struct _mu_header * mu_header_t;
67 typedef struct _iterator *mu_iterator_t; 67 typedef struct _mu_iterator *mu_iterator_t;
68 typedef struct _list *mu_list_t; 68 typedef struct _mu_list *mu_list_t;
69 typedef struct _locker *mu_locker_t; 69 typedef struct _mu_locker *mu_locker_t;
70 typedef struct _mailbox *mu_mailbox_t; 70 typedef struct _mu_mailbox *mu_mailbox_t;
71 typedef struct _mailer *mu_mailer_t; 71 typedef struct _mu_mailer *mu_mailer_t;
72 typedef struct _message *mu_message_t; 72 typedef struct _mu_message *mu_message_t;
73 typedef struct _mime *mu_mime_t; 73 typedef struct _mu_mime *mu_mime_t;
74 typedef struct _mu_mailcap *mu_mailcap_t; 74 typedef struct _mu_mailcap *mu_mailcap_t;
75 typedef struct _mu_mailcap_entry *mu_mailcap_entry_t; 75 typedef struct _mu_mailcap_entry *mu_mailcap_entry_t;
76 typedef struct _mu_refcount *mu_refcount_t; 76 typedef struct _mu_refcount *mu_refcount_t;
77 typedef struct _observable *mu_observable_t; 77 typedef struct _mu_observable *mu_observable_t;
78 typedef struct _observer *mu_observer_t; 78 typedef struct _mu_observer *mu_observer_t;
79 typedef struct _property *mu_property_t; 79 typedef struct _mu_property *mu_property_t;
80 typedef struct mu__record *mu_record_t; 80 typedef struct _mu_record *mu_record_t;
81 typedef struct _stream *mu_stream_t; 81 typedef struct _mu_stream *mu_stream_t;
82 typedef struct _ticket *mu_ticket_t; 82 typedef struct _mu_ticket *mu_ticket_t;
83 typedef struct _url *mu_url_t; 83 typedef struct _mu_url *mu_url_t;
84 typedef struct _wicket *mu_wicket_t; 84 typedef struct _mu_wicket *mu_wicket_t;
85 typedef void *mu_transport_t; 85 typedef void *mu_transport_t;
86 86
87 #define MU_FOLDER_ATTRIBUTE_DIRECTORY 0x001 87 #define MU_FOLDER_ATTRIBUTE_DIRECTORY 0x001
......
...@@ -190,7 +190,7 @@ mu_filter_create (mu_stream_t *pstream, mu_stream_t stream, const char *name, ...@@ -190,7 +190,7 @@ mu_filter_create (mu_stream_t *pstream, mu_stream_t stream, const char *name,
190 if (filter_record->_get_filter) 190 if (filter_record->_get_filter)
191 filter_record->_get_filter (filter_record, &f_init); 191 filter_record->_get_filter (filter_record, &f_init);
192 else 192 else
193 f_init = filter_record->_filter; 193 f_init = filter_record->_mu_filter;
194 break; 194 break;
195 } 195 }
196 } 196 }
......
...@@ -44,7 +44,7 @@ struct rfc822 ...@@ -44,7 +44,7 @@ struct rfc822
44 int residue; 44 int residue;
45 }; 45 };
46 46
47 static struct mu_filter_record _rfc822_filter = 47 static struct _mu_filter_record _rfc822_filter =
48 { 48 {
49 "RFC822", 49 "RFC822",
50 rfc822_init, 50 rfc822_init,
......
...@@ -378,7 +378,7 @@ qp_init (mu_filter_t filter) ...@@ -378,7 +378,7 @@ qp_init (mu_filter_t filter)
378 return 0; 378 return 0;
379 } 379 }
380 380
381 static struct mu_filter_record _qp_filter = 381 static struct _mu_filter_record _qp_filter =
382 { 382 {
383 "quoted-printable", 383 "quoted-printable",
384 qp_init, 384 qp_init,
...@@ -510,7 +510,7 @@ base64_init (mu_filter_t filter) ...@@ -510,7 +510,7 @@ base64_init (mu_filter_t filter)
510 return 0; 510 return 0;
511 } 511 }
512 512
513 static struct mu_filter_record _base64_filter = 513 static struct _mu_filter_record _base64_filter =
514 { 514 {
515 "base64", 515 "base64",
516 base64_init, 516 base64_init,
...@@ -696,7 +696,7 @@ Q_init (mu_filter_t filter) ...@@ -696,7 +696,7 @@ Q_init (mu_filter_t filter)
696 return 0; 696 return 0;
697 } 697 }
698 698
699 static struct mu_filter_record _Q_filter = 699 static struct _mu_filter_record _Q_filter =
700 { 700 {
701 "Q", 701 "Q",
702 Q_init, 702 Q_init,
...@@ -708,7 +708,7 @@ static struct mu_filter_record _Q_filter = ...@@ -708,7 +708,7 @@ static struct mu_filter_record _Q_filter =
708 708
709 /* Pass-through encodings */ 709 /* Pass-through encodings */
710 710
711 static struct mu_filter_record _bit8_filter = 711 static struct _mu_filter_record _bit8_filter =
712 { 712 {
713 "8bit", 713 "8bit",
714 NULL, 714 NULL,
...@@ -717,7 +717,7 @@ static struct mu_filter_record _bit8_filter = ...@@ -717,7 +717,7 @@ static struct mu_filter_record _bit8_filter =
717 NULL 717 NULL
718 }; 718 };
719 719
720 static struct mu_filter_record _bit7_filter = 720 static struct _mu_filter_record _bit7_filter =
721 { 721 {
722 "7bit", 722 "7bit",
723 NULL, 723 NULL,
...@@ -726,7 +726,7 @@ static struct mu_filter_record _bit7_filter = ...@@ -726,7 +726,7 @@ static struct mu_filter_record _bit7_filter =
726 NULL 726 NULL
727 }; 727 };
728 728
729 static struct mu_filter_record _binary_filter = 729 static struct _mu_filter_record _binary_filter =
730 { 730 {
731 "binary", 731 "binary",
732 NULL, 732 NULL,
......
...@@ -311,9 +311,9 @@ int ...@@ -311,9 +311,9 @@ int
311 mu_folder_list (mu_folder_t folder, const char *dirname, const char *basename, 311 mu_folder_list (mu_folder_t folder, const char *dirname, const char *basename,
312 struct mu_folder_list *pflist) 312 struct mu_folder_list *pflist)
313 { 313 {
314 if (folder == NULL || folder->_list == NULL) 314 if (folder == NULL || folder->_mu_list == NULL)
315 return EINVAL; 315 return EINVAL;
316 return folder->_list (folder, dirname, basename, pflist); 316 return folder->_mu_list (folder, dirname, basename, pflist);
317 } 317 }
318 318
319 int 319 int
......
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 14 GNU General Public License for more details.
15 15
16 You should have received a copy of the GNU General Public 16 You should have received a copy of the GNU General Public License along
17 License along with this program; if not, write to the Free 17 with this program; if not, write to the Free Software Foundation,
18 Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
19 Boston, MA 02110-1301 USA. */
20 19
21 #ifndef _GETOPT_H 20 #ifndef _GETOPT_H
22 21
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 #define DEBUG_SHOW_DATA 0 62 #define DEBUG_SHOW_DATA 0
63 63
64 /* Variable use for the registrar. */ 64 /* Variable use for the registrar. */
65 static struct mu__record _imap_record = 65 static struct _mu_record _imap_record =
66 { 66 {
67 MU_IMAP_PRIO, 67 MU_IMAP_PRIO,
68 MU_IMAP_SCHEME, 68 MU_IMAP_SCHEME,
...@@ -416,7 +416,7 @@ _folder_imap_init (mu_folder_t folder) ...@@ -416,7 +416,7 @@ _folder_imap_init (mu_folder_t folder)
416 folder->_open = folder_imap_open; 416 folder->_open = folder_imap_open;
417 folder->_close = folder_imap_close; 417 folder->_close = folder_imap_close;
418 418
419 folder->_list = folder_imap_list; 419 folder->_mu_list = folder_imap_list;
420 folder->_lsub = folder_imap_lsub; 420 folder->_lsub = folder_imap_lsub;
421 folder->_subscribe = folder_imap_subscribe; 421 folder->_subscribe = folder_imap_subscribe;
422 folder->_unsubscribe = folder_imap_unsubscribe; 422 folder->_unsubscribe = folder_imap_unsubscribe;
......
...@@ -36,7 +36,7 @@ extern "C" { ...@@ -36,7 +36,7 @@ extern "C" {
36 * 36 *
37 * Capitalized names are from RFC 822, section 6.1 (Address Syntax). 37 * Capitalized names are from RFC 822, section 6.1 (Address Syntax).
38 */ 38 */
39 struct _address 39 struct _mu_address
40 { 40 {
41 char *addr; 41 char *addr;
42 /* the original string that this list of addresses was created 42 /* the original string that this list of addresses was created
...@@ -58,7 +58,7 @@ struct _address ...@@ -58,7 +58,7 @@ struct _address
58 /* size_t num; this didn't appear to be used anywhere... so I commented 58 /* size_t num; this didn't appear to be used anywhere... so I commented
59 it out, is that ok? -sam */ 59 it out, is that ok? -sam */
60 60
61 struct _address *next; 61 struct _mu_address *next;
62 }; 62 };
63 63
64 #ifdef __cplusplus 64 #ifdef __cplusplus
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 extern "C" { 29 extern "C" {
30 #endif 30 #endif
31 31
32 struct _attribute 32 struct _mu_attribute
33 { 33 {
34 void *owner; 34 void *owner;
35 35
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 extern "C" { 31 extern "C" {
32 #endif 32 #endif
33 33
34 struct _ticket 34 struct _mu_ticket
35 { 35 {
36 void *owner; 36 void *owner;
37 char *challenge; 37 char *challenge;
...@@ -40,14 +40,14 @@ struct _ticket ...@@ -40,14 +40,14 @@ struct _ticket
40 void (*_destroy) (mu_ticket_t); 40 void (*_destroy) (mu_ticket_t);
41 }; 41 };
42 42
43 struct _authority 43 struct _mu_authority
44 { 44 {
45 void *owner; 45 void *owner;
46 mu_ticket_t ticket; 46 mu_ticket_t ticket;
47 mu_list_t auth_methods; /* list of int (*_authenticate) (mu_authority_t)s; */ 47 mu_list_t auth_methods; /* list of int (*_authenticate) (mu_authority_t)s; */
48 }; 48 };
49 49
50 struct _wicket 50 struct _mu_wicket
51 { 51 {
52 char *filename; 52 char *filename;
53 int (*_get_ticket) (mu_wicket_t, const char *, const char *, mu_ticket_t *); 53 int (*_get_ticket) (mu_wicket_t, const char *, const char *, mu_ticket_t *);
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 extern "C" { 33 extern "C" {
34 #endif 34 #endif
35 35
36 struct _body 36 struct _mu_body
37 { 37 {
38 void *owner; 38 void *owner;
39 char *filename; 39 char *filename;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 extern "C" { 29 extern "C" {
30 #endif 30 #endif
31 31
32 struct _debug 32 struct _mu_debug
33 { 33 {
34 size_t level; 34 size_t level;
35 char *buffer; 35 char *buffer;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 extern "C" { 29 extern "C" {
30 #endif 30 #endif
31 31
32 struct _envelope 32 struct _mu_envelope
33 { 33 {
34 void *owner; 34 void *owner;
35 int (*_destroy) (mu_envelope_t); 35 int (*_destroy) (mu_envelope_t);
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 extern "C" { 32 extern "C" {
33 #endif 33 #endif
34 34
35 struct _filter 35 struct _mu_filter
36 { 36 {
37 mu_stream_t stream; 37 mu_stream_t stream;
38 mu_stream_t filter_stream; 38 mu_stream_t filter_stream;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 extern "C" { 33 extern "C" {
34 #endif 34 #endif
35 35
36 struct _folder 36 struct _mu_folder
37 { 37 {
38 /* Data */ 38 /* Data */
39 mu_authority_t authority; 39 mu_authority_t authority;
...@@ -55,7 +55,7 @@ struct _folder ...@@ -55,7 +55,7 @@ struct _folder
55 55
56 int (*_open) (mu_folder_t, int flag); 56 int (*_open) (mu_folder_t, int flag);
57 int (*_close) (mu_folder_t); 57 int (*_close) (mu_folder_t);
58 int (*_list) (mu_folder_t, const char *, const char *, 58 int (*_mu_list) (mu_folder_t, const char *, const char *,
59 struct mu_folder_list *); 59 struct mu_folder_list *);
60 int (*_lsub) (mu_folder_t, const char *, const char *, 60 int (*_lsub) (mu_folder_t, const char *, const char *,
61 struct mu_folder_list *); 61 struct mu_folder_list *);
......
...@@ -42,7 +42,7 @@ struct _hdr ...@@ -42,7 +42,7 @@ struct _hdr
42 42
43 /* The blurb member represents the headers, hdr_count the number of distinct 43 /* The blurb member represents the headers, hdr_count the number of distinct
44 header field and the layout is done by struct_hdr *hdr. */ 44 header field and the layout is done by struct_hdr *hdr. */
45 struct _header 45 struct _mu_header
46 { 46 {
47 /* Owner. */ 47 /* Owner. */
48 void *owner; 48 void *owner;
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
29 extern "C" { 29 extern "C" {
30 #endif 30 #endif
31 31
32 struct _iterator 32 struct _mu_iterator
33 { 33 {
34 struct _iterator *next_itr; /* Next iterator in the chain */ 34 struct _mu_iterator *next_itr; /* Next iterator in the chain */
35 void *owner; /* Object whose contents is being iterated */ 35 void *owner; /* Object whose contents is being iterated */
36 int is_advanced; /* Is the iterator already advanced */ 36 int is_advanced; /* Is the iterator already advanced */
37 37
......
...@@ -40,14 +40,14 @@ struct list_data ...@@ -40,14 +40,14 @@ struct list_data
40 struct list_data *prev; 40 struct list_data *prev;
41 }; 41 };
42 42
43 struct _list 43 struct _mu_list
44 { 44 {
45 struct list_data head; 45 struct list_data head;
46 size_t count; 46 size_t count;
47 mu_monitor_t monitor; 47 mu_monitor_t monitor;
48 mu_list_comparator_t comp; 48 mu_list_comparator_t comp;
49 void (*destroy_item) (void *item); 49 void (*destroy_item) (void *item);
50 struct _iterator *itr; 50 struct _mu_iterator *itr;
51 }; 51 };
52 52
53 53
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 extern "C" { 33 extern "C" {
34 #endif 34 #endif
35 35
36 struct _mailbox 36 struct _mu_mailbox
37 { 37 {
38 /* Data */ 38 /* Data */
39 mu_observable_t observable; 39 mu_observable_t observable;
......
...@@ -37,7 +37,7 @@ extern "C" { ...@@ -37,7 +37,7 @@ extern "C" {
37 37
38 #define MAILER_LINE_BUF_SIZE 1000 38 #define MAILER_LINE_BUF_SIZE 1000
39 39
40 struct _mailer 40 struct _mu_mailer
41 { 41 {
42 mu_stream_t stream; 42 mu_stream_t stream;
43 mu_observable_t observable; 43 mu_observable_t observable;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 extern "C" { 34 extern "C" {
35 #endif 35 #endif
36 36
37 struct _message 37 struct _mu_message
38 { 38 {
39 /* Who is the owner. */ 39 /* Who is the owner. */
40 void *owner; 40 void *owner;
......
...@@ -49,7 +49,7 @@ extern "C" { ...@@ -49,7 +49,7 @@ extern "C" {
49 #define MIME_INSERT_BOUNDARY 0x04000000 49 #define MIME_INSERT_BOUNDARY 0x04000000
50 #define MIME_ADDING_BOUNDARY 0x02000000 50 #define MIME_ADDING_BOUNDARY 0x02000000
51 51
52 struct _mime 52 struct _mu_mime
53 { 53 {
54 mu_message_t msg; 54 mu_message_t msg;
55 mu_header_t hdrs; 55 mu_header_t hdrs;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 extern "C" { 29 extern "C" {
30 #endif 30 #endif
31 31
32 struct _observer 32 struct _mu_observer
33 { 33 {
34 int flags; 34 int flags;
35 void *owner; 35 void *owner;
...@@ -37,7 +37,7 @@ struct _observer ...@@ -37,7 +37,7 @@ struct _observer
37 int (*_destroy) (mu_observer_t); 37 int (*_destroy) (mu_observer_t);
38 }; 38 };
39 39
40 struct _observable 40 struct _mu_observable
41 { 41 {
42 void *owner; 42 void *owner;
43 mu_list_t list; 43 mu_list_t list;
......
...@@ -42,7 +42,7 @@ struct property_item ...@@ -42,7 +42,7 @@ struct property_item
42 struct property_item *next; 42 struct property_item *next;
43 }; 43 };
44 44
45 struct _property 45 struct _mu_property
46 { 46 {
47 struct property_item *items; 47 struct property_item *items;
48 void *owner; 48 void *owner;
......
...@@ -38,7 +38,7 @@ struct rbuffer ...@@ -38,7 +38,7 @@ struct rbuffer
38 off_t offset; 38 off_t offset;
39 }; 39 };
40 40
41 struct _stream 41 struct _mu_stream
42 { 42 {
43 void *owner; 43 void *owner;
44 mu_property_t property; 44 mu_property_t property;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 extern "C" { 29 extern "C" {
30 #endif 30 #endif
31 31
32 struct _url 32 struct _mu_url
33 { 33 {
34 /* Data */ 34 /* Data */
35 char *name; 35 char *name;
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 /* First draft by Brian Edmond. */ 47 /* First draft by Brian Edmond. */
48 /* For subsequent modifications, see the GNU mailutils ChangeLog. */ 48 /* For subsequent modifications, see the GNU mailutils ChangeLog. */
49 49
50 struct _locker 50 struct _mu_locker
51 { 51 {
52 int refcnt; 52 int refcnt;
53 53
......
...@@ -99,7 +99,7 @@ _maildir_url_init (mu_url_t url) ...@@ -99,7 +99,7 @@ _maildir_url_init (mu_url_t url)
99 return amd_url_init (url, MU_MAILDIR_SCHEME); 99 return amd_url_init (url, MU_MAILDIR_SCHEME);
100 } 100 }
101 101
102 static struct mu__record _maildir_record = 102 static struct _mu_record _maildir_record =
103 { 103 {
104 MU_MAILDIR_PRIO, 104 MU_MAILDIR_PRIO,
105 MU_MAILDIR_SCHEME, 105 MU_MAILDIR_SCHEME,
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 /* We export url parsing and the initialisation of 45 /* We export url parsing and the initialisation of
46 the mailbox, via the register entry/record. */ 46 the mailbox, via the register entry/record. */
47 47
48 static struct mu__record _mbox_record = 48 static struct _mu_record _mbox_record =
49 { 49 {
50 MU_MBOX_PRIO, 50 MU_MBOX_PRIO,
51 MU_MBOX_SCHEME, 51 MU_MBOX_SCHEME,
...@@ -89,7 +89,7 @@ _path_is_scheme (mu_record_t record, const char *url, int flags) ...@@ -89,7 +89,7 @@ _path_is_scheme (mu_record_t record, const char *url, int flags)
89 return rc; 89 return rc;
90 } 90 }
91 91
92 static struct mu__record _path_record = 92 static struct _mu_record _path_record =
93 { 93 {
94 MU_PATH_PRIO, 94 MU_PATH_PRIO,
95 MU_PATH_SCHEME, 95 MU_PATH_SCHEME,
...@@ -165,7 +165,7 @@ _folder_mbox_init (mu_folder_t folder) ...@@ -165,7 +165,7 @@ _folder_mbox_init (mu_folder_t folder)
165 folder->_open = folder_mbox_open; 165 folder->_open = folder_mbox_open;
166 folder->_close = folder_mbox_close; 166 folder->_close = folder_mbox_close;
167 167
168 folder->_list = folder_mbox_list; 168 folder->_mu_list = folder_mbox_list;
169 folder->_lsub = folder_mbox_lsub; 169 folder->_lsub = folder_mbox_lsub;
170 folder->_subscribe = folder_mbox_subscribe; 170 folder->_subscribe = folder_mbox_subscribe;
171 folder->_unsubscribe = folder_mbox_unsubscribe; 171 folder->_unsubscribe = folder_mbox_unsubscribe;
......
...@@ -128,7 +128,7 @@ _mh_url_init (mu_url_t url) ...@@ -128,7 +128,7 @@ _mh_url_init (mu_url_t url)
128 return amd_url_init (url, MU_MH_SCHEME); 128 return amd_url_init (url, MU_MH_SCHEME);
129 } 129 }
130 130
131 static struct mu__record _mh_record = 131 static struct _mu_record _mh_record =
132 { 132 {
133 MU_MH_PRIO, 133 MU_MH_PRIO,
134 MU_MH_SCHEME, 134 MU_MH_SCHEME,
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 /* We export url parsing and the initialisation of 42 /* We export url parsing and the initialisation of
43 the mailbox, via the register entry/record. */ 43 the mailbox, via the register entry/record. */
44 44
45 static struct mu__record _nntp_record = 45 static struct _mu_record _nntp_record =
46 { 46 {
47 MU_NNTP_PRIO, 47 MU_NNTP_PRIO,
48 MU_NNTP_URL_SCHEME, 48 MU_NNTP_URL_SCHEME,
...@@ -80,7 +80,7 @@ _nntp_folder_init (mu_folder_t folder) ...@@ -80,7 +80,7 @@ _nntp_folder_init (mu_folder_t folder)
80 folder->_open = nntp_folder_open; 80 folder->_open = nntp_folder_open;
81 folder->_close = nntp_folder_close; 81 folder->_close = nntp_folder_close;
82 82
83 folder->_list = nntp_folder_list; 83 folder->_mu_list = nntp_folder_list;
84 /* Not supported. 84 /* Not supported.
85 folder->_lsub = folder_nntp_lsub; 85 folder->_lsub = folder_nntp_lsub;
86 folder->_subscribe = folder_nntp_subscribe; 86 folder->_subscribe = folder_nntp_subscribe;
......
...@@ -29,7 +29,7 @@ Things to consider: ...@@ -29,7 +29,7 @@ Things to consider:
29 29
30 - Are comments allowed in domain-literals? 30 - Are comments allowed in domain-literals?
31 31
32 - Need a way to mark the *end* of a group. Maybe add a field to _address, 32 - Need a way to mark the *end* of a group. Maybe add a field to _mu_address,
33 int group_end;, so if you care, you can search for the end of 33 int group_end;, so if you care, you can search for the end of
34 a group with address_is_group_end(); 34 a group with address_is_group_end();
35 35
...@@ -711,7 +711,7 @@ mu_parse822_phrase (const char **p, const char *e, char **phrase) ...@@ -711,7 +711,7 @@ mu_parse822_phrase (const char **p, const char *e, char **phrase)
711 static mu_address_t 711 static mu_address_t
712 new_mb (void) 712 new_mb (void)
713 { 713 {
714 return calloc (1, sizeof (struct _address)); 714 return calloc (1, sizeof (struct _mu_address));
715 } 715 }
716 716
717 static int 717 static int
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 /* We export url parsing and the initialisation of 41 /* We export url parsing and the initialisation of
42 the mailbox, via the register entry/record. */ 42 the mailbox, via the register entry/record. */
43 43
44 static struct mu__record _pop_record = 44 static struct _mu_record _pop_record =
45 { 45 {
46 MU_POP_PRIO, 46 MU_POP_PRIO,
47 MU_POP_SCHEME, 47 MU_POP_SCHEME,
......
...@@ -192,16 +192,16 @@ mu_record_get_url (mu_record_t record, int (*(*_purl)) (mu_url_t)) ...@@ -192,16 +192,16 @@ mu_record_get_url (mu_record_t record, int (*(*_purl)) (mu_url_t))
192 /* Overload. */ 192 /* Overload. */
193 if (record->_get_url) 193 if (record->_get_url)
194 return record->_get_url (record, _purl); 194 return record->_get_url (record, _purl);
195 *_purl = record->_url; 195 *_purl = record->_mu_url;
196 return 0; 196 return 0;
197 } 197 }
198 198
199 int 199 int
200 mu_record_set_url (mu_record_t record, int (*_url) (mu_url_t)) 200 mu_record_set_url (mu_record_t record, int (*_mu_url) (mu_url_t))
201 { 201 {
202 if (record == NULL) 202 if (record == NULL)
203 return EINVAL; 203 return EINVAL;
204 record->_url = _url; 204 record->_mu_url = _mu_url;
205 return 0; 205 return 0;
206 } 206 }
207 207
...@@ -225,16 +225,16 @@ mu_record_get_mailbox (mu_record_t record, int (*(*_pmailbox)) (mu_mailbox_t)) ...@@ -225,16 +225,16 @@ mu_record_get_mailbox (mu_record_t record, int (*(*_pmailbox)) (mu_mailbox_t))
225 /* Overload. */ 225 /* Overload. */
226 if (record->_get_mailbox) 226 if (record->_get_mailbox)
227 return record->_get_mailbox (record, _pmailbox); 227 return record->_get_mailbox (record, _pmailbox);
228 *_pmailbox = record->_mailbox; 228 *_pmailbox = record->_mu_mailbox;
229 return 0; 229 return 0;
230 } 230 }
231 231
232 int 232 int
233 mu_record_set_mailbox (mu_record_t record, int (*_mailbox) (mu_mailbox_t)) 233 mu_record_set_mailbox (mu_record_t record, int (*_mu_mailbox) (mu_mailbox_t))
234 { 234 {
235 if (record) 235 if (record)
236 return EINVAL; 236 return EINVAL;
237 record->_mailbox = _mailbox; 237 record->_mu_mailbox = _mu_mailbox;
238 return 0; 238 return 0;
239 } 239 }
240 240
...@@ -258,16 +258,16 @@ mu_record_get_mailer (mu_record_t record, int (*(*_pmailer)) (mu_mailer_t)) ...@@ -258,16 +258,16 @@ mu_record_get_mailer (mu_record_t record, int (*(*_pmailer)) (mu_mailer_t))
258 /* Overload. */ 258 /* Overload. */
259 if (record->_get_mailer) 259 if (record->_get_mailer)
260 return record->_get_mailer (record, _pmailer); 260 return record->_get_mailer (record, _pmailer);
261 *_pmailer = record->_mailer; 261 *_pmailer = record->_mu_mailer;
262 return 0; 262 return 0;
263 } 263 }
264 264
265 int 265 int
266 mu_record_set_mailer (mu_record_t record, int (*_mailer) (mu_mailer_t)) 266 mu_record_set_mailer (mu_record_t record, int (*_mu_mailer) (mu_mailer_t))
267 { 267 {
268 if (record) 268 if (record)
269 return EINVAL; 269 return EINVAL;
270 record->_mailer = _mailer; 270 record->_mu_mailer = _mu_mailer;
271 return 0; 271 return 0;
272 } 272 }
273 273
...@@ -291,16 +291,16 @@ mu_record_get_folder (mu_record_t record, int (*(*_pfolder)) (mu_folder_t)) ...@@ -291,16 +291,16 @@ mu_record_get_folder (mu_record_t record, int (*(*_pfolder)) (mu_folder_t))
291 /* Overload. */ 291 /* Overload. */
292 if (record->_get_folder) 292 if (record->_get_folder)
293 return record->_get_folder (record, _pfolder); 293 return record->_get_folder (record, _pfolder);
294 *_pfolder = record->_folder; 294 *_pfolder = record->_mu_folder;
295 return 0; 295 return 0;
296 } 296 }
297 297
298 int 298 int
299 mu_record_set_folder (mu_record_t record, int (*_folder) (mu_folder_t)) 299 mu_record_set_folder (mu_record_t record, int (*_mu_folder) (mu_folder_t))
300 { 300 {
301 if (record == NULL) 301 if (record == NULL)
302 return EINVAL; 302 return EINVAL;
303 record->_folder = _folder; 303 record->_mu_folder = _mu_folder;
304 return 0; 304 return 0;
305 } 305 }
306 306
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 #include <mailer0.h> 46 #include <mailer0.h>
47 #include <registrar0.h> 47 #include <registrar0.h>
48 48
49 static struct mu__record _sendmail_record = 49 static struct _mu_record _sendmail_record =
50 { 50 {
51 MU_SENDMAIL_PRIO, 51 MU_SENDMAIL_PRIO,
52 MU_SENDMAIL_SCHEME, 52 MU_SENDMAIL_SCHEME,
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 #include <mailer0.h> 52 #include <mailer0.h>
53 #include <registrar0.h> 53 #include <registrar0.h>
54 54
55 static struct mu__record _smtp_record = { 55 static struct _mu_record _smtp_record = {
56 MU_SMTP_PRIO, 56 MU_SMTP_PRIO,
57 MU_SMTP_SCHEME, 57 MU_SMTP_SCHEME,
58 _url_smtp_init, /* url init. */ 58 _url_smtp_init, /* url init. */
......
...@@ -99,7 +99,7 @@ mu_url_parse (mu_url_t url) ...@@ -99,7 +99,7 @@ mu_url_parse (mu_url_t url)
99 { 99 {
100 int err = 0; 100 int err = 0;
101 char *n = NULL; 101 char *n = NULL;
102 struct _url u = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; 102 struct _mu_url u = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
103 103
104 if (!url || !url->name) 104 if (!url || !url->name)
105 return EINVAL; 105 return EINVAL;
......