summaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-10-14 10:21:41 -0400
committerNick Mathewson <nickm@torproject.org>2016-10-14 10:21:41 -0400
commitaf70e4313160b792e8e8b4717f3cab828e4de42f (patch)
treede7d0e8a836b8c2c61177d2c0df4bbe8fda84aa3 /src/common/util.c
parent9615ad338f4d40934deee92ee5e5bad7dac52148 (diff)
parent05aed5b635fa7148fe2a4ea87e7296fa6bec3087 (diff)
downloadtor-af70e4313160b792e8e8b4717f3cab828e4de42f.tar.gz
tor-af70e4313160b792e8e8b4717f3cab828e4de42f.zip
Merge remote-tracking branch 'public/spaces_in_unix_addrs'
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c
index d1c87d3e85..9162967907 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2906,7 +2906,7 @@ read_file_to_str, (const char *filename, int flags, struct stat *stat_out))
* provided), and return a pointer to the position in <b>s</b> immediately
* after the string. On failure, return NULL.
*/
-static const char *
+const char *
unescape_string(const char *s, char **result, size_t *size_out)
{
const char *cp;