diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-26 21:02:29 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-26 21:02:29 -0400 |
commit | 80730c45e032544155074022c0df5b6909b68faa (patch) | |
tree | 6b658e33d565c4912d0c18232f5c0855b4499a36 /src/common/util.h | |
parent | 7159edf9090e0a0e4c7d02e80b81bc00083884cc (diff) | |
download | tor-80730c45e032544155074022c0df5b6909b68faa.tar.gz tor-80730c45e032544155074022c0df5b6909b68faa.zip |
Move tor_parse_long and friends into parse_int.h in libtor-string
Diffstat (limited to 'src/common/util.h')
-rw-r--r-- | src/common/util.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/common/util.h b/src/common/util.h index d2c27064e1..26ee2d75a9 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -26,6 +26,7 @@ #include "lib/malloc/util_malloc.h" #include "lib/wallclock/approx_time.h" #include "lib/string/util_string.h" +#include "lib/string/parse_int.h" #include "lib/string/scanf.h" #include "lib/intmath/bits.h" #include "lib/intmath/addsub.h" @@ -79,15 +80,6 @@ int64_t clamp_double_to_int64(double number); /* String manipulation */ -long tor_parse_long(const char *s, int base, long min, - long max, int *ok, char **next); -unsigned long tor_parse_ulong(const char *s, int base, unsigned long min, - unsigned long max, int *ok, char **next); -double tor_parse_double(const char *s, double min, double max, int *ok, - char **next); -uint64_t tor_parse_uint64(const char *s, int base, uint64_t min, - uint64_t max, int *ok, char **next); - const char *hex_str(const char *from, size_t fromlen) ATTR_NONNULL((1)); int string_is_key_value(int severity, const char *string); |