diff options
author | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
commit | 8b0f1addd990ae1b6616dbb5a21e530942461154 (patch) | |
tree | e72f102e0cec19ee49b5729f8dcfa62afa3a931d /asn1/ros | |
parent | e6e7c1181bd33a94de00e137685f39520bd858dc (diff) |
Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.
svn path=/trunk/; revision=50066
Diffstat (limited to 'asn1/ros')
-rw-r--r-- | asn1/ros/ros-err.cnf | 6 | ||||
-rw-r--r-- | asn1/ros/ros-inv.cnf | 6 | ||||
-rw-r--r-- | asn1/ros/ros-rej.cnf | 2 | ||||
-rw-r--r-- | asn1/ros/ros-res.cnf | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/asn1/ros/ros-err.cnf b/asn1/ros/ros-err.cnf index 5ec7e0e319..a301db2ebd 100644 --- a/asn1/ros/ros-err.cnf +++ b/asn1/ros/ros-err.cnf @@ -22,11 +22,11 @@ if (!err_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) { if (actx->rose_ctx->d.code == 0) - descr = ep_strdup_printf("ERR: %d", actx->rose_ctx->d.code_local); + descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %d", actx->rose_ctx->d.code_local); else if (actx->rose_ctx->d.code == 1) - descr = ep_strdup_printf("ERR: %s", actx->rose_ctx->d.code_global); + descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %s", actx->rose_ctx->d.code_global); } else { - descr = ep_strdup_printf("ERR:"); + descr = wmem_strdup_printf(wmem_packet_scope(), "ERR:"); } if (actx->rose_ctx->apdu_depth >= 0) diff --git a/asn1/ros/ros-inv.cnf b/asn1/ros/ros-inv.cnf index 0e7ba0390b..a26a917f96 100644 --- a/asn1/ros/ros-inv.cnf +++ b/asn1/ros/ros-inv.cnf @@ -23,11 +23,11 @@ if (!arg_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) { if (actx->rose_ctx->d.code == 0) - descr = ep_strdup_printf("INV: %d", actx->rose_ctx->d.code_local); + descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local); else if (actx->rose_ctx->d.code == 1) - descr = ep_strdup_printf("INV: %s", actx->rose_ctx->d.code_global); + descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %s", actx->rose_ctx->d.code_global); } else { - descr = ep_strdup_printf("INV:"); + descr = wmem_strdup_printf(wmem_packet_scope(), "INV:"); } if (actx->rose_ctx->apdu_depth >= 0) diff --git a/asn1/ros/ros-rej.cnf b/asn1/ros/ros-rej.cnf index 02b97f582f..96e114b452 100644 --- a/asn1/ros/ros-rej.cnf +++ b/asn1/ros/ros-rej.cnf @@ -8,7 +8,7 @@ problem_str[0] = '\0'; #.FN_FTR Reject - descr = ep_strdup_printf("REJ: %s", problem_str); + descr = wmem_strdup_printf(wmem_packet_scope(), "REJ: %s", problem_str); if (actx->rose_ctx->apdu_depth >= 0) proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), actx->rose_ctx->apdu_depth), " %s", descr); diff --git a/asn1/ros/ros-res.cnf b/asn1/ros/ros-res.cnf index d9ab23c421..21bde899b5 100644 --- a/asn1/ros/ros-res.cnf +++ b/asn1/ros/ros-res.cnf @@ -23,11 +23,11 @@ if (!res_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) { if (actx->rose_ctx->d.code == 0) - descr = ep_strdup_printf("RES: %d", actx->rose_ctx->d.code_local); + descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %d", actx->rose_ctx->d.code_local); else if (actx->rose_ctx->d.code == 1) - descr = ep_strdup_printf("RES: %s", actx->rose_ctx->d.code_global); + descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %s", actx->rose_ctx->d.code_global); } else { - descr = ep_strdup_printf("RES:"); + descr = wmem_strdup_printf(wmem_packet_scope(), "RES:"); } if (actx->rose_ctx->apdu_depth >= 0) |