diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:20:57 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:20:57 -0500 |
commit | 6da989cfe8323418ee1f888287d0d65b21b60c1d (patch) | |
tree | 4f8006b94cfb20fc09a9eaa2a24d00a675a0a430 /src/lib/confmgt | |
parent | 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76 (diff) | |
parent | b4977d1aa9366cdb1475664bcf1486fbfdf5a166 (diff) | |
download | tor-6da989cfe8323418ee1f888287d0d65b21b60c1d.tar.gz tor-6da989cfe8323418ee1f888287d0d65b21b60c1d.zip |
Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
Diffstat (limited to 'src/lib/confmgt')
-rw-r--r-- | src/lib/confmgt/structvar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index de678d18c8..7a3b8c7df2 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -53,8 +53,8 @@ struct_check_magic(const void *object, const struct_magic_decl_t *decl) const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset); tor_assertf(*ptr == decl->magic_val, "Bad magic number on purported %s object. " - "Expected %"PRIu32"x but got "PRIu32"x.", - decl->magic_val, *ptr); + "Expected %"PRIu32"x but got %"PRIu32"x.", + decl->typename, decl->magic_val, *ptr); } /** |