diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-17 21:34:05 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-17 21:34:05 +0000 |
| commit | 953c6fed13a771f58dda635859d12732ea6a6129 (patch) | |
| tree | 17db6431957a80b6d6c76364068b6c8591e71a11 /plugins/opcua | |
| parent | af15a51a6bdb1004ed2d1304106b0a8d24987615 (diff) | |
| download | wireshark-953c6fed13a771f58dda635859d12732ea6a6129.tar.gz | |
emem -> wmem
svn path=/trunk/; revision=52130
Diffstat (limited to 'plugins/opcua')
| -rw-r--r-- | plugins/opcua/opcua_extensionobjecttable.c | 3 | ||||
| -rw-r--r-- | plugins/opcua/opcua_simpletypes.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/opcua/opcua_extensionobjecttable.c b/plugins/opcua/opcua_extensionobjecttable.c index 023e90a3ff..3a6403c8ea 100644 --- a/plugins/opcua/opcua_extensionobjecttable.c +++ b/plugins/opcua/opcua_extensionobjecttable.c @@ -26,6 +26,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/wmem/wmem.h> #include "opcua_simpletypes.h" #include "opcua_complextypeparser.h" #include "opcua_extensionobjectids.h" @@ -209,7 +210,7 @@ void dispatchExtensionObjectType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, } else { - char *szValue = ep_strdup_printf("[Invalid ByteString] Invalid length: %d", iLen); + char *szValue = wmem_strdup_printf(wmem_packet_scope(), "[Invalid ByteString] Invalid length: %d", iLen); proto_tree_add_text(tree, tvb, *pOffset, 4, "%s", szValue); } } diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c index 9fca2599bd..2126ecd8b6 100644 --- a/plugins/opcua/opcua_simpletypes.c +++ b/plugins/opcua/opcua_simpletypes.c @@ -30,7 +30,7 @@ #include "opcua_simpletypes.h" #include "opcua_hfindeces.h" #include "opcua_extensionobjectids.h" -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #define DIAGNOSTICINFO_ENCODINGMASK_SYMBOLICID_FLAG 0x01 #define DIAGNOSTICINFO_ENCODINGMASK_NAMESPACE_FLAG 0x02 @@ -389,7 +389,7 @@ void parseString(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int hfIndex) else { proto_item *item = proto_tree_add_item(tree, hfIndex, tvb, *pOffset, 0, ENC_NA); - szValue = ep_strdup_printf("[Invalid String] Invalid length: %d", iLen); + szValue = wmem_strdup_printf(wmem_packet_scope(), "[Invalid String] Invalid length: %d", iLen); proto_item_append_text(item, "%s", szValue); proto_item_set_end(item, tvb, *pOffset + 4); } @@ -469,7 +469,7 @@ void parseByteString(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int hfIndex else { proto_item *item = proto_tree_add_item(tree, hfIndex, tvb, *pOffset, 0, ENC_NA); - szValue = ep_strdup_printf("[Invalid ByteString] Invalid length: %d", iLen); + szValue = wmem_strdup_printf(wmem_packet_scope(), "[Invalid ByteString] Invalid length: %d", iLen); proto_item_append_text(item, "%s", szValue); proto_item_set_end(item, tvb, *pOffset + 4); } |