Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-27 13:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

#5908: Check for tr_loadFile return value instead of errno in tr_variantFromFile

Browse Source 
Seems like there could be a defect in uClibc making errno not
thread-local. Don't rely on errno value but check function return value
instead which is a better failure indicator.

Return errors from `tr_loadFile` and `tr_variantFromFile` via tr_error.
Fix `tr_sessionLoadSettings` to not fail on Windows if settings.json
does not exist.
This commit is contained in:
Mike Gelfand
2015-04-11 10:51:59 +00:00
parent 99e0f5bd63
commit 3b129a72d8
19 changed files with 91 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libtransmission/variant.c
View File

@@ -1218,27 +1218,28 @@ tr_variantToFile (const tr_variant * v,
****
***/
int
bool
tr_variantFromFile (tr_variant * setme,
tr_variant_fmt fmt,
const char * filename)
const char * filename,
tr_error ** error)
{
int err;
size_t buflen;
bool ret = false;
uint8_t * buf;
const int old_errno = errno;
size_t buflen;
errno = 0;
buf = tr_loadFile (filename, &buflen);
buf = tr_loadFile (filename, &buflen, error);
if (buf != NULL)
{
if (tr_variantFromBuf (setme, fmt, buf, buflen, filename, NULL) == 0)
ret = true;
else
tr_error_set_literal (error, 0, _("Unable to parse file content"));
if (errno)
err = errno;
else
err = tr_variantFromBuf (setme, fmt, buf, buflen, filename, NULL);
tr_free (buf);
}
tr_free (buf);
errno = old_errno;
return err;
return ret;
}
int