Merge "Fix crash caused by decryption response delay" into tizen

[platform/upstream/connman.git] / src / utsname.c

diff --git a/src/utsname.c b/src/utsname.c
old mode 100644 (file)
new mode 100755 (executable)
index aec8d78..1dd5e0f
--- a/src/utsname.c
+++ b/src/utsname.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
@@ -85,11 +85,11 @@ const char *connman_utsname_get_hostname(void)
 
                DBG("driver %p name %s", driver, driver->name);
 
-               if (driver->get_hostname == NULL)
+               if (!driver->get_hostname)
                        continue;
 
                hostname = driver->get_hostname();
-               if (hostname != NULL)
+               if (hostname)
                        return hostname;
        }
 
@@ -107,7 +107,7 @@ int __connman_utsname_set_hostname(const char *hostname)
 
                DBG("driver %p name %s", driver, driver->name);
 
-               if (driver->set_hostname == NULL)
+               if (!driver->set_hostname)
                        continue;
 
                if (driver->set_hostname(hostname) == 0)
@@ -128,7 +128,7 @@ int __connman_utsname_set_domainname(const char *domainname)
 
                DBG("driver %p name %s", driver, driver->name);
 
-               if (driver->set_domainname == NULL)
+               if (!driver->set_domainname)
                        continue;
 
                if (driver->set_domainname(domainname) == 0)