diff options
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/common/util.h b/src/common/util.h index d1b4e8fe9e..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" @@ -33,6 +34,7 @@ #include "lib/intmath/cmp.h" #include "lib/log/ratelim.h" #include "lib/log/util_bug.h" +#include "lib/log/escape.h" #ifndef O_BINARY #define O_BINARY 0 @@ -78,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); @@ -99,10 +92,6 @@ int tor_mem_is_zero(const char *mem, size_t len); int tor_digest_is_zero(const char *digest); int tor_digest256_is_zero(const char *digest); -char *esc_for_log(const char *string) ATTR_MALLOC; -char *esc_for_log_len(const char *chars, size_t n) ATTR_MALLOC; -const char *escaped(const char *string); - char *tor_escape_str_for_pt_args(const char *string, const char *chars_to_escape); |