src/common.[ch]: Implement “strtoderive”.

Simplifies error handling.

diff --git a/src/common.c b/src/common.c
index 3695a9b794406c9ea4e8d76a135cad5d2eb93767..8c2aeaea653aefe0f5380783175b4cb75e10fde2 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -1142,3 +1142,21 @@ int service_name_to_port_number (const char *service_name)
                return (service_number);
        return (-1);
 } /* int service_name_to_port_number */
+
+int strtoderive (const char *string, derive_t *ret_value) /* {{{ */
+{
+       derive_t tmp;
+       char *endptr;
+
+       if ((string == NULL) || (ret_value == NULL))
+               return (EINVAL);
+
+       errno = 0;
+       endptr = NULL;
+       tmp = (derive_t) strtoll (string, &endptr, /* base = */ 0);
+       if ((endptr == string) || (errno != 0))
+               return (-1);
+
+       *ret_value = tmp;
+       return (0);
+} /* }}} int strtoderive */

diff --git a/src/common.h b/src/common.h
index 2d5c7945f44b0e5448c33c7880487f1e57b0f4e6..fc809f2173d91a1e0c000052a00861e00e267af0 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -289,4 +289,6 @@ counter_t counter_diff (counter_t old_value, counter_t new_value);
  * (in the range [1-65535]). Returns less than zero on error. */
 int service_name_to_port_number (const char *service_name);
 
+int strtoderive (const char *string, derive_t *ret_value);
+
 #endif /* COMMON_H */