aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sbus.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-09-22 15:50:55 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-09-22 15:50:55 +0000
commita0c53ffaa1bb46d8c9db2ec739401aa411c9790e (patch)
tree56a11c9e0910032ad43476462dd2c95ed65e5cc1 /epan/dissectors/packet-sbus.c
parentc4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff)
emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - update docs accordingly svn path=/trunk/; revision=52172
Diffstat (limited to 'epan/dissectors/packet-sbus.c')
-rw-r--r--epan/dissectors/packet-sbus.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index e0179fd275..a408d61e6f 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -783,7 +783,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
sbus_quint8_helper0 += 1;
}
- tmp_string = tvb_get_ephemeral_string(tvb , 19,
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb , 19,
sbus_quint8_helper0);
col_append_fstr(pinfo->cinfo, COL_INFO,
": (File: %s)", tmp_string);
@@ -800,7 +800,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
sbus_quint8_helper0 += 1;
}
- tmp_string = tvb_get_ephemeral_string(tvb , 15,
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb , 15,
sbus_quint8_helper0);
col_append_fstr(pinfo->cinfo, COL_INFO,
": (File: %s)", tmp_string);
@@ -1245,7 +1245,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
sbus_quint8_helper0 += 1;
}
- tmp_string = tvb_get_ephemeral_string(tvb , 19, sbus_quint8_helper0);
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb , 19, sbus_quint8_helper0);
proto_tree_add_string(sbus_tree,
hf_sbus_rdwr_file_name, tvb, offset,
sbus_quint8_helper0, tmp_string);
@@ -1310,7 +1310,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
sbus_quint8_helper0 += 1;
}
- tmp_string = tvb_get_ephemeral_string(tvb, 19, sbus_quint8_helper0);
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 19, sbus_quint8_helper0);
proto_tree_add_string(sbus_tree,
hf_sbus_rdwr_file_name, tvb, offset,
sbus_quint8_helper0, tmp_string);
@@ -1352,7 +1352,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
sbus_quint8_helper0 += 1;
}
- tmp_string = tvb_get_ephemeral_string(tvb, 14, sbus_quint8_helper0);
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 14, sbus_quint8_helper0);
proto_tree_add_string(sbus_tree,
hf_sbus_rdwr_file_name, tvb, offset,
sbus_quint8_helper0, tmp_string);
@@ -1396,7 +1396,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
sbus_quint8_helper0 += 1;
}
- tmp_string = tvb_get_ephemeral_string(tvb, 22, sbus_quint8_helper0);
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 22, sbus_quint8_helper0);
proto_tree_add_string(sbus_tree,
hf_sbus_rdwr_file_name, tvb, offset,
sbus_quint8_helper0, tmp_string);
@@ -1435,7 +1435,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
sbus_quint8_helper0 += 1;
}
- tmp_string = tvb_get_ephemeral_string(tvb, 14, sbus_quint8_helper0);
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 14, sbus_quint8_helper0);
proto_tree_add_string(sbus_tree,
hf_sbus_rdwr_file_name, tvb, offset,
sbus_quint8_helper0, tmp_string);
@@ -1594,12 +1594,12 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* Response: Firmware version */
case SBUS_RD_PROGRAM_VERSION:
/*PCD type*/
- tmp_string = tvb_get_ephemeral_string(tvb , offset, 5);
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb , offset, 5);
proto_tree_add_string(sbus_tree,
hf_sbus_cpu_type, tvb, offset, 5, tmp_string);
offset += 5;
/*FW version*/
- tmp_string = tvb_get_ephemeral_string(tvb , offset, 3);
+ tmp_string = tvb_get_string(wmem_packet_scope(), tvb , offset, 3);
proto_tree_add_string(sbus_tree,
hf_sbus_fw_version, tvb, offset, 3, tmp_string);
offset += 4;