aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-05-31 00:07:52 -0400
committerNick Mathewson <nickm@torproject.org>2012-05-31 00:07:52 -0400
commitffc21b653f08e3826867c14d44d6543d262bb417 (patch)
tree7e7bfcd648f0ac2180663c11cc852795b60de39f /src/common/util.h
parentfe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335 (diff)
parent3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f (diff)
downloadtor-ffc21b653f08e3826867c14d44d6543d262bb417.tar
tor-ffc21b653f08e3826867c14d44d6543d262bb417.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.2'
(For bug 5969 fix)
Diffstat (limited to 'src/common/util.h')
-rw-r--r--src/common/util.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/util.h b/src/common/util.h
index 567efaafe..36601fa79 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -213,7 +213,11 @@ const char *escaped(const char *string);
struct smartlist_t;
void wrap_string(struct smartlist_t *out, const char *string, size_t width,
const char *prefix0, const char *prefixRest);
-int tor_vsscanf(const char *buf, const char *pattern, va_list ap);
+int tor_vsscanf(const char *buf, const char *pattern, va_list ap)
+#ifdef __GNUC__
+ __attribute__((format(scanf, 2, 0)))
+#endif
+ ;
int tor_sscanf(const char *buf, const char *pattern, ...)
#ifdef __GNUC__
__attribute__((format(scanf, 2, 3)))