projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove most of the debug code: often makes the code unreadable, for little
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
311ea28
..
4b91fe8
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-12,6
+12,11
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <ctype.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/stat.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/ascii.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/ascii.h>
@@
-35,13
+40,6
@@
#include <imap/imap.h>
#include <imap/mx_imap.h>
#include <imap/imap.h>
#include <imap/mx_imap.h>
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
{N_("Del"), OP_DELETE},
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
{N_("Del"), OP_DELETE},
@@
-90,10
+88,7
@@
int mutt_num_postponed (int force)
newpc = imap_mailbox_check (Postponed, 0);
if (newpc >= 0) {
PostCount = newpc;
newpc = imap_mailbox_check (Postponed, 0);
if (newpc >= 0) {
PostCount = newpc;
- debug_print (2, ("%d postponed IMAP messages found.\n", PostCount));
}
}
- else
- debug_print (2, ("using old IMAP postponed count.\n"));
}
return PostCount;
}
}
return PostCount;
}
@@
-230,13
+225,13
@@
static HEADER *select_msg (void)
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
- size_t fcclen)
+ s
s
ize_t fcclen)
{
HEADER *h;
int code = SENDPOSTPONED;
{
HEADER *h;
int code = SENDPOSTPONED;
-
LIST
*tmp;
-
LIST
*last = NULL;
-
LIST
*next;
+
string_list_t
*tmp;
+
string_list_t
*last = NULL;
+
string_list_t
*next;
char *p;
int opt_delete;
char *p;
int opt_delete;
@@
-310,7
+305,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
if (*cur)
code |= SENDREPLY;
tmp = next;
if (*cur)
code |= SENDREPLY;
@@
-327,7
+322,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
tmp = next;
}
else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
@@
-344,7
+339,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
tmp = next;
}
else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
@@
-358,7
+353,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
tmp = next;
}
@@
-366,7
+361,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
-
mutt_free_list
(&hdr->chain);
+
string_list_wipe
(&hdr->chain);
t = strtok (tmp->data + 11, " \t\n");
while (t) {
t = strtok (tmp->data + 11, " \t\n");
while (t) {
@@
-380,7
+375,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
#endif
tmp = next;
}
#endif