aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/file_import_dlg.c9
-rw-r--r--ui/tap_export_pdu.c9
2 files changed, 6 insertions, 12 deletions
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index 06e3a5790b..4700fa5b0a 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -461,7 +461,6 @@ file_import_open(text_import_info_t *info)
wtapng_iface_descriptions_t *idb_inf;
wtapng_if_descr_t int_data;
GString *os_info_str;
- char *appname;
/* Choose a random name for the temporary import buffer */
import_file_fd = create_tempfile(&tmpname, "import");
@@ -471,8 +470,6 @@ file_import_open(text_import_info_t *info)
os_info_str = g_string_new("");
get_os_version_info(os_info_str);
- appname = g_strdup_printf("Wireshark %s", get_ws_vcs_version_info());
-
shb_hdr = g_new(wtapng_section_t,1);
shb_hdr->section_length = -1;
/* options */
@@ -491,7 +488,7 @@ file_import_open(text_import_info_t *info)
* UTF-8 string containing the name of the application used to create
* this section.
*/
- shb_hdr->shb_user_appl = appname;
+ shb_hdr->shb_user_appl = g_strdup_printf("Wireshark %s", get_ws_vcs_version_info());
/* Create fake IDB info */
@@ -569,8 +566,8 @@ end:
g_free(info->date_timestamp_format);
g_free(info);
g_free(capfile_name);
- g_free(shb_hdr);
- g_free(appname);
+ wtap_free_shb(shb_hdr);
+ wtap_free_idb_info(idb_inf);
window_destroy(file_import_dlg_w);
}
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c
index f62373289a..f1dcacc63c 100644
--- a/ui/tap_export_pdu.c
+++ b/ui/tap_export_pdu.c
@@ -107,7 +107,6 @@ exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data)
wtapng_iface_descriptions_t *idb_inf;
wtapng_if_descr_t int_data;
GString *os_info_str;
- char *appname;
/* Choose a random name for the temporary import buffer */
import_file_fd = create_tempfile(&tmpname, "Wireshark_PDU_");
@@ -117,8 +116,6 @@ exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data)
os_info_str = g_string_new("");
get_os_version_info(os_info_str);
- appname = g_strdup_printf("Wireshark %s", get_ws_vcs_version_info());
-
shb_hdr = g_new0(wtapng_section_t,1);
shb_hdr->section_length = -1;
/* options */
@@ -137,7 +134,7 @@ exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data)
* UTF-8 string containing the name of the application used to create
* this section.
*/
- shb_hdr->shb_user_appl = appname;
+ shb_hdr->shb_user_appl = g_strdup_printf("Wireshark %s", get_ws_vcs_version_info());
/* Create fake IDB info */
idb_inf = g_new(wtapng_iface_descriptions_t,1);
@@ -206,8 +203,8 @@ exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data)
end:
g_free(capfile_name);
- g_free(shb_hdr);
- g_free(appname);
+ wtap_free_shb(shb_hdr);
+ wtap_free_idb_info(idb_inf);
}
gboolean