7 files changed, 9 insertions, 9 deletions
diff --git a/src/libimcv/imc/imc_agent.c b/src/libimcv/imc/imc_agent.c
index 6bba69733..de2f959a4 100644
--- a/src/libimcv/imc/imc_agent.c
+++ b/src/libimcv/imc/imc_agent.c
@@ -313,7 +313,7 @@ static bool get_bool_attribute(private_imc_agent_t *this, TNC_ConnectionID id,
 	return this->get_attribute  &&
 		   this->get_attribute(this->id, id, attribute_id, 4, buf, &len) ==
 							   TNC_RESULT_SUCCESS && len == 1 && *buf == 0x01;
- }
+}
 
 /**
  * Read a string attribute
diff --git a/src/libstrongswan/plugins/agent/agent_private_key.c b/src/libstrongswan/plugins/agent/agent_private_key.c
index dae130bba..60b57ad2d 100644
--- a/src/libstrongswan/plugins/agent/agent_private_key.c
+++ b/src/libstrongswan/plugins/agent/agent_private_key.c
@@ -398,7 +398,7 @@ agent_private_key_t *agent_private_key_open(key_type_t type, va_list args)
 	}
 	if (!path)
 	{
-		return FALSE;
+		return NULL;
 	}
 
 	INIT(this,
diff --git a/src/libstrongswan/plugins/pgp/pgp_builder.c b/src/libstrongswan/plugins/pgp/pgp_builder.c
index 440e70a18..361157742 100644
--- a/src/libstrongswan/plugins/pgp/pgp_builder.c
+++ b/src/libstrongswan/plugins/pgp/pgp_builder.c
@@ -152,7 +152,7 @@ static private_key_t *parse_private_key(chunk_t blob)
 	}
 	if (!pgp_read_scalar(&packet, 1, &version))
 	{
-		return FALSE;
+		return NULL;
 	}
 	switch (version)
 	{
@@ -166,7 +166,7 @@ static private_key_t *parse_private_key(chunk_t blob)
 			break;
 		default:
 			DBG1(DBG_LIB, "PGP packet version V%d not supported", version);
-			return FALSE;
+			return NULL;
 	}
 	if (!pgp_read_scalar(&packet, 4, &created))
 	{
diff --git a/src/libstrongswan/plugins/pgp/pgp_cert.c b/src/libstrongswan/plugins/pgp/pgp_cert.c
index 5b2ec63fc..70a236855 100644
--- a/src/libstrongswan/plugins/pgp/pgp_cert.c
+++ b/src/libstrongswan/plugins/pgp/pgp_cert.c
@@ -441,14 +441,14 @@ pgp_cert_t *pgp_cert_load(certificate_type_t type, va_list args)
 				if (!parse_signature(this, packet))
 				{
 					destroy(this);
-					return FALSE;
+					return NULL;
 				}
 				break;
 			case PGP_PKT_USER_ID:
 				if (!parse_user_id(this, packet))
 				{
 					destroy(this);
-					return FALSE;
+					return NULL;
 				}
 				break;
 			default:
diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index de5ce249a..aabeb1f86 100644
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -531,7 +531,7 @@ METHOD(plugin_loader_t, load_plugins, bool,
 		if (snprintf(file, sizeof(file), "%s/libstrongswan-%s.so",
 					 path, token) >= sizeof(file))
 		{
-			return NULL;
+			return FALSE;
 		}
 		if (!load_plugin(this, token, file) && critical)
 		{
diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c
index 59f490025..25d92d5cb 100644
--- a/src/libstrongswan/plugins/x509/x509_cert.c
+++ b/src/libstrongswan/plugins/x509/x509_cert.c
@@ -1492,7 +1492,7 @@ end:
 		if (hasher == NULL)
 		{
 			DBG1(DBG_ASN, "  unable to create hash of certificate, SHA1 not supported");
-			return NULL;
+			return FALSE;
 		}
 		hasher->allocate_hash(hasher, this->encoding, &this->encoding_hash);
 		hasher->destroy(hasher);
diff --git a/src/libstrongswan/printf_hook.c b/src/libstrongswan/printf_hook.c
index 7e7045d69..c3b5191fd 100644
--- a/src/libstrongswan/printf_hook.c
+++ b/src/libstrongswan/printf_hook.c
@@ -173,7 +173,7 @@ static int custom_fmt_cb(Vstr_base *base, size_t pos, Vstr_fmt_spec *fmt_spec)
 	{
 		vstr_add_buf(base, pos, buf, written);
 	}
-	return TRUE;
+	return 1;
 }
 
 /**