From 028a2f50fbf47d989bbf79be589945bec55b4825 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 21 Jul 2020 15:57:57 +0200 Subject: [PATCH 3/6] Use 'true' and 'false' instead of 'TRUE' and 'FALSE'. The latter are not guaranteed to be defined. --- src/lib/rnp.cpp | 10 ++++----- src/tests/ffi.cpp | 56 +++++++++++++++++++++++------------------------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/lib/rnp.cpp b/src/lib/rnp.cpp index a87511a4..9c0385d1 100644 --- a/src/lib/rnp.cpp +++ b/src/lib/rnp.cpp @@ -5927,7 +5927,7 @@ key_to_json(json_object *jso, rnp_key_handle_t handle, uint32_t flags) return RNP_ERROR_OUT_OF_MEMORY; } // revoked - json_object *jsorevoked = json_object_new_boolean(key->revoked ? TRUE : FALSE); + json_object *jsorevoked = json_object_new_boolean(key->revoked ? true : false); if (!jsorevoked) { return RNP_ERROR_OUT_OF_MEMORY; } @@ -5992,7 +5992,7 @@ key_to_json(json_object *jso, rnp_key_handle_t handle, uint32_t flags) } json_object_object_add(jso, "public key", jsopublic); json_object_object_add( - jsopublic, "present", json_object_new_boolean(have_pub ? TRUE : FALSE)); + jsopublic, "present", json_object_new_boolean(have_pub ? true : false)); if (flags & RNP_JSON_PUBLIC_MPIS) { json_object *jsompis = json_object_new_object(); if (!jsompis) { @@ -6011,7 +6011,7 @@ key_to_json(json_object *jso, rnp_key_handle_t handle, uint32_t flags) } json_object_object_add(jso, "secret key", jsosecret); json_object_object_add( - jsosecret, "present", json_object_new_boolean(have_sec ? TRUE : FALSE)); + jsosecret, "present", json_object_new_boolean(have_sec ? true : false)); if (have_sec) { bool locked = pgp_key_is_locked(handle->sec); if (flags & RNP_JSON_SECRET_MPIS) { @@ -6029,13 +6029,13 @@ key_to_json(json_object *jso, rnp_key_handle_t handle, uint32_t flags) } } } - json_object *jsolocked = json_object_new_boolean(locked ? TRUE : FALSE); + json_object *jsolocked = json_object_new_boolean(locked ? true : false); if (!jsolocked) { return RNP_ERROR_OUT_OF_MEMORY; } json_object_object_add(jsosecret, "locked", jsolocked); json_object *jsoprotected = - json_object_new_boolean(pgp_key_is_protected(handle->sec) ? TRUE : FALSE); + json_object_new_boolean(pgp_key_is_protected(handle->sec) ? true : false); if (!jsoprotected) { return RNP_ERROR_OUT_OF_MEMORY; } diff --git a/src/tests/ffi.cpp b/src/tests/ffi.cpp index 4224bb7d..28a4f867 100644 --- a/src/tests/ffi.cpp +++ b/src/tests/ffi.cpp @@ -800,10 +800,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_pair) rnp_key_handle_t primary = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "primary", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "primary", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); const char *grip = json_object_get_string(jsogrip); assert_non_null(grip); @@ -814,10 +814,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_pair) rnp_key_handle_t sub = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "sub", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "sub", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); const char *grip = json_object_get_string(jsogrip); assert_non_null(grip); @@ -878,10 +878,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_pair_dsa_elg) rnp_key_handle_t primary = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "primary", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "primary", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); const char *grip = json_object_get_string(jsogrip); assert_non_null(grip); @@ -892,10 +892,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_pair_dsa_elg) rnp_key_handle_t sub = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "sub", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "sub", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); const char *grip = json_object_get_string(jsogrip); assert_non_null(grip); @@ -958,10 +958,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_primary) rnp_key_handle_t primary = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "primary", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "primary", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); const char *grip = json_object_get_string(jsogrip); assert_non_null(grip); @@ -1021,10 +1021,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_sub) char * primary_grip = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "primary", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "primary", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); primary_grip = strdup(json_object_get_string(jsogrip)); assert_non_null(primary_grip); @@ -1079,10 +1079,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_sub) rnp_key_handle_t sub = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "sub", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "sub", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); const char *grip = json_object_get_string(jsogrip); assert_non_null(grip); @@ -2483,10 +2483,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_sub_pass_required) char * primary_grip = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "primary", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "primary", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); primary_grip = strdup(json_object_get_string(jsogrip)); assert_non_null(primary_grip); @@ -2557,10 +2557,10 @@ TEST_F(rnp_tests, test_ffi_keygen_json_sub_pass_required) rnp_key_handle_t sub = NULL; { json_object *jsokey = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(parsed_results, "sub", &jsokey)); + assert_int_equal(true, json_object_object_get_ex(parsed_results, "sub", &jsokey)); assert_non_null(jsokey); json_object *jsogrip = NULL; - assert_int_equal(TRUE, json_object_object_get_ex(jsokey, "grip", &jsogrip)); + assert_int_equal(true, json_object_object_get_ex(jsokey, "grip", &jsogrip)); assert_non_null(jsogrip); const char *grip = json_object_get_string(jsogrip); assert_non_null(grip); @@ -3821,7 +3821,7 @@ TEST_F(rnp_tests, test_ffi_key_to_json) assert_int_equal(rnp_strcasecmp(json_object_get_string(get_json_obj(jso, "grip")), "20A48B3C61525DCDF8B3B9D82C6BBCF4D8BFB5E5"), 0); - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "revoked")), FALSE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "revoked")), false); assert_int_equal(json_object_get_int64(get_json_obj(jso, "creation time")), 1511313500); assert_int_equal(json_object_get_int64(get_json_obj(jso, "expiration")), 0); // usage @@ -3843,7 +3843,7 @@ TEST_F(rnp_tests, test_ffi_key_to_json) "FFFA72FC225214DC712D0127172EE13E88AF93B4"), 0); // public key - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "public key.present")), TRUE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "public key.present")), true); assert_int_equal( rnp_strcasecmp(json_object_get_string(get_json_obj(jso, "public key.mpis.point")), "04B0C6F2F585C1EEDF805C4492CB683839D5EAE6246420780F063D558" @@ -3851,14 +3851,14 @@ TEST_F(rnp_tests, test_ffi_key_to_json) "793CEBAE8600BEEF"), 0); // secret key - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.present")), TRUE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.present")), true); assert_int_equal( rnp_strcasecmp(json_object_get_string(get_json_obj(jso, "secret key.mpis.x")), "46DE93CA439735F36B9CF228F10D8586DA824D88BBF4E24566D5312D061802C8"), 0); - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.locked")), FALSE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.locked")), false); assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.protected")), - FALSE); + false); // userids assert_int_equal(json_object_array_length(get_json_obj(jso, "userids")), 1); assert_int_equal(rnp_strcasecmp(json_object_get_string(json_object_array_get_idx( @@ -3907,7 +3907,7 @@ TEST_F(rnp_tests, test_ffi_key_to_json) assert_int_equal(rnp_strcasecmp(json_object_get_string(get_json_obj(jso, "grip")), "FFFA72FC225214DC712D0127172EE13E88AF93B4"), 0); - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "revoked")), FALSE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "revoked")), false); assert_int_equal(json_object_get_int64(get_json_obj(jso, "creation time")), 1511313500); assert_int_equal(json_object_get_int64(get_json_obj(jso, "expiration")), 0); // usage @@ -3924,21 +3924,21 @@ TEST_F(rnp_tests, test_ffi_key_to_json) // subkey grips assert_null(get_json_obj(jso, "subkey grips")); // public key - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "public key.present")), TRUE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "public key.present")), true); assert_int_equal( rnp_strcasecmp(json_object_get_string(get_json_obj(jso, "public key.mpis.point")), "04E2746BA4D180011B17A6909EABDBF2F3733674FBE00B20A3B857C2597233651544150B" "896BCE7DCDF47C49FC1E12D5AD86384D26336A48A18845940A3F65F502"), 0); // secret key - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.present")), TRUE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.present")), true); assert_int_equal( rnp_strcasecmp(json_object_get_string(get_json_obj(jso, "secret key.mpis.x")), "DF8BEB7272117AD7AFE2B7E882453113059787FBC785C82F78624EE7EF2117FB"), 0); - assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.locked")), FALSE); + assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.locked")), false); assert_int_equal(json_object_get_boolean(get_json_obj(jso, "secret key.protected")), - FALSE); + false); // userids assert_null(get_json_obj(jso, "userids")); // signatures -- 2.20.1