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/compat.h | |
| parent | fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335 (diff) | |
| parent | 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f (diff) | |
| download | tor-ffc21b653f08e3826867c14d44d6543d262bb417.tar tor-ffc21b653f08e3826867c14d44d6543d262bb417.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
(For bug 5969 fix)
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index b0ef63bad..7edd889ee 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -259,11 +259,12 @@ void tor_munmap_file(tor_mmap_t *handle) ATTR_NONNULL((1)); int tor_snprintf(char *str, size_t size, const char *format, ...) CHECK_PRINTF(3,4) ATTR_NONNULL((1,3)); int tor_vsnprintf(char *str, size_t size, const char *format, va_list args) - ATTR_NONNULL((1,3)); + CHECK_PRINTF(3,0) ATTR_NONNULL((1,3)); int tor_asprintf(char **strp, const char *fmt, ...) CHECK_PRINTF(2,3); -int tor_vasprintf(char **strp, const char *fmt, va_list args); +int tor_vasprintf(char **strp, const char *fmt, va_list args) + CHECK_PRINTF(2,0); const void *tor_memmem(const void *haystack, size_t hlen, const void *needle, size_t nlen) ATTR_NONNULL((1,3)); |