From: Pavel Charvat <pchar@ucw.cz>
Date: Fri, 18 Jun 2010 06:17:10 +0000 (+0200)
Subject: libucw: Fixed infinite recursion in str_to_int().
X-Git-Tag: holmes-import~1
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=6a9cc31f485d7e3e09f082afdd283221a0248a70;p=libucw.git

libucw: Fixed infinite recursion in str_to_int().
---

diff --git a/ucw/strtonum.h b/ucw/strtonum.h
index 03ec6895..28580415 100644
--- a/ucw/strtonum.h
+++ b/ucw/strtonum.h
@@ -34,16 +34,16 @@ enum str_to_num_flags {
 #define STN_DECLARE_CONVERTOR(type, suffix)                                                         \
 const char *str_to_##suffix(type *num, const char *str, const char **next, const uns flags)
 
-#define STN_SIGNED_CONVERTOR(utype, itype, suffix)                                                  \
-static inline const char *str_to_##suffix(itype *num, const char *str, const char **next, const uns flags) \
+#define STN_SIGNED_CONVERTOR(type, suffix, usuffix)                                                  \
+static inline const char *str_to_##suffix(type *num, const char *str, const char **next, const uns flags) \
 {                                                                                                   \
-  return str_to_##suffix((utype*) num, str, next, flags | STN_SIGNED);                               \
+  return str_to_##usuffix((void *) num, str, next, flags | STN_SIGNED);                               \
 }
 
 STN_DECLARE_CONVERTOR(uns, uns);
-STN_SIGNED_CONVERTOR(uns, int, int)
+STN_SIGNED_CONVERTOR(int, int, uns)
 
 STN_DECLARE_CONVERTOR(uintmax_t, uintmax);
-STN_SIGNED_CONVERTOR(uintmax_t, intmax_t, intmax)
+STN_SIGNED_CONVERTOR(intmax_t, intmax, uintmax)
 
 #endif