#include "lib/str.h"
#include "lib/debug.h"
+#include <wchar.h>
#include <termios.h>
#include <sys/types.h>
#include <fcntl.h>
{N_("Reply"), OP_REPLY},
{N_("Group"), OP_GROUP_REPLY},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
#ifdef USE_NNTP
{N_("Followup"), OP_FOLLOWUP},
{N_("Catchup"), OP_CATCHUP},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
#endif
case 'e':
case 'v':
if (be_barf_file (path, buf, buflen) == 0) {
- char *tag, *err;
+ const char *tag, *err;
be_free_memory (buf, buflen);
buf = NULL;
* Replace part of the wchar_t buffer, from FROM to CURPOS, by BUF.
*/
-static void replace_part (ENTER_STATE * state, size_t from, char *buf)
+static void replace_part (ENTER_STATE *state, size_t from, const char *buf)
{
/* Save the suffix */
size_t savelen = state->lastchar - state->curpos;
switch (ch) {
case OP_EDITOR_HISTORY_UP:
state->curpos = state->lastchar;
- replace_part (state, 0, mutt_history_prev (hclass));
+ replace_part(state, 0, mutt_history_prev(hclass));
redraw = M_REDRAW_INIT;
break;
case OP_EDITOR_HISTORY_DOWN:
state->curpos = state->lastchar;
- replace_part (state, 0, mutt_history_next (hclass));
+ replace_part(state, 0, mutt_history_next(hclass));
redraw = M_REDRAW_INIT;
break;
#include "pager.h"
#include "mapping.h"
+#include <wchar.h>
#include <ctype.h>
#include <string.h>
/* Find the last item in the list that data points to. */
lastp = NULL;
- debug_print (5, ("parse_attach_list: ldata = %08x, *ldata = %08x\n",
- (unsigned int)ldata, (unsigned int)*ldata));
+ debug_print (5, ("parse_attach_list: ldata = %p, *ldata = %p\n",
+ ldata, *ldata));
for (listp = *ldata; listp; listp = listp->next) {
a = (ATTACH_MATCH *)listp->data;
debug_print (5, ("parse_attach_list: skipping %s/%s\n", a->major, a->minor));
/* do we have an op already? */
if (tmp.op) {
- char *func = NULL;
+ const char *func = NULL;
struct binding_t *bindings;
/* is this a valid op for this menu? */
km_bindkey (map[i].seq, menu, map[i].op);
}
-char *km_keyname (int c)
+const char *km_keyname(int c)
{
static char buf[10];
const char *p;
keycode_t *keys; /* key sequence */
};
-char *km_keyname (int);
+const char *km_keyname (int);
int km_expand_key (char *, size_t, struct keymap_t *);
struct keymap_t *km_find_func (int, int);
void km_init (void);
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#ifdef HAVE_LIBIDN
#include <libesmtp.h>
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
#include <depot.h>
#elif HAVE_GDBM
printf (" libESMTP %s\n", buf);
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
#if HAVE_QDBM
printf (" qdbm %s\n", dpversion);
#elif HAVE_GDBM
#else
"-USE_INODESORT "
#endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
"+USE_HCACHE "
#else
"-USE_HCACHE "
int i;
int explicit_folder = 0;
int dump_variables = -1;
- extern char *optarg;
- extern int optind;
/* initialize random number for tmp file creation */
srand ((unsigned int) time (NULL));
if (tag) *tag = #a; e = 1; err = NULL; \
}
-int mutt_env_to_idna (ENVELOPE * env, const char **tag, char **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, const char **err)
{
int e = 0;
int mutt_addrlist_to_local (ADDRESS *);
void mutt_env_to_local (ENVELOPE *);
-int mutt_env_to_idna (ENVELOPE *, const char **, char **);
+int mutt_env_to_idna (ENVELOPE *, const char **, const char **);
const char *mutt_addr_for_display (ADDRESS * a);
int mx_unlock_file (const char *path, int fd, int dot)
{
#ifdef USE_FCNTL
- struct flock unlockit = { F_UNLCK, 0, 0, 0 };
+ struct flock unlockit;
memset (&unlockit, 0, sizeof (struct flock));
unlockit.l_type = F_UNLCK;
#include "lib/rx.h"
#include "lib/debug.h"
+#include <wchar.h>
#include <sys/stat.h>
#include <ctype.h>
#include <unistd.h>
#endif
{pop_auth_apop, "apop"},
{pop_auth_user, "user"},
- {NULL}
+ {NULL, NULL}
};
/*
#include <sys/stat.h>
static struct mapping_t PostponeHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Del"), OP_DELETE},
+ {N_("Exit"), OP_EXIT},
+ {N_("Del"), OP_DELETE},
{N_("Undel"), OP_UNDELETE},
- {N_("Help"), OP_HELP},
- {NULL}
+ {N_("Help"), OP_HELP},
+ {NULL, OP_NULL}
};
to the temporary file containing the stdout of the
child process */
static int
-send_msg (const char *path, char **args, const char *msg, char **tempfile)
+send_msg(const char *path, const char **args, const char *msg, char **tempfile)
{
sigset_t set;
int fd, st;
return (st);
}
-static char **add_args (char **args, size_t * argslen, size_t * argsmax,
- ADDRESS * addr)
+static const char **
+add_args(const char **args, size_t *argslen, size_t *argsmax, ADDRESS * addr)
{
for (; addr; addr = addr->next) {
/* weed out group mailboxes, since those are for display only */