You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
2.0 KiB
69 lines
2.0 KiB
From 2886582f6e48258d7b8c941725a4456ed62578e9 Mon Sep 17 00:00:00 2001 |
|
From: Jakub Filak <jfilak@redhat.com> |
|
Date: Tue, 28 Jan 2014 16:58:04 +0100 |
|
Subject: [LIBREPORT PATCH 16/17] report-cli: use the Client API for |
|
communication to user |
|
|
|
Closes rhbz#1058845 |
|
|
|
Signed-off-by: Jakub Filak <jfilak@redhat.com> |
|
--- |
|
src/cli/cli-report.c | 30 ++++-------------------------- |
|
1 file changed, 4 insertions(+), 26 deletions(-) |
|
|
|
diff --git a/src/cli/cli-report.c b/src/cli/cli-report.c |
|
index 5b32fbc..68baa8b 100644 |
|
--- a/src/cli/cli-report.c |
|
+++ b/src/cli/cli-report.c |
|
@@ -408,26 +408,6 @@ static int run_report_editor(problem_data_t *problem_data) |
|
} |
|
|
|
/** |
|
- * Asks user for a text response. |
|
- * @param question |
|
- * Question displayed to user. |
|
- * @param result |
|
- * Output array. |
|
- * @param result_size |
|
- * Maximum byte count to be written. |
|
- */ |
|
-static void read_from_stdin(const char *question, char *result, int result_size) |
|
-{ |
|
- assert(result_size > 1); |
|
- printf("%s", question); |
|
- fflush(NULL); |
|
- if (NULL == fgets(result, result_size, stdin)) |
|
- result[0] = '\0'; |
|
- // Remove the trailing newline |
|
- strchrnul(result, '\n')[0] = '\0'; |
|
-} |
|
- |
|
-/** |
|
* Asks user for missing information |
|
*/ |
|
static void ask_for_missing_settings(const char *event_name) |
|
@@ -731,17 +711,15 @@ static int choose_number_from_range(unsigned min, unsigned max, const char *mess |
|
unsigned ii; |
|
for (ii = 0; ii < 3; ++ii) |
|
{ |
|
- char answer[16]; |
|
- |
|
- read_from_stdin(message, answer, sizeof(answer)); |
|
- if (!*answer) |
|
- continue; |
|
+ char *answer = ask(message); |
|
|
|
picked = xatou(answer); |
|
if (min <= picked && picked <= max) |
|
return picked; |
|
|
|
- printf("%s (%u - %u)\n", _("You have chosen number out of range"), min, max); |
|
+ char *msg = xasprintf("%s (%u - %u)\n", _("You have chosen number out of range"), min, max); |
|
+ alert(msg); |
|
+ free(msg); |
|
} |
|
|
|
error_msg_and_die(_("Invalid input, exiting.")); |
|
-- |
|
1.8.3.1 |
|
|
|
|