#include "mutt.h"
#include "mx.h"
-#include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
+#include <lib-crypt/crypt.h>
#include "compress.h"
-#endif
#include "lib/rx.h"
static HOOK *Hooks = NULL;
-static int current_hook_type = 0;
+static unsigned long current_hook_type = 0;
-int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned long data,
BUFFER * err)
{
HOOK *ptr;
p_clear(&pattern, 1);
pattern.data = m_strdup(path);
}
-#ifdef USE_COMPRESSED
else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
if (mutt_test_compress_command (command.data)) {
m_strcpy(err->data, err->dsize, _("bad formatted command string"));
return (-1);
}
}
-#endif
else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
- && (!WithCrypto || !(data & M_CRYPTHOOK))
- ) {
+ && !(data & M_CRYPTHOOK))
+ {
char tmp[HUGE_STRING];
m_strcpy(tmp, sizeof(tmp), pattern.data);
}
/* Deletes all hooks of type ``type'', or all defined hooks if ``type'' is 0 */
-static void delete_hooks (int type)
+static void delete_hooks (unsigned long type)
{
HOOK *h;
HOOK *prev;
}
}
-int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
while (MoreArgs (s)) {
delete_hooks (0);
}
else {
- int type = mutt_get_hook_type (buf->data);
+ unsigned long type = mutt_get_hook_type (buf->data);
if (!type) {
snprintf (err->data, err->dsize,
}
static int
-mutt_addr_hook (char *path, size_t pathlen, int type, CONTEXT * ctx,
+mutt_addr_hook (char *path, size_t pathlen, unsigned long type, CONTEXT * ctx,
HEADER * hdr)
{
HOOK *hook;
return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
}
-#ifdef USE_SOCKET
void mutt_account_hook (const char *url)
{
HOOK *hook;
p_delete(&token.data);
}
-#endif