projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repository cleanse.
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
083c9b0
..
966955c
100644
(file)
--- a/
pager.c
+++ b/
pager.c
@@
-12,7
+12,6
@@
*/
#include <lib-lib/lib-lib.h>
*/
#include <lib-lib/lib-lib.h>
-#include <lib-crypt/crypt.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
@@
-21,6
+20,7
@@
#include <lib-mx/mx.h>
#include "mutt.h"
#include <lib-mx/mx.h>
#include "mutt.h"
+#include "crypt.h"
#include "alias.h"
#include "keymap.h"
#include "sort.h"
#include "alias.h"
#include "keymap.h"
#include "sort.h"
@@
-311,21
+311,15
@@
shift_class_colors (struct q_class_t *QuoteList, struct q_class_t *new_class,
(*q_level)++;
}
(*q_level)++;
}
-static void cleanup_quote
(struct q_class_t **QuoteList)
+static void cleanup_quote(struct q_class_t **QuoteList)
{
{
- struct q_class_t *ptr;
-
- while (*QuoteList) {
- if ((*QuoteList)->down)
- cleanup_quote (&((*QuoteList)->down));
- ptr = (*QuoteList)->next;
- if ((*QuoteList)->prefix)
- p_delete(&(*QuoteList)->prefix);
- p_delete(QuoteList);
- *QuoteList = ptr;
- }
-
- return;
+ while (*QuoteList) {
+ struct q_class_t *ptr = (*QuoteList)->next;
+ cleanup_quote(&(*QuoteList)->down);
+ p_delete(&(*QuoteList)->prefix);
+ p_delete(QuoteList);
+ *QuoteList = ptr;
+ }
}
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
}
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
@@
-1674,8
+1668,8
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lineInfo[i].quote = NULL;
p_realloc(&lineInfo[i].syntax, 1);
lineInfo[i].quote = NULL;
p_realloc(&lineInfo[i].syntax, 1);
- if (SearchCompiled
&& lineInfo[i].search
)
- p_delete(&
(lineInfo[i].search)
);
+ if (SearchCompiled)
+ p_delete(&
lineInfo[i].search
);
}
lastLine = 0;
}
lastLine = 0;
@@
-1848,8
+1842,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
if (SearchCompiled) {
regfree (&SearchRE);
for (i = 0; i < lastLine; i++) {
if (SearchCompiled) {
regfree (&SearchRE);
for (i = 0; i < lastLine; i++) {
- if (lineInfo[i].search)
- p_delete(&(lineInfo[i].search));
+ p_delete(&lineInfo[i].search);
lineInfo[i].search_cnt = -1;
}
}
lineInfo[i].search_cnt = -1;
}
}
@@
-1862,8
+1855,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
regfree (&SearchRE);
for (i = 0; i < maxLine; i++) {
/* cleanup */
regfree (&SearchRE);
for (i = 0; i < maxLine; i++) {
/* cleanup */
- if (lineInfo[i].search)
- p_delete(&(lineInfo[i].search));
+ p_delete(&lineInfo[i].search);
lineInfo[i].search_cnt = -1;
}
SearchFlag = 0;
lineInfo[i].search_cnt = -1;
}
SearchFlag = 0;
@@
-2152,8
+2144,8
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lineInfo[i].quote = NULL;
p_realloc(&(lineInfo[i].syntax), 1);
lineInfo[i].quote = NULL;
p_realloc(&(lineInfo[i].syntax), 1);
- if (SearchCompiled
&& lineInfo[i].search
)
- p_delete(&
(lineInfo[i].search)
);
+ if (SearchCompiled)
+ p_delete(&
lineInfo[i].search
);
}
if (SearchCompiled) {
}
if (SearchCompiled) {
@@
-2478,19
+2470,6
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
redraw = REDRAW_FULL;
break;
redraw = REDRAW_FULL;
break;
-
- case OP_MAIL_KEY:
- CHECK_MODE (IsHeader (extra));
- CHECK_ATTACH;
- ci_send_message (SENDKEY, NULL, NULL, extra->ctx, extra->hdr);
- redraw = REDRAW_FULL;
- break;
-
-
- case OP_FORGET_PASSPHRASE:
- crypt_forget_passphrase ();
- break;
-
case OP_EXTRACT_KEYS:
CHECK_MODE (IsHeader (extra));
crypt_extract_keys_from_messages (extra->hdr);
case OP_EXTRACT_KEYS:
CHECK_MODE (IsHeader (extra));
crypt_extract_keys_from_messages (extra->hdr);
@@
-2522,12
+2501,12
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
}
}
}
}
- cleanup_quote
(&QuoteList);
+ cleanup_quote(&QuoteList);
for (i = 0; i < maxLine; i++) {
for (i = 0; i < maxLine; i++) {
- p_delete(&
(lineInfo[i].syntax)
);
- if (SearchCompiled
&& lineInfo[i].search
)
- p_delete(&
(lineInfo[i].search)
);
+ p_delete(&
lineInfo[i].syntax
);
+ if (SearchCompiled)
+ p_delete(&
lineInfo[i].search
);
}
if (SearchCompiled) {
regfree (&SearchRE);
}
if (SearchCompiled) {
regfree (&SearchRE);