diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-08-08 18:50:39 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-08-08 18:50:39 +0000 |
| commit | 0dc9fb3d4ab00d14bf45c597471e10e601efd4d4 (patch) | |
| tree | ae44175ca8fd23548fcec5833098b535af5e372c /epan/dissectors/packet-dcerpc-samr.c | |
| parent | f3407856f4fd97caf90655205cdb2c66991e75ba (diff) | |
various code cleanup:
-use g_snprintf instead of sprintf and snprintf
-use g_strdup_printf where appropriate
-remove #include "snprintf.h" (as only g_snprintf should be used)
-replace some more alloc/realloc/calloc/free with their glib pendants
svn path=/trunk/; revision=15264
Diffstat (limited to 'epan/dissectors/packet-dcerpc-samr.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-samr.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 4fe262b113..4527455675 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -40,10 +40,6 @@ #include "packet-windows-common.h" #include "packet-smb-common.h" -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - static int proto_dcerpc_samr = -1; static int hf_samr_opnum = -1; @@ -2793,7 +2789,7 @@ samr_dissect_INDEX_ARRAY(tvbuff_t *tvb, int offset, di=pinfo->private_data; field_name = proto_registrar_get_name(di->hf_index); - snprintf(str, 255, "INDEX_ARRAY: %s%s:", field_name, + g_snprintf(str, 255, "INDEX_ARRAY: %s%s:", field_name, plural_ending(field_name)); if(parent_tree){ item = proto_tree_add_text(parent_tree, tvb, offset, -1, @@ -2854,7 +2850,7 @@ samr_dissect_IDX_AND_NAME(tvbuff_t *tvb, int offset, di=pinfo->private_data; - snprintf(str, 255, "IDX_AND_NAME: %s:",proto_registrar_get_name(di->hf_index)); + g_snprintf(str, 255, "IDX_AND_NAME: %s:",proto_registrar_get_name(di->hf_index)); if(parent_tree){ item = proto_tree_add_text(parent_tree, tvb, offset, -1, "%s",str); @@ -2909,7 +2905,7 @@ samr_dissect_IDX_AND_NAME_ARRAY(tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_count, &count); - snprintf(str, 255, "IDX_AND_NAME pointer: %s%s:", field_name, + g_snprintf(str, 255, "IDX_AND_NAME pointer: %s%s:", field_name, plural_ending(field_name)); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_IDX_AND_NAME_entry, NDR_POINTER_UNIQUE, @@ -2931,7 +2927,7 @@ samr_dissect_IDX_AND_NAME_ARRAY_ptr(tvbuff_t *tvb, int offset, di=pinfo->private_data; field_name = proto_registrar_get_name(di->hf_index); - snprintf(str, 255, "IDX_AND_NAME_ARRAY pointer: %s%s:", field_name, + g_snprintf(str, 255, "IDX_AND_NAME_ARRAY pointer: %s%s:", field_name, plural_ending(field_name)); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_IDX_AND_NAME_ARRAY, NDR_POINTER_UNIQUE, |