From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 Jun 2016 14:11:29 +0000 (-0400)
Subject: Use tor_sscanf, not sscanf, in test_util.c.
X-Git-Tag: tor-0.2.8.4-rc~8^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5854b19816bc7b09df4785afbfb0e8891b398638;p=thirdparty%2Ftor.git

Use tor_sscanf, not sscanf, in test_util.c.

Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from
working.
---

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