diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
| commit | b998431a33db2be0246f176ea0077b98d5258866 (patch) | |
| tree | d03935b5fbc9e8f6327af93b2897fc1f34d931fe /src/or/routerparse.c | |
| parent | 8b62a738b3add64dcd26a82dff44a7e9e11ff5a9 (diff) | |
| parent | b7cf7bd9ae31aeddd03ad2094dd480d2b1d34d4f (diff) | |
| download | tor-b998431a33db2be0246f176ea0077b98d5258866.tar.gz tor-b998431a33db2be0246f176ea0077b98d5258866.zip | |
Merge branch '024_msvc_squashed'
Conflicts:
src/or/or.h
srcwin32/orconfig.h
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 6185e87fd5..b945ea6aa6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3844,7 +3844,7 @@ get_next_token(memarea_t *area, if ((size_t)(eol-next) != 9+obname_len+5 || strcmp_len(next+9, tok->object_type, obname_len) || strcmp_len(eol-5, "-----", 5)) { - snprintf(ebuf, sizeof(ebuf), "Malformed object: mismatched end tag %s", + tor_snprintf(ebuf, sizeof(ebuf), "Malformed object: mismatched end tag %s", tok->object_type); ebuf[sizeof(ebuf)-1] = '\0'; RET_ERR(ebuf); |