summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorDaniel Wagner <daniel.wagner@bmw-carit.de>2013-08-14 09:27:57 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-08-20 11:05:31 +0200
commit2d656974c762e700d4bbf65faebe1a50172b245f (patch)
tree75cfd0fa455b1ccf73f7ada05ef167f60c85a962 /src/main.c
parent6268d342a79d2484ec182078c343bff338c8e125 (diff)
downloadneard-2d656974c762e700d4bbf65faebe1a50172b245f.tar.gz
neard-2d656974c762e700d4bbf65faebe1a50172b245f.tar.bz2
neard-2d656974c762e700d4bbf65faebe1a50172b245f.zip
core: Do not compare expression against NULL
This patch generate via coccinelle with: @ disable is_null,isnt_null1 @ expression E; @@ ( - E == NULL + !E | - E != NULL + E )
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 3689beb..46dba44 100644
--- a/src/main.c
+++ b/src/main.c
@@ -70,19 +70,19 @@ static void parse_config(GKeyFile *config)
GError *error = NULL;
bool boolean;
- if (config == NULL)
+ if (!config)
return;
DBG("parsing main.conf");
boolean = g_key_file_get_boolean(config, "General",
"ConstantPoll", &error);
- if (error == NULL)
+ if (!error)
near_settings.constant_poll = boolean;
boolean = g_key_file_get_boolean(config, "General",
"DefaultPowered", &error);
- if (error == NULL)
+ if (!error)
near_settings.default_powered = boolean;
g_clear_error(&error);
@@ -224,7 +224,7 @@ int main(int argc, char *argv[])
g_option_context_add_main_entries(context, options, NULL);
if (!g_option_context_parse(context, &argc, &argv, &error)) {
- if (error != NULL) {
+ if (error) {
g_printerr("%s\n", error->message);
g_error_free(error);
} else
@@ -246,7 +246,7 @@ int main(int argc, char *argv[])
dbus_error_init(&err);
conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NFC_SERVICE, &err);
- if (conn == NULL) {
+ if (!conn) {
if (dbus_error_is_set(&err)) {
fprintf(stderr, "%s\n", err.message);
dbus_error_free(&err);