projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move hash.[hc] into lib-lib/
[apps/madmutt.git]
/
mutt.h
diff --git
a/mutt.h
b/mutt.h
index
e8d53e6
..
20b04c8
100644
(file)
--- a/
mutt.h
+++ b/
mutt.h
@@
-41,9
+41,11
@@
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
+#include <lib-lib/buffer.h>
+#include <lib-lib/hash.h>
+
#include "rfc822.h"
#include "list.h"
#include "rfc822.h"
#include "list.h"
-#include "hash.h"
#include "charset.h"
#include "lib/rx.h"
#include "charset.h"
#include "lib/rx.h"
@@
-74,13
+76,6
@@
#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
-typedef struct {
- char *data; /* pointer to data */
- char *dptr; /* current read/write position */
- size_t dsize; /* length of data */
- int destroy; /* destroy `data' when done? */
-} BUFFER;
-
typedef struct {
int ch; /* raw key pressed */
int op; /* function op */
typedef struct {
int ch; /* raw key pressed */
int op; /* function op */
@@
-541,7
+536,7
@@
typedef struct spam_list_t {
} SPAM_LIST;
} SPAM_LIST;
-#define mutt_new_spam_list()
mem_calloc (1, sizeof (SPAM_LIST)
)
+#define mutt_new_spam_list()
p_new(SPAM_LIST, 1
)
void mutt_free_spam_list (SPAM_LIST **);
int mutt_matches_ignore (const char *, LIST *);
void mutt_free_spam_list (SPAM_LIST **);
int mutt_matches_ignore (const char *, LIST *);
@@
-605,13
+600,13
@@
typedef struct body {
PARAMETER *parameter; /* parameters of the content-type */
char *description; /* content-description */
char *form_name; /* Content-Disposition form-data name param */
PARAMETER *parameter; /* parameters of the content-type */
char *description; /* content-description */
char *form_name; /* Content-Disposition form-data name param */
-
LOFF_T hdr_offset;
/* offset in stream where the headers begin.
+
off_t hdr_offset;
/* offset in stream where the headers begin.
* this info is used when invoking metamail,
* where we need to send the headers of the
* attachment
*/
* this info is used when invoking metamail,
* where we need to send the headers of the
* attachment
*/
-
LOFF_T offset;
/* offset where the actual data begins */
-
LOFF_T length;
/* length (in bytes) of attachment */
+
off_t offset;
/* offset where the actual data begins */
+
off_t length;
/* length (in bytes) of attachment */
char *filename; /* when sending a message, this is the file
* to which this structure refers
*/
char *filename; /* when sending a message, this is the file
* to which this structure refers
*/
@@
-725,7
+720,7
@@
typedef struct header {
time_t date_sent; /* time when the message was sent (UTC) */
time_t received; /* time when the message was placed in the mailbox */
time_t date_sent; /* time when the message was sent (UTC) */
time_t received; /* time when the message was placed in the mailbox */
-
LOFF_T offset;
/* where in the stream does this message begin? */
+
off_t offset;
/* where in the stream does this message begin? */
int lines; /* how many lines in the body of this message? */
int index; /* the absolute (unsorted) message number */
int msgno; /* number displayed to the user */
int lines; /* how many lines in the body of this message? */
int index; /* the absolute (unsorted) message number */
int msgno; /* number displayed to the user */
@@
-848,7
+843,7
@@
typedef struct {
typedef struct {
char *major;
int major_int;
typedef struct {
char *major;
int major_int;
- char *minor;
+ c
onst c
har *minor;
regex_t minor_rx;
} ATTACH_MATCH;
regex_t minor_rx;
} ATTACH_MATCH;