diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2013-10-29 11:04:03 +0000 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2013-10-29 11:04:03 +0000 |
| commit | 9f3740b414d8e4dd7312aa7f7d4486907106947e (patch) | |
| tree | 314fb48ee1506bbc2ce58c92e986623103d3a8d1 /wiretap/file_wrappers.c | |
| parent | 5ec452c288b38d59e52a8062afda8fb3e3f61140 (diff) | |
simplify file_error()
svn path=/trunk/; revision=52944
Diffstat (limited to 'wiretap/file_wrappers.c')
| -rw-r--r-- | wiretap/file_wrappers.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index be7557d490..3b996f5d3c 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -1315,12 +1315,11 @@ file_eof(FILE_T file) int file_error(FILE_T fh, gchar **err_info) { - if (fh->err != 0) { - if (err_info) - *err_info = (fh->err_info == NULL) ? NULL : g_strdup(fh->err_info); - return fh->err; + if (fh->err!=0 && err_info) { + /* g_strdup() returns NULL for NULL argument */ + *err_info = g_strdup(fh->err_info); } - return 0; + return fh->err; } void |