Changeset 14491 for trunk/libtransmission/session.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/session.c (modified) (5 diffs)

trunk/libtransmission/session.c

@@ -33 +33 @@
 #include "cache.h"
 #include "crypto-utils.h"
+#include "error.h"
+#include "error-types.h"
 #include "fdlimit.h"
 #include "file.h"
@@ -457 +459 @@
 tr_sessionLoadSettings (tr_variant * dict, const char * configDir, const char * appName)
 {
-  int err = 0;
   char * filename;
   tr_variant fileSettings;
   tr_variant sessionDefaults;
   tr_variant tmp;
-  bool success = false;
+  bool success;
+  tr_error * error = NULL;
 
   assert (tr_variantIsDict (dict));
@@ -481 +483 @@
   /* file settings override the defaults */
   filename = tr_buildPath (configDir, "settings.json", NULL);
-  err = tr_variantFromFile (&fileSettings, TR_VARIANT_FMT_JSON, filename);
-  if (!err)
+  if (tr_variantFromFile (&fileSettings, TR_VARIANT_FMT_JSON, filename, &error))
     {
       tr_variantMergeDicts (dict, &fileSettings);
       tr_variantFree (&fileSettings);
+      success = true;
+    }
+  else
+    {
+      success = TR_ERROR_IS_ENOENT (error->code);
+      tr_error_free (error);
     }
 
@@ -491 +498 @@
   tr_variantFree (&sessionDefaults);
   tr_free (filename);
-  success = (err==0) || (err==ENOENT);
   return success;
 }
@@ -510 +516 @@
   {
     tr_variant fileSettings;
-    const int err = tr_variantFromFile (&fileSettings, TR_VARIANT_FMT_JSON, filename);
-    if (!err)
+    if (tr_variantFromFile (&fileSettings, TR_VARIANT_FMT_JSON, filename, NULL))
       {
         tr_variantMergeDicts (&settings, &fileSettings);