summaryrefslogtreecommitdiffstats
path: root/include/strutils.h
diff options
context:
space:
mode:
authorKarel Zak2012-05-15 17:40:03 +0200
committerKarel Zak2012-05-15 17:40:03 +0200
commit551dae405a3af7f81ac360ec5bb316fb9b7aeec8 (patch)
treefb6cd7687b3aa0a8bbee886f359e4edeeea65e17 /include/strutils.h
parentinclude/ttyutils: more robust get_terminal_width() (diff)
downloadkernel-qcow2-util-linux-551dae405a3af7f81ac360ec5bb316fb9b7aeec8.tar.gz
kernel-qcow2-util-linux-551dae405a3af7f81ac360ec5bb316fb9b7aeec8.tar.xz
kernel-qcow2-util-linux-551dae405a3af7f81ac360ec5bb316fb9b7aeec8.zip
lib/strutils: create type specific strtoxx_or_err()
We need [un]signed int ([u]int32_t) on many places. It's also more readable and robust to use uintXX_t types than for example "long long". Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'include/strutils.h')
-rw-r--r--include/strutils.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/include/strutils.h b/include/strutils.h
index 81556e0a0..57b13fddc 100644
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -12,11 +12,21 @@
extern int strtosize(const char *str, uintmax_t *res);
+extern uintmax_t strtosize_or_err(const char *str, const char *errmesg);
+
+extern int16_t strtos16_or_err(const char *str, const char *errmesg);
+extern uint16_t strtou16_or_err(const char *str, const char *errmesg);
+
+extern int32_t strtos32_or_err(const char *str, const char *errmesg);
+extern uint32_t strtou32_or_err(const char *str, const char *errmesg);
+
+extern int64_t strtos64_or_err(const char *str, const char *errmesg);
+extern uint64_t strtou64_or_err(const char *str, const char *errmesg);
+
extern double strtod_or_err(const char *str, const char *errmesg);
+
extern long strtol_or_err(const char *str, const char *errmesg);
-extern long long strtoll_or_err(const char *str, const char *errmesg);
extern unsigned long strtoul_or_err(const char *str, const char *errmesg);
-extern uintmax_t strtosize_or_err(const char *str, const char *errmesg);
#ifndef HAVE_STRNLEN
extern size_t strnlen(const char *s, size_t maxlen);