From 32abf6aa80d92576db59b5380b30dabe4152bdf0 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Fri, 23 Feb 2018 11:47:11 -0800 Subject: util: drop stdio ask_$type() helpers With drmsetup.c gone these are no longer used and I don't see their use returning. Get rid of them. --- src/util.c | 37 ------------------------------------- src/util.h | 2 -- 2 files changed, 39 deletions(-) diff --git a/src/util.c b/src/util.c index 0e5825a..c324a0b 100644 --- a/src/util.c +++ b/src/util.c @@ -21,40 +21,3 @@ unsigned get_ncpus(void) return n == 0 ? 1 : n; } - - -static void query(const char *prompt, const char *def, char *buf, int len) -{ - buf[0] = '\0'; - - printf("%s [%s]: ", prompt, def); - fflush(stdout); - - fgets(buf, len, stdin); - if (buf[0] == '\0' || buf[0] == '\n') { - snprintf(buf, len, "%s", def); - } else if(strchr(buf, '\n')) { - *strchr(buf, '\n') = '\0'; - } -} - - -void ask_string(char *buf, int len, const char *prompt, const char *def) -{ - query(prompt, def, buf, len); -} - - -void ask_num(int *res, int max, const char *prompt, int def) -{ - char buf[21], buf2[256]; - int num; - - snprintf(buf, sizeof(buf), "%i", def); - do { - query(prompt, buf, buf2, sizeof(buf2)); - num = atoi(buf2); /* TODO: errors (strtol)*/ - } while (num > max); - - *res = num; -} diff --git a/src/util.h b/src/util.h index 7d182d8..df455a3 100644 --- a/src/util.h +++ b/src/util.h @@ -28,7 +28,5 @@ ((_a) > (_b) ? (_a) : (_b)) unsigned get_ncpus(void); -void ask_string(char *buf, int len, const char *prompt, const char *def); -void ask_num(int *res, int max, const char *prompt, int def); #endif /* _UTIL_H */ -- cgit v1.2.3