aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-06-02 10:11:29 -0400
committerNick Mathewson <nickm@torproject.org>2016-06-02 10:11:29 -0400
commit5854b19816bc7b09df4785afbfb0e8891b398638 (patch)
treec829d99275f7f4ab7982b6b3f1c5bb3f3188bff7
parent4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 (diff)
downloadtor-5854b19816bc7b09df4785afbfb0e8891b398638.tar.gz
tor-5854b19816bc7b09df4785afbfb0e8891b398638.zip
Use tor_sscanf, not sscanf, in test_util.c.
Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from working.
-rw-r--r--changes/bug192133
-rw-r--r--src/test/test_util.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug19213 b/changes/bug19213
new file mode 100644
index 0000000000..f912ffb0c3
--- /dev/null
+++ b/changes/bug19213
@@ -0,0 +1,3 @@
+ o Minor bugfixes (compilation):
+ - Cause the unit tests to compile correctly on mingw64 versions
+ that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha.
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 0a5783e9f5..046e92ee18 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4377,7 +4377,7 @@ test_util_writepid(void *arg)
contents = read_file_to_str(fname, 0, NULL);
tt_assert(contents);
- int n = sscanf(contents, "%lu\n%c", &pid, &c);
+ int n = tor_sscanf(contents, "%lu\n%c", &pid, &c);
tt_int_op(n, OP_EQ, 1);
#ifdef _WIN32