[PATCH 13/14] uncomment and move strtoul_ui() and strtol_i() to wrapper.c

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/iptraf-ng-compat.h |   30 ++----------------------------
 src/wrapper.c          |   26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
index d5fc3e7..ce5d8f6 100644
--- a/src/iptraf-ng-compat.h
+++ b/src/iptraf-ng-compat.h
@@ -94,6 +94,8 @@ extern void *xrealloc(void *ptr, size_t size);
 extern char *xvasprintf(const char *format, va_list p);
 extern void *xmallocz(size_t size);
 extern char *xstrdup(const char *s);
+extern int strtoul_ui(char const *s, int base, unsigned int *result);
+extern int strtol_i(char const *s, int base, int *result);
 
 extern void die(const char *err, ...);
 extern void die_errno(const char *err) __noreturn;
@@ -107,32 +109,4 @@ static inline char *skip_whitespace(const char *str)
 	return (char *) str;
 }
 
-#if 0
-static inline int strtoul_ui(char const *s, int base, unsigned int *result)
-{
-	unsigned long ul;
-	char *p;
-
-	errno = 0;
-	ul = strtoul(s, &p, base);
-	if (errno || *p || p == s || (unsigned int) ul != ul)
-		return -1;
-	*result = ul;
-	return 0;
-}
-
-static inline int strtol_i(char const *s, int base, int *result)
-{
-	long ul;
-	char *p;
-
-	errno = 0;
-	ul = strtol(s, &p, base);
-	if (errno || *p || p == s || (int) ul != ul)
-		return -1;
-	*result = ul;
-	return 0;
-}
-#endif
-
 #endif	/* IPTRAF_NG_COMPAT_H */
diff --git a/src/wrapper.c b/src/wrapper.c
index 0fee777..a592dc3 100644
--- a/src/wrapper.c
+++ b/src/wrapper.c
@@ -80,3 +80,29 @@ char *xstrdup(const char *s)
 
 	return t;
 }
+
+int strtoul_ui(char const *s, int base, unsigned int *result)
+{
+	unsigned long ul;
+	char *p;
+
+	errno = 0;
+	ul = strtoul(s, &p, base);
+	if (errno || *p || p == s || (unsigned int) ul != ul)
+		return -1;
+	*result = ul;
+	return 0;
+}
+
+int strtol_i(char const *s, int base, int *result)
+{
+	long ul;
+	char *p;
+
+	errno = 0;
+	ul = strtol(s, &p, base);
+	if (errno || *p || p == s || (int) ul != ul)
+		return -1;
+	*result = ul;
+	return 0;
+}
-- 
1.7.8.4