aboutsummaryrefslogtreecommitdiff
path: root/src/lib/confmgt/structvar.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-01-06 13:24:01 -0500
committerNick Mathewson <nickm@torproject.org>2020-01-06 13:24:01 -0500
commit48f734178362d3a8b490a23ceff202a2027a27fc (patch)
tree47b85f54bd0a7f7f59d6bdb35c80e58c490c22e3 /src/lib/confmgt/structvar.c
parent13216f848a120760fa372b9ae8f6d0840f4a83ba (diff)
parent6da989cfe8323418ee1f888287d0d65b21b60c1d (diff)
downloadtor-48f734178362d3a8b490a23ceff202a2027a27fc.tar.gz
tor-48f734178362d3a8b490a23ceff202a2027a27fc.zip
Merge branch 'maint-0.4.2'
Diffstat (limited to 'src/lib/confmgt/structvar.c')
-rw-r--r--src/lib/confmgt/structvar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c
index a2411477d6..ce8e426cda 100644
--- a/src/lib/confmgt/structvar.c
+++ b/src/lib/confmgt/structvar.c
@@ -71,8 +71,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);
}
/**