From bc23f797296582d5aca5029dd34244de41ff8605 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 13 Jan 2015 12:13:45 -0800 Subject: UAT error string pointers should not be const pointers. UAT error strings are usually allocated by g_strdup() or g_strdup_printf(), and must ultimately be freed by the caller. Make the pointer-to-error-string-pointer arguments to various functions be "char **", not "const char **". Fix cases that finds where a raw string was being used, as that won't work if you try to free it; g_strdup() it instead. Add a missing free of an error string. Remove some no-longer-necessary casts. Remove some unnecessary g_strdup()s (the string being handed to it was already g_malloc()ated). Change some variable declarations to match. Put in XXX comments for some cases where the error string is just freed, without being shown to the user. Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 Reviewed-on: https://code.wireshark.org/review/6525 Reviewed-by: Guy Harris --- epan/expert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/expert.c') diff --git a/epan/expert.c b/epan/expert.c index d82937293d..da47c135c7 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -121,7 +121,7 @@ static GArray *uat_saved_fields = NULL; UAT_CSTRING_CB_DEF(uat_expert_entries, field, expert_level_entry_t) UAT_VS_DEF(uat_expert_entries, severity, expert_level_entry_t, guint32, PI_ERROR, "Error") -static void uat_expert_update_cb(void *r, const char **err) +static void uat_expert_update_cb(void *r, char **err) { expert_level_entry_t *rec = (expert_level_entry_t *)r; -- cgit v1.2.1