aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rpc.c
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-25 11:43:30 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-25 11:43:30 +0000
commit1bf35eeccc8c59ed9874cb96348966da281b0853 (patch)
treea19835aec094d07536c6def639d5d5d236f0a1cd /epan/dissectors/packet-rpc.c
parentf2743805ede691924d8f265a2e8ee489116370fb (diff)
From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30691 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rpc.c')
-rw-r--r--epan/dissectors/packet-rpc.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 421394fb28..76113a4996 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -354,7 +354,6 @@ rpc_proc_name(guint32 prog, guint32 vers, guint32 proc)
rpc_proc_info_value *value;
char *procname;
- procname=ep_alloc(20);
key.prog = prog;
key.vers = vers;
key.proc = proc;
@@ -364,7 +363,7 @@ rpc_proc_name(guint32 prog, guint32 vers, guint32 proc)
else {
/* happens only with strange program versions or
non-existing dissectors */
- g_snprintf(procname, 20, "proc-%u", key.proc);
+ procname = ep_strdup_printf("proc-%u", key.proc);
}
return procname;
}
@@ -1564,16 +1563,14 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
procname = (char *)rpc_call->proc_info->name;
}
else {
- procname=ep_alloc(20);
- g_snprintf(procname, 20, "proc-%u", rpc_call->proc);
+ procname=ep_strdup_printf("proc-%u", rpc_call->proc);
}
}
else {
#if 0
dissect_function = NULL;
#endif
- procname=ep_alloc(20);
- g_snprintf(procname, 20, "proc-%u", rpc_call->proc);
+ procname=ep_strdup_printf("proc-%u", rpc_call->proc);
}
if ( tree )
@@ -2007,8 +2004,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
#if 0
dissect_function = NULL;
#endif
- procname=ep_alloc(20);
- g_snprintf(procname, 20, "proc-%u", proc);
+ procname=ep_strdup_printf("proc-%u", proc);
}
/* Check for RPCSEC_GSS and AUTH_GSSAPI */
@@ -2235,16 +2231,14 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
procname = (char *)rpc_call->proc_info->name;
}
else {
- procname=ep_alloc(20);
- g_snprintf(procname, 20, "proc-%u", proc);
+ procname=ep_strdup_printf("proc-%u", proc);
}
}
else {
#if 0
dissect_function = NULL;
#endif
- procname=ep_alloc(20);
- g_snprintf(procname, 20, "proc-%u", proc);
+ procname=ep_strdup_printf("proc-%u", proc);
}
/*