summaryrefslogtreecommitdiff
path: root/src/common/util.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-26 20:51:17 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-26 20:51:17 -0400
commit7159edf9090e0a0e4c7d02e80b81bc00083884cc (patch)
tree49b2f6465f058b8f52cc07fedddce0ad00a3ee64 /src/common/util.h
parent5f41bc91c6817649ebcfbecd184640aad7a5c8f1 (diff)
downloadtor-7159edf9090e0a0e4c7d02e80b81bc00083884cc.tar.gz
tor-7159edf9090e0a0e4c7d02e80b81bc00083884cc.zip
Move the escape-for-log code into src/lib/log
It doesn't need anything higher-level, and everything that needs the logs potentially needs this.
Diffstat (limited to 'src/common/util.h')
-rw-r--r--src/common/util.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/common/util.h b/src/common/util.h
index d1b4e8fe9e..d2c27064e1 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -33,6 +33,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
@@ -99,10 +100,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);