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

simplify file_error() 

svn path=/trunk/; revision=52944
This commit is contained in:
Martin Kaiser 2013-10-29 11:04:03 +00:00
parent 5ec452c288
commit 9f3740b414
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wiretap/file_wrappers.c
View File

@ -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