faux: conv.c updated

faux/conv.h

@@ -1,18 +1,29 @@
-#ifndef _lub_conv_h
-#define _lub_conv_h
+/** @file conv.h
+ * @brief Public interface for faux convert functions.
+ */
 
-#include "lub/c_decl.h"
+#ifndef _faux_conv_h
+#define _faux_conv_h
 
-_BEGIN_C_DECL
+#include "faux/types.h"
+
+C_DECL_BEGIN
 
 int lub_conv_atol(const char *str, long int *val, int base);
 int lub_conv_atoul(const char *str, unsigned long int *val, int base);
-int lub_conv_atos(const char *str, short *val, int base);
-int lub_conv_atous(const char *str, unsigned short *val, int base);
+
+int lub_conv_atoll(const char *str, long long int *val, int base);
+int lub_conv_atoull(const char *str, unsigned long long int *val, int base);
+
 int lub_conv_atoi(const char *str, int *val, int base);
 int lub_conv_atoui(const char *str, unsigned int *val, int base);
 
-_END_C_DECL
+int lub_conv_atos(const char *str, short *val, int base);
+int lub_conv_atous(const char *str, unsigned short *val, int base);
 
-#endif
+int lub_conv_atoc(const char *str, short *val, int base);
+int lub_conv_atouc(const char *str, unsigned short *val, int base);
 
+C_DECL_END
+
+#endif

faux/conv/conv.c

@@ -6,6 +6,8 @@
 #include <errno.h>
 #include <limits.h>
 
+#include "faux/conv.h"
+
 
 /** @brief Converts string to long int
  *
@@ -23,8 +25,9 @@ int faux_conv_atol(const char *str, long int *val, int base) {
 	char *endptr;
 	long int res;
 
+	errno = 0; // man recommends to do so
 	res = strtol(str, &endptr, base);
-	// Check fof overflow
+	// Check for overflow
 	if (((LONG_MIN == res) || (LONG_MAX == res)) && (ERANGE == errno))
 		return -1;
 	// No valid digits at all
@@ -52,8 +55,9 @@ int faux_conv_atoul(const char *str, unsigned long int *val, int base) {
 	char *endptr;
 	unsigned long int res;
 
+	errno = 0; // man recommends to do so
 	res = strtoul(str, &endptr, base);
-	// Check fof overflow
+	// Check for overflow
 	if ((ULONG_MAX == res) && (ERANGE == errno))
 		return -1;
 	// No valid digits at all
@@ -65,50 +69,213 @@ int faux_conv_atoul(const char *str, unsigned long int *val, int base) {
 }
 
 
-/*--------------------------------------------------------- */
+/** @brief Converts string to long long int
+ *
+ * Converts string to long long int and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
+int faux_conv_atoll(const char *str, long long int *val, int base) {
+
+	char *endptr;
+	long long int res;
+
+	errno = 0; // man recommends to do so
+	res = strtoll(str, &endptr, base);
+	// Check for overflow
+	if (((LLONG_MIN == res) || (LLONG_MAX == res)) && (ERANGE == errno))
+		return -1;
+	// No valid digits at all
+	if ((0 == res) && ((endptr == str) || (errno != 0)))
+		return -1;
+	*val = res;
+
+	return 0;
+}
+
+
+/** @brief Converts string to unsigned long long int
+ *
+ * Converts string to unsigned long long int and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
+int faux_conv_atoull(const char *str, unsigned long long int *val, int base) {
+
+	char *endptr;
+	unsigned long long int res;
+
+	errno = 0; // man recommends to do so
+	res = strtoull(str, &endptr, base);
+	// Check for overflow
+	if ((ULLONG_MAX == res) && (ERANGE == errno))
+		return -1;
+	// No valid digits at all
+	if ((0 == res) && ((endptr == str) || (errno != 0)))
+		return -1;
+	*val = res;
+
+	return 0;
+}
+
+
+/** @brief Converts string to int
+ *
+ * Converts string to int and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
+int faux_conv_atoi(const char *str, int *val, int base) {
+
+	long int tmp;
+
+	// Use existent func. The long int is longer or equal to int.
+	if (faux_conv_atol(str, &tmp, base) < 0)
+		return -1;
+	if ((tmp < INT_MIN) || (tmp > INT_MAX)) // Overflow
+		return -1;
+	*val = tmp;
+
+	return 0;
+}
+
+
+/** @brief Converts string to unsigned int
+ *
+ * Converts string to unsigned int and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
+int faux_conv_atoui(const char *str, unsigned int *val, int base) {
+
+	unsigned long int tmp;
+
+	// Use existent func. The long int is longer or equal to int.
+	if (faux_conv_atoul(str, &tmp, base) < 0)
+		return -1;
+	if (tmp > UINT_MAX) // Overflow
+		return -1;
+	*val = tmp;
+
+	return 0;
+}
+
+
+/** @brief Converts string to short
+ *
+ * Converts string to short and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
 int faux_conv_atos(const char *str, short *val, int base)
 {
 	long int tmp;
+
 	if (faux_conv_atol(str, &tmp, base) < 0)
 		return -1;
-	if ((tmp < SHRT_MIN) || (tmp > SHRT_MAX)) /* Overflow */
+	if ((tmp < SHRT_MIN) || (tmp > SHRT_MAX)) // Overflow
 		return -1;
 	*val = tmp;
+
 	return 0;
 }
 
-/*--------------------------------------------------------- */
+
+/** @brief Converts string to unsigned short
+ *
+ * Converts string to unsigned short and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
 int faux_conv_atous(const char *str, unsigned short *val, int base)
 {
 	unsigned long int tmp;
+
 	if (faux_conv_atoul(str, &tmp, base) < 0)
 		return -1;
-	if (tmp > USHRT_MAX) /* Overflow */
+	if (tmp > USHRT_MAX) // Overflow
 		return -1;
 	*val = tmp;
+
 	return 0;
 }
 
-/*--------------------------------------------------------- */
-int faux_conv_atoi(const char *str, int *val, int base)
+
+/** @brief Converts string to char
+ *
+ * Converts string to char and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
+int faux_conv_atoc(const char *str, char *val, int base)
 {
 	long int tmp;
+
 	if (faux_conv_atol(str, &tmp, base) < 0)
 		return -1;
-	if ((tmp < INT_MIN) || (tmp > INT_MAX)) /* Overflow */
+	if ((tmp < CHAR_MIN) || (tmp > CHAR_MAX)) // Overflow
 		return -1;
 	*val = tmp;
+
 	return 0;
 }
 
-/*--------------------------------------------------------- */
-int faux_conv_atoui(const char *str, unsigned int *val, int base)
+
+/** @brief Converts string to unsigned char
+ *
+ * Converts string to unsigned char and check for overflow and valid
+ * input values. Function indicates error by return value. It
+ * returns the convertion result by second argument.
+ *
+ * @param [in] str Input string to convert.
+ * @param [out] val Pointer to result value.
+ * @param [in] base Base to convert.
+ * @return 0 - success, < 0 - error
+ */
+int faux_conv_atouc(const char *str, unsigned char *val, int base)
 {
 	unsigned long int tmp;
+
 	if (faux_conv_atoul(str, &tmp, base) < 0)
 		return -1;
-	if (tmp > UINT_MAX) /* Overflow */
+	if (tmp > UCHAR_MAX) // Overflow
 		return -1;
 	*val = tmp;
+
 	return 0;
 }