From: Pierre Habouzit Date: Sun, 11 Nov 2007 20:33:14 +0000 (+0100) Subject: mutt_enter_string wasn't used anymore. X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=8d453d89f4f37f4c379d95880c06a23443cc27fa mutt_enter_string wasn't used anymore. Signed-off-by: Pierre Habouzit --- diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c index 9236788..891e20f 100644 --- a/lib-ui/curs_lib.c +++ b/lib-ui/curs_lib.c @@ -74,7 +74,7 @@ int _mutt_get_field ( const char *field, char *buf, ssize_t buflen, waddstr (stdscr, field); mutt_refresh (); getyx (stdscr, y, x); - ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files, + ret = mutt_enter_string(buf, buflen, y, x, complete, multiple, files, numfiles, es); } while (ret == 1); CLEARLINE(stdscr, LINES - 1); diff --git a/lib-ui/enter.c b/lib-ui/enter.c index 7fb61cc..cb5478b 100644 --- a/lib-ui/enter.c +++ b/lib-ui/enter.c @@ -164,26 +164,9 @@ static void replace_part (ENTER_STATE *state, size_t from, const char *buf) p_delete(&savebuf); } -/* - * Returns: - * 1 need to redraw the screen and call me again - * 0 if input was given - * -1 if abort. - */ - -int mutt_enter_string (char *buf, size_t buflen, int y, int x, int flags) -{ - int rv; - ENTER_STATE *es = mutt_new_enter_state (); - - rv = _mutt_enter_string(buf, buflen, y, x, flags, 0, NULL, NULL, es); - mutt_free_enter_state (&es); - return rv; -} - -int _mutt_enter_string (char *buf, size_t buflen, int y, int x, - int flags, int multiple, char ***files, int *numfiles, - ENTER_STATE * state) +int mutt_enter_string (char *buf, size_t buflen, int y, int x, + int flags, int multiple, char ***files, int *numfiles, + ENTER_STATE * state) { int width = COLS - x - 1; int redraw; diff --git a/lib-ui/enter.h b/lib-ui/enter.h index 76fd555..69df037 100644 --- a/lib-ui/enter.h +++ b/lib-ui/enter.h @@ -32,8 +32,7 @@ typedef struct { #define mutt_new_enter_state() p_new(ENTER_STATE, 1) void mutt_free_enter_state (ENTER_STATE **); -int mutt_enter_string (char *buf, size_t buflen, int y, int x, int flags); -int _mutt_enter_string (char *, size_t, int, int, int, int, char ***, int *, +int mutt_enter_string (char *, size_t, int, int, int, int, char ***, int *, ENTER_STATE *); #endif /* !_MUTT_ENTER_H */