1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with GCC:

Browse Source 
- initialization order
- unused and uninitialized local print_args_t
- missing comment on #endif

svn path=/trunk/; revision=45517
This commit is contained in:
Evan Huus 2012-10-13 01:15:35 +00:00
parent 818cf887f9
commit 1ed9eb2ece
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/qt/export_dissection_dialog.cpp
View File

@ -49,11 +49,11 @@
ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type): ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type):
QFileDialog(parent), QFileDialog(parent),
cap_file_(cap_file), export_type_(export_type),
export_type_(export_type) cap_file_(cap_file)
#if !defined(Q_WS_WIN) #if !defined(Q_WS_WIN)
, save_bt_(NULL) , save_bt_(NULL)
#endif Q_WS_WIN #endif /* Q_WS_WIN */
{ {
#if !defined(Q_WS_WIN) #if !defined(Q_WS_WIN)
QDialogButtonBox *button_box = findChild<QDialogButtonBox *>(); QDialogButtonBox *button_box = findChild<QDialogButtonBox *>();
@ -131,7 +131,6 @@ int ExportDissectionDialog::exec()
retval = QFileDialog::exec(); retval = QFileDialog::exec();
if (retval == QDialog::Accepted && selectedFiles().length() > 0) { if (retval == QDialog::Accepted && selectedFiles().length() > 0) {
print_args_t print_args;
cf_print_status_t status; cf_print_status_t status;
QString file_name = selectedFiles()[0]; QString file_name = selectedFiles()[0];
@ -187,10 +186,10 @@ int ExportDissectionDialog::exec()
case CF_PRINT_OK: case CF_PRINT_OK:
break; break;
case CF_PRINT_OPEN_ERROR: case CF_PRINT_OPEN_ERROR:
open_failure_alert_box(print_args.file, errno, TRUE); open_failure_alert_box(print_args_.file, errno, TRUE);
break; break;
case CF_PRINT_WRITE_ERROR: case CF_PRINT_WRITE_ERROR:
write_failure_alert_box(print_args.file, errno); write_failure_alert_box(print_args_.file, errno);
break; break;
} }