aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-k12.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-13 12:13:45 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-13 20:20:03 +0000
commitbc23f797296582d5aca5029dd34244de41ff8605 (patch)
treec582e37dbe1f7186d2a8f16e8c6b22ab608b055d /epan/dissectors/packet-k12.c
parenta988253fef15e6a0ddd05b0fb06e18ccde00082b (diff)
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 <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-k12.c')
-rw-r--r--epan/dissectors/packet-k12.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 40cf879df0..58b8aac9ae 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -297,7 +297,7 @@ dissect_k12(tvbuff_t* tvb,packet_info* pinfo,proto_tree* tree)
}
static void
-k12_update_cb(void* r, const char** err)
+k12_update_cb(void* r, char** err)
{
k12_handles_t* h = (k12_handles_t *)r;
gchar** protos;
@@ -356,7 +356,7 @@ k12_free_cb(void* r)
static gboolean
-protos_chk_cb(void* r _U_, const char* p, guint len, const void* u1 _U_, const void* u2 _U_, const char** err)
+protos_chk_cb(void* r _U_, const char* p, guint len, const void* u1 _U_, const void* u2 _U_, char** err)
{
gchar** protos;
gchar* line = wmem_strndup(NULL,p,len);