Turn bool_neq and bool_eq into macros.

svn:r9914

diff --git a/src/common/util.h b/src/common/util.h
index 1d524cf66f1fc64a08bee5d242e543aedc23340d..7a0335935b746d8516c688cabd9def072bf10b89 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -136,6 +136,12 @@ extern int dmalloc_free(const char *file, const int line, void *pnt,
 #define SUBTYPE_P(p, subtype, basemember) \
   ((void*) ( ((char*)(p)) - STRUCT_OFFSET(subtype, basemember) ))
 
+/* Logic */
+/** Macro: true if two values have the same boolean value. */
+#define bool_eq(a,b) (!(a)==!(b))
+/** Macro: true if two values have different boolean values. */
+#define bool_neq(a,b) (!(a)!=!(b))
+
 /* String manipulation */
 
 /** Allowable characters in a hexadecimal string. */

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index fa6ecef318d321adb773d288894c09c413bd4d33..0ee7fc067f62300446b220b9f86364dd90b8d729 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -582,14 +582,6 @@ dirserv_add_descriptor(const char *desc, const char **msg)
   }
 }
 
-/** Helper: return true iff the boolean values of <b>a</b> and <b>b</b> are
- * different. */
-static INLINE int
-bool_neq(int a, int b)
-{
-  return (a) ? !b : b;
-}
-
 /** Remove all descriptors whose nicknames or fingerprints no longer
  * are allowed by our fingerprint list. (Descriptors that used to be
  * good can become bad when we reload the fingerprint list.)