Changeset 14201

Timestamp:

Sep 8, 2013, 9:25:13 PM (8 years ago)

Author:

jordan

Message:

blocklist cleanup: use bool instead of int where appropriate, use tr_fileExists() instead of stat()

Location:

trunk/libtransmission

Files:

• blocklist.c (modified) (5 diffs)
• blocklist.h (modified) (2 diffs)

trunk/libtransmission/blocklist.c

@@ -174 +174 @@
 }
 
-int
+bool
 tr_blocklistFileExists (const tr_blocklistFile * b)
 {
-  struct stat st;
-
-  return !stat (b->filename, &st);
+  return tr_fileExists (b->filename, NULL);
 }
 
@@ -190 +188 @@
 }
 
-int
+bool
 tr_blocklistFileIsEnabled (tr_blocklistFile * b)
 {
@@ -205 +203 @@
 }
 
-int
+bool
 tr_blocklistFileHasAddress (tr_blocklistFile * b, const tr_address * addr)
 {
@@ -214 +212 @@
 
   if (!b->isEnabled || addr->type == TR_AF_INET6)
-    return 0;
+    return false;
 
   blocklistEnsureLoaded (b);
 
   if (!b->rules || !b->ruleCount)
-    return 0;
+    return false;
 
   needle = ntohl (addr->addr.addr4.s_addr);
@@ -301 +299 @@
 }
 
-static int
+static bool
 parseLine (const char * line, struct tr_ipv4_range * range)
 {

trunk/libtransmission/blocklist.h

@@ -25 +25 @@
                                                  bool                      isEnabled);
 
-int                tr_blocklistFileExists       (const tr_blocklistFile  * b);
+bool               tr_blocklistFileExists       (const tr_blocklistFile  * b);
 
 const char *       tr_blocklistFileGetFilename  (const tr_blocklistFile  * b);
@@ -33 +33 @@
 void               tr_blocklistFileFree         (tr_blocklistFile        * b);
 
-int                tr_blocklistFileIsEnabled    (tr_blocklistFile        * b);
+bool               tr_blocklistFileIsEnabled    (tr_blocklistFile        * b);
 
 void               tr_blocklistFileSetEnabled   (tr_blocklistFile        * b,
                                                  bool                      isEnabled);
 
-int                tr_blocklistFileHasAddress   (tr_blocklistFile        * b,
+bool               tr_blocklistFileHasAddress   (tr_blocklistFile        * b,
                                                  const struct tr_address * addr);