From 45f138ac07277e32b250af298d3aba3f2d94b9cd Mon Sep 17 00:00:00 2001 From: Renaud Fivet Date: Mon, 5 Oct 2015 14:15:24 +0800 Subject: [PATCH] Remove mlreply after transition to replacement newmlarg. --- input.c | 24 ++++++------------------ input.h | 1 - 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/input.c b/input.c index 9b8b13f..35b2667 100644 --- a/input.c +++ b/input.c @@ -54,7 +54,7 @@ int abortc = CONTROL | 'G' ; /* current abort command char */ const int nlc = CONTROL | 'J' ; /* end of input char */ -static const int quotec = 0x11 ; /* quote char during mlreply() */ +static const int quotec = 0x11 ; /* quote char during getstring() */ static void outstring( char *s) ; @@ -86,22 +86,14 @@ int mlyesno( const char *prompt) } /* - * nextarg: + * newnextarg: * get the next argument * - * const char *prompt; prompt to use if we must be interactive - * char *buffer; buffer to put token into - * int size; size of the buffer - * int terminator; terminating char to be used on interactive fetch + * char **outbufref ; buffer to put token into + * const char *prompt ; prompt to use if we must be interactive + * int size ; size of the buffer + * int terminator ; terminating char to be used on interactive fetch */ -static int nextarg( const char *prompt, char *buf, int size, int terminator) { - /* if we are interactive, go get it! */ - if( clexec == FALSE) - return getstring( prompt, buf, size, terminator) ; - else - return gettokval( buf, size) ; -} - static int newnextarg( char **outbufref, const char *prompt, int size, int terminator) { int status ; @@ -142,10 +134,6 @@ static int newnextarg( char **outbufref, const char *prompt, int size, * return. Handle erase, kill, and abort keys. */ -int mlreply( const char *prompt, char *buf, int nbuf) { - return nextarg( prompt, buf, nbuf, nlc) ; -} - int newmlarg( char **outbufref, const char *prompt, int size) { return newnextarg( outbufref, prompt, size, nlc) ; } diff --git a/input.h b/input.h index b65f81c..3dd1f1a 100644 --- a/input.h +++ b/input.h @@ -23,7 +23,6 @@ extern const int nlc ; /* end of input char */ int mlyesno( const char *prompt) ; -int mlreply( const char *prompt, char *buf, int nbuf) ; int newmlarg( char **outbufref, const char *prompt, int size) ; int newmlargt( char **outbufref, const char *prompt, int size) ; int ectoc( int c) ;