diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-05-31 00:07:52 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-05-31 00:07:52 -0400 |
commit | ffc21b653f08e3826867c14d44d6543d262bb417 (patch) | |
tree | 7e7bfcd648f0ac2180663c11cc852795b60de39f /src/common/util.h | |
parent | fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335 (diff) | |
parent | 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f (diff) | |
download | tor-ffc21b653f08e3826867c14d44d6543d262bb417.tar.gz tor-ffc21b653f08e3826867c14d44d6543d262bb417.zip |
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.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/util.h b/src/common/util.h index 567efaafef..36601fa790 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))) |