*/
#include <lib-lib/lib-lib.h>
-#include <lib-crypt/crypt.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-mx/mx.h>
#include "mutt.h"
+#include "crypt.h"
#include "alias.h"
#include "keymap.h"
#include "sort.h"
(*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,
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;
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;
}
}
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].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) {
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);
}
}
- cleanup_quote (&QuoteList);
+ cleanup_quote(&QuoteList);
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);