diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-07-11 19:15:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-07-11 19:15:57 +0000 |
| commit | 5467d67f2a54c6d6efe407b10053e06067147a37 (patch) | |
| tree | 038e0db43126b4ef00f720b65d5f7f5a7216f393 /capture_opts.c | |
| parent | 4608a76a51ae6eae8147223451274cb3cb87829d (diff) | |
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
Diffstat (limited to 'capture_opts.c')
| -rw-r--r-- | capture_opts.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/capture_opts.c b/capture_opts.c index 7eb135ced0..4cd142fafb 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -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) */ |