Revert "Avoid build warnings for __connman_logs_s"

[platform/upstream/connman.git] / tools / resolv-test.c

diff --git a/tools/resolv-test.c b/tools/resolv-test.c
old mode 100644 (file)
new mode 100755 (executable)
index 7cb2f6f..8953acd
--- a/tools/resolv-test.c
+++ b/tools/resolv-test.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -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);