From 48175e9beb55d4ea9306f1884a03fe6a58525234 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 8 Apr 2004 17:56:12 +0000 Subject: [PATCH] (getstring, getstarg): Use plain char * instead of s_char *. --- include/misc.h | 4 ++-- src/lib/gen/getstarg.c | 10 ++++++++-- src/lib/gen/getstring.c | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/misc.h b/include/misc.h index 8ac43c46..53da3fbc 100644 --- a/include/misc.h +++ b/include/misc.h @@ -142,8 +142,8 @@ extern s_char *esplur(int n); extern s_char *splur(int n); extern s_char *iesplur(int n); extern s_char *plur(int n, s_char *no, s_char *yes); -extern s_char *getstarg(s_char *input, s_char *prompt, s_char buf[]); -extern s_char *getstring(s_char *prompt, s_char buf[]); +extern char *getstarg(char *input, char *prompt, char buf[]); +extern char *getstring(char *prompt, char buf[]); extern s_char *prbuf(s_char *format, ...) ATTRIBUTE((format (printf, 1, 2))); diff --git a/src/lib/gen/getstarg.c b/src/lib/gen/getstarg.c index 64dfe84e..7f9f6283 100644 --- a/src/lib/gen/getstarg.c +++ b/src/lib/gen/getstarg.c @@ -34,8 +34,14 @@ #include "misc.h" #include "gen.h" -s_char * -getstarg(s_char *input, s_char *prompt, s_char *buf) +/* + * Get string argument. + * If INPUT is not empty, use it, else prompt for more input using PROMPT. + * Copy input to BUF[1024]. + * Return BUF on success, else NULL. + */ +char * +getstarg(char *input, char *prompt, char *buf) { *buf = '\0'; if (input == 0 || *input == 0) { diff --git a/src/lib/gen/getstring.c b/src/lib/gen/getstring.c index f1b7e65d..ddd72ba4 100644 --- a/src/lib/gen/getstring.c +++ b/src/lib/gen/getstring.c @@ -35,8 +35,12 @@ #include "gen.h" #include "subs.h" -s_char * -getstring(s_char *prompt, s_char *buf) +/* + * Print sub-prompt PROMPT, receive a line of input into BUF[1024]. + * Return BUF on success, else NULL. + */ +char * +getstring(char *prompt, char *buf) { *buf = '\0'; if (prmptrd(prompt, buf, 1024) < 0)