osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

In version_info.c, assume we always have the "matches" operator. In 

capture_opts.c, assume our output filename has been passed through
arg_list_utf_16to8().

svn path=/trunk/; revision=37974
This commit is contained in:
Gerald Combs 2011-07-11 19:15:57 +00:00
parent 4608a76a51
commit 5467d67f2a
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
capture_opts.c
View File

@ -697,12 +697,6 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
case 'w': /* Write to capture file x */
capture_opts->saving_to_file = TRUE;
g_free(capture_opts->save_file);
#if defined _WIN32 && GLIB_CHECK_VERSION(2,6,0)
/* since GLib 2.6, we need to convert filenames to utf8 for Win32 */
capture_opts->save_file = g_locale_to_utf8(optarg_str_p, -1, NULL, NULL, NULL);
#else
capture_opts->save_file = g_strdup(optarg_str_p);
#endif
status = capture_opts_output_to_pipe(capture_opts->save_file, &capture_opts->output_to_pipe);
return status;
case 'g': /* enable group read access on the capture file(s) */

6
version_info.c
View File

@ -163,12 +163,6 @@ get_compiled_version_info(GString *str, void (*prepend_info)(GString *),
(*append_info)(str);
g_string_append(str, ".");
#if !defined(HAVE_LIBPCRE) && !GLIB_CHECK_VERSION(2,14,0)
g_string_append(str,
"\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter syntax");
g_string_append(str, ".");
#endif /* HAVE_LIBPCRE */
end_string(str);
}