Remove the TRUE and FALSE defines.

diff --git a/ChangeLog b/ChangeLog
index f5fee96a520a8ad455045dbe45f59840834af2bc..5dd29abd6e8563535926d129e52f6af6ec9a546d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Deprecated and removed features:
 * bits.h has been removed
 * lh_abort() has been removed
 * lh_table_lookup() has been removed, use lh_table_lookup_ex() instead.
+* Remove TRUE and FALSE defines, use 1 and 0 instead.
 
 
 0.13 (up to commit 5dae561, 2017/11/29)

diff --git a/json_object.c b/json_object.c
index da96f4cd5b9b1e0a7bf80f073b34982922f8290a..4d6e2e79df90a48f90abca2bb14b470cd8e11d94 100644 (file)
--- a/json_object.c
+++ b/json_object.c
@@ -537,7 +537,7 @@ json_bool json_object_object_get_ex(const struct json_object* jso, const char *k
                *value = NULL;
 
        if (NULL == jso)
-               return FALSE;
+               return 0;
 
        switch(jso->o_type)
        {
@@ -547,7 +547,7 @@ json_bool json_object_object_get_ex(const struct json_object* jso, const char *k
        default:
                if (value != NULL)
                        *value = NULL;
-               return FALSE;
+               return 0;
        }
 }
 
@@ -583,7 +583,7 @@ struct json_object* json_object_new_boolean(json_bool b)
 json_bool json_object_get_boolean(const struct json_object *jso)
 {
        if (!jso)
-               return FALSE;
+               return 0;
        switch(jso->o_type)
        {
        case json_type_boolean:
@@ -595,7 +595,7 @@ json_bool json_object_get_boolean(const struct json_object *jso)
        case json_type_string:
                return (jso->o.c_string.len != 0);
        default:
-               return FALSE;
+               return 0;
        }
 }
 

diff --git a/json_object.h b/json_object.h
index 4b7a24617d8b56ed3a63c9bd7ea5e9f16b48d1be..db63d22997edf9735de0800ddd58c344dfd12f03 100644 (file)
--- a/json_object.h
+++ b/json_object.h
@@ -118,12 +118,6 @@ extern "C" {
  */
 #define JSON_C_OBJECT_KEY_IS_CONSTANT (1<<2)
 
-#undef FALSE
-#define FALSE ((json_bool)0)
-
-#undef TRUE
-#define TRUE ((json_bool)1)
-
 /**
  * Set the global value of an option, which will apply to all
  * current and future threads that have not set a thread-local value.
@@ -654,7 +648,7 @@ JSON_EXPORT int json_object_array_del_idx(struct json_object *obj, size_t idx, s
 /* json_bool type methods */
 
 /** Create a new empty json_object of type json_type_boolean
- * @param b a json_bool TRUE or FALSE (1 or 0)
+ * @param b a json_bool 1 or 0
  * @returns a json_object of type json_type_boolean
  */
 JSON_EXPORT struct json_object* json_object_new_boolean(json_bool b);
@@ -662,10 +656,10 @@ JSON_EXPORT struct json_object* json_object_new_boolean(json_bool b);
 /** Get the json_bool value of a json_object
  *
  * The type is coerced to a json_bool if the passed object is not a json_bool.
- * integer and double objects will return FALSE if there value is zero
- * or TRUE otherwise. If the passed object is a string it will return
- * TRUE if it has a non zero length. If any other object type is passed
- * TRUE will be returned if the object is not NULL.
+ * integer and double objects will return 0 if there value is zero
+ * or 1 otherwise. If the passed object is a string it will return
+ * 1 if it has a non zero length. If any other object type is passed
+ * 1 will be returned if the object is not NULL.
  *
  * @param obj the json_object instance
  * @returns a json_bool

diff --git a/linkhash.c b/linkhash.c
index 7dddc3631d7cd2cb1773be52ab49e6dd35988ba0..b1223c4c56e782d681caafd170c936de936370c5 100644 (file)
--- a/linkhash.c
+++ b/linkhash.c
@@ -626,10 +626,10 @@ json_bool lh_table_lookup_ex(struct lh_table* t, const void* k, void **v)
        struct lh_entry *e = lh_table_lookup_entry(t, k);
        if (e != NULL) {
                if (v != NULL) *v = lh_entry_v(e);
-               return TRUE; /* key found */
+               return 1; /* key found */
        }
        if (v != NULL) *v = NULL;
-               return FALSE; /* key not found */
+               return 0; /* key not found */
 }
 
 int lh_table_delete_entry(struct lh_table *t, struct lh_entry *e)

diff --git a/tests/test_set_value.c b/tests/test_set_value.c
index 4c0a54a9bf3ba6babb95266a8f9b63cc47411586..1f80b0ea3a1245c5e256b9dc22268290cf12d16e 100644 (file)
--- a/tests/test_set_value.c
+++ b/tests/test_set_value.c
@@ -15,12 +15,12 @@ int main(int argc, char **argv)
        assert (json_object_get_int64(tmp)==321321321); 
        json_object_put(tmp);
        printf("INT64 PASSED\n");
-       tmp=json_object_new_boolean(TRUE);
-       assert (json_object_get_boolean(tmp)==TRUE); 
-       json_object_set_boolean(tmp,FALSE);
-       assert (json_object_get_boolean(tmp)==FALSE); 
-       json_object_set_boolean(tmp,TRUE);
-       assert (json_object_get_boolean(tmp)==TRUE); 
+       tmp=json_object_new_boolean(1);
+       assert (json_object_get_boolean(tmp)==1); 
+       json_object_set_boolean(tmp,0);
+       assert (json_object_get_boolean(tmp)==0); 
+       json_object_set_boolean(tmp,1);
+       assert (json_object_get_boolean(tmp)==1); 
        json_object_put(tmp);
        printf("BOOL PASSED\n");
        tmp=json_object_new_double(12.34);