#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
-#include "ascii.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mapping.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <stdlib.h>
#include <string.h>
{
struct keymap_t *p;
- p = mem_calloc (1, sizeof (struct keymap_t));
+ p = p_new(struct keymap_t, 1);
p->len = len;
p->keys = p_dup(keys, len);
return p;
map = allocKeys (len, buf);
map->op = op;
- map->macro = str_dup (macro);
- map->descr = str_dup (descr);
+ map->macro = m_strdup(macro);
+ map->descr = m_strdup(descr);
tmp = Keymaps[menu];
for (i = 0; bindings[i].name; i++) {
if (!ascii_strncasecmp (start, bindings[i].name, len) &&
- str_len (bindings[i].name) == len)
+ m_strlen(bindings[i].name) == len)
return bindings[i].op;
}
static void push_string (char *s)
{
- char *pp, *p = s + str_len (s) - 1;
+ char *pp, *p = s + m_strlen(s) - 1;
size_t l;
int i, op = OP_NULL;
FOREVER {
strfcpy (s, km_keyname (map->keys[p]), len);
- len -= (l = str_len (s));
+ len -= (l = m_strlen(s));
if (++p >= map->len || !len)
return (1);
void km_init (void)
{
- memset (Keymaps, 0, sizeof (struct keymap_t *) * MENU_MAX);
+ p_clear(Keymaps, MENU_MAX);
create_bindings (OpAttach, MENU_ATTACH);
create_bindings (OpBrowser, MENU_FOLDER);
int i = 0;
char *p, *q;
- memset (&buf, 0, sizeof (buf));
+ p_clear(&buf, 1);
/* menu name */
mutt_extract_token (&buf, s, 0);
}
else {
if (MoreArgs (s)) {
- seq = str_dup (buf->data);
+ seq = m_strdup(buf->data);
mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
if (MoreArgs (s)) {
&& CurrentMenu != MENU_PAGER)
bindings = OpGeneric;
- ops[nops] = get_op (bindings, function, str_len (function));
+ ops[nops] = get_op (bindings, function, m_strlen(function));
if (ops[nops] == OP_NULL && CurrentMenu != MENU_PAGER)
- ops[nops] = get_op (OpGeneric, function, str_len (function));
+ ops[nops] = get_op (OpGeneric, function, m_strlen(function));
if (ops[nops] == OP_NULL) {
mutt_flushinp ();