diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-01-01 13:44:07 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-01-01 22:08:59 +0000 |
| commit | be55c4f976249815a797875eefa655d035d1f628 (patch) | |
| tree | b2c4e758359fc0e88a5baebf7d8ab0d0f1f5a256 /ui/export_object_ui.c | |
| parent | e12270a730a60636ad36c06957b7e1f687c562a7 (diff) | |
Always report errors in eo_save_entry().
If a particular save failed, always let the user know.
Change-Id: I618e0ff82813cd4249ab7b1714f9a50e095a1ea8
Reviewed-on: https://code.wireshark.org/review/31296
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/export_object_ui.c')
| -rw-r--r-- | ui/export_object_ui.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ui/export_object_ui.c b/ui/export_object_ui.c index ef350d3164..91735c24a1 100644 --- a/ui/export_object_ui.c +++ b/ui/export_object_ui.c @@ -28,7 +28,7 @@ #include "export_object_ui.h" gboolean -eo_save_entry(const gchar *save_as_filename, export_object_entry_t *entry, gboolean show_err) +eo_save_entry(const gchar *save_as_filename, export_object_entry_t *entry) { int to_fd; gint64 bytes_left; @@ -40,8 +40,7 @@ eo_save_entry(const gchar *save_as_filename, export_object_entry_t *entry, gbool to_fd = ws_open(save_as_filename, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0644); if(to_fd == -1) { /* An error occurred */ - if (show_err) - report_open_failure(save_as_filename, errno, TRUE); + report_open_failure(save_as_filename, errno, TRUE); return FALSE; } @@ -71,8 +70,7 @@ eo_save_entry(const gchar *save_as_filename, export_object_entry_t *entry, gbool err = errno; else err = WTAP_ERR_SHORT_WRITE; - if (show_err) - report_write_failure(save_as_filename, err); + report_write_failure(save_as_filename, err); ws_close(to_fd); return FALSE; } @@ -80,8 +78,7 @@ eo_save_entry(const gchar *save_as_filename, export_object_entry_t *entry, gbool ptr += bytes_written; } if (ws_close(to_fd) < 0) { - if (show_err) - report_write_failure(save_as_filename, errno); + report_write_failure(save_as_filename, errno); return FALSE; } |