Imported Upstream version 1.24upstream/1.24

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/resolv-test.c b/tools/resolv-test.c
index 9867a4bb..8953acd3 100644
--- a/tools/resolv-test.c
+++ b/tools/resolv-test.c
@@ -80,7 +80,7 @@ static void resolv_result(GResolvResultStatus status,
 
 	g_print("status: %s\n", status2str(status));
 
-	if (results != NULL) {
+	if (results) {
 		for (i = 0; results[i]; i++)
 			g_print("result: %s\n", results[i]);
 	}
@@ -88,7 +88,7 @@ static void resolv_result(GResolvResultStatus status,
 	g_main_loop_quit(main_loop);
 }
 
-static gboolean option_debug = FALSE;
+static bool option_debug = false;
 
 static GOptionEntry options[] = {
 	{ "debug", 'd', 0, G_OPTION_ARG_NONE, &option_debug,
@@ -107,8 +107,8 @@ int main(int argc, char *argv[])
 	context = g_option_context_new(NULL);
 	g_option_context_add_main_entries(context, options, NULL);
 
-	if (g_option_context_parse(context, &argc, &argv, &error) == FALSE) {
-		if (error != NULL) {
+	if (!g_option_context_parse(context, &argc, &argv, &error)) {
+		if (error) {
 			g_printerr("%s\n", error->message);
 			g_error_free(error);
 		} else
@@ -124,12 +124,12 @@ int main(int argc, char *argv[])
 	}
 
 	resolv = g_resolv_new(index);
-	if (resolv == NULL) {
+	if (!resolv) {
 		printf("failed to create resolver\n");
 		return 1;
 	}
 
-	if (option_debug == TRUE)
+	if (option_debug)
 		g_resolv_set_debug(resolv, resolv_debug, "RESOLV");
 
 	main_loop = g_main_loop_new(NULL, FALSE);