diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-12 22:44:08 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-12 22:44:08 +0000 |
| commit | 1810de72b6f6304b94894c3b44e8fced087b16d0 (patch) | |
| tree | 970a2efe61ffd0bf370ad5ac8a97ba0be515696b /epan/dissectors/packet-zrtp.c | |
| parent | 2614ec5ea01b8f3504e2604ac57b0cc125d5e99f (diff) | |
In some cases add include emem.h
In other cases emem -> wmem
svn path=/trunk/; revision=51994
Diffstat (limited to 'epan/dissectors/packet-zrtp.c')
| -rw-r--r-- | epan/dissectors/packet-zrtp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index e60fcd4095..368462e3ba 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -32,6 +32,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> +#include <epan/wmem/wmem.h> #include <wsutil/crc32.h> #include "packet-rtp.h" #include "packet-rtcp.h" @@ -296,7 +297,7 @@ key_to_val(const gchar *key, int keylen, const value_string_keyval *kv, const gc } i++; } - return ep_strdup_printf(fmt, key); + return wmem_strdup_printf(wmem_packet_scope(), fmt, key); } static const gchar * @@ -459,7 +460,7 @@ static void dissect_Conf2ACK(packet_info *pinfo) { /* Signals start of SRT(C)P streams */ - struct srtp_info *dummy_srtp_info = se_new0(struct srtp_info); + struct srtp_info *dummy_srtp_info = wmem_new0(wmem_file_scope(), struct srtp_info); dummy_srtp_info->encryption_algorithm = SRTP_ENC_ALG_AES_CM; dummy_srtp_info->auth_algorithm = SRTP_AUTH_ALG_HMAC_SHA1; |