Changeset 14491 for trunk/libtransmission/variant.c

Timestamp:

Apr 11, 2015, 10:51:59 AM (6 years ago)

Author:

mikedld

Message:

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

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.

File:

• trunk/libtransmission/variant.c (modified) (1 diff)

trunk/libtransmission/variant.c

@@ -1219 +1219 @@
 ***/
 
-int
+bool
 tr_variantFromFile (tr_variant      * setme,
                     tr_variant_fmt    fmt,
-                    const char      * filename)
-{
-  int err;
+                    const char      * filename,
+                    tr_error       ** error)
+{
+  bool ret = false;
+  uint8_t * buf;
   size_t buflen;
-  uint8_t * buf;
-  const int old_errno = errno;
-
-  errno = 0;
-  buf = tr_loadFile (filename, &buflen);
-
-  if (errno)
-    err = errno;
-  else
-    err = tr_variantFromBuf (setme, fmt, buf, buflen, filename, NULL);
-
-  tr_free (buf);
-  errno = old_errno;
-  return err;
+
+  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"));
+
+      tr_free (buf);
+    }
+
+  return ret;
 }