summaryrefslogtreecommitdiff
path: root/src/storage.c
diff options
context:
space:
mode:
authorZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
committerZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
commit1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7 (patch)
tree6e991827d28537f7f40f20786c2354fd04a9fdad /src/storage.c
parentfbe905ab58ecc31fe64c410c5f580cadc30e7f04 (diff)
downloadconnman-upstream/1.24.zip
connman-upstream/1.24.tar.gz
connman-upstream/1.24.tar.bz2
Imported Upstream version 1.24upstream/1.24
Diffstat (limited to 'src/storage.c')
-rw-r--r--src/storage.c110
1 files changed, 55 insertions, 55 deletions
diff --git a/src/storage.c b/src/storage.c
index 1ceafb9..7d03130 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -2,7 +2,7 @@
*
* Connection Manager
*
- * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 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
@@ -92,7 +92,7 @@ GKeyFile *__connman_storage_load_global(void)
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s", STORAGEDIR, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
@@ -108,7 +108,7 @@ int __connman_storage_save_global(GKeyFile *keyfile)
int ret;
pathname = g_strdup_printf("%s/%s", STORAGEDIR, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return -ENOMEM;
ret = storage_save(keyfile, pathname);
@@ -123,7 +123,7 @@ void __connman_storage_delete_global(void)
gchar *pathname;
pathname = g_strdup_printf("%s/%s", STORAGEDIR, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return;
storage_delete(pathname);
@@ -137,7 +137,7 @@ GKeyFile *__connman_storage_load_config(const char *ident)
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s.config", STORAGEDIR, ident);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
@@ -153,7 +153,7 @@ GKeyFile *__connman_storage_load_provider_config(const char *ident)
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s.config", VPN_STORAGEDIR, ident);
- if (pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
@@ -169,7 +169,7 @@ GKeyFile *__connman_storage_open_service(const char *service_id)
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s/%s", STORAGEDIR, service_id, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
@@ -196,7 +196,7 @@ gchar **connman_storage_get_services(void)
int ret;
dir = opendir(STORAGEDIR);
- if (dir == NULL)
+ if (!dir)
return NULL;
result = g_string_new(NULL);
@@ -248,7 +248,7 @@ GKeyFile *connman_storage_load_service(const char *service_id)
GKeyFile *keyfile = NULL;
pathname = g_strdup_printf("%s/%s/%s", STORAGEDIR, service_id, SETTINGS);
- if(pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
@@ -263,12 +263,12 @@ int __connman_storage_save_service(GKeyFile *keyfile, const char *service_id)
gchar *pathname, *dirname;
dirname = g_strdup_printf("%s/%s", STORAGEDIR, service_id);
- if(dirname == NULL)
+ if (!dirname)
return -ENOMEM;
/* If the dir doesn't exist, create it */
if (!g_file_test(dirname, G_FILE_TEST_IS_DIR)) {
- if(mkdir(dirname, MODE) < 0) {
+ if (mkdir(dirname, MODE) < 0) {
if (errno != EEXIST) {
g_free(dirname);
return -errno;
@@ -287,67 +287,67 @@ int __connman_storage_save_service(GKeyFile *keyfile, const char *service_id)
return ret;
}
-static gboolean remove_file(const char *service_id, const char *file)
+static bool remove_file(const char *service_id, const char *file)
{
gchar *pathname;
- gboolean ret = FALSE;
+ bool ret = false;
pathname = g_strdup_printf("%s/%s/%s", STORAGEDIR, service_id, file);
- if(pathname == NULL)
- return FALSE;
+ if (!pathname)
+ return false;
- if (g_file_test(pathname, G_FILE_TEST_EXISTS) == FALSE) {
- ret = TRUE;
- } else if (g_file_test(pathname, G_FILE_TEST_IS_REGULAR) == TRUE) {
+ if (!g_file_test(pathname, G_FILE_TEST_EXISTS)) {
+ ret = true;
+ } else if (g_file_test(pathname, G_FILE_TEST_IS_REGULAR)) {
unlink(pathname);
- ret = TRUE;
+ ret = true;
}
g_free(pathname);
return ret;
}
-static gboolean remove_dir(const char *service_id)
+static bool remove_dir(const char *service_id)
{
gchar *pathname;
- gboolean ret = FALSE;
+ bool ret = false;
pathname = g_strdup_printf("%s/%s", STORAGEDIR, service_id);
- if(pathname == NULL)
- return FALSE;
+ if (!pathname)
+ return false;
- if (g_file_test(pathname, G_FILE_TEST_EXISTS) == FALSE) {
- ret = TRUE;
- } else if (g_file_test(pathname, G_FILE_TEST_IS_DIR) == TRUE) {
+ if (!g_file_test(pathname, G_FILE_TEST_EXISTS)) {
+ ret = true;
+ } else if (g_file_test(pathname, G_FILE_TEST_IS_DIR)) {
rmdir(pathname);
- ret = TRUE;
+ ret = true;
}
g_free(pathname);
return ret;
}
-gboolean __connman_storage_remove_service(const char *service_id)
+bool __connman_storage_remove_service(const char *service_id)
{
- gboolean removed;
+ bool removed;
/* Remove service configuration file */
removed = remove_file(service_id, SETTINGS);
- if (removed == FALSE)
- return FALSE;
+ if (!removed)
+ return false;
/* Remove the statistics file also */
removed = remove_file(service_id, "data");
- if (removed == FALSE)
- return FALSE;
+ if (!removed)
+ return false;
removed = remove_dir(service_id);
- if (removed == FALSE)
- return FALSE;
+ if (!removed)
+ return false;
DBG("Removed service dir %s/%s", STORAGEDIR, service_id);
- return TRUE;
+ return true;
}
GKeyFile *__connman_storage_load_provider(const char *identifier)
@@ -357,7 +357,7 @@ GKeyFile *__connman_storage_load_provider(const char *identifier)
pathname = g_strdup_printf("%s/%s_%s/%s", STORAGEDIR, "provider",
identifier, SETTINGS);
- if (pathname == NULL)
+ if (!pathname)
return NULL;
keyfile = storage_load(pathname);
@@ -372,10 +372,10 @@ void __connman_storage_save_provider(GKeyFile *keyfile, const char *identifier)
dirname = g_strdup_printf("%s/%s_%s", STORAGEDIR,
"provider", identifier);
- if (dirname == NULL)
+ if (!dirname)
return;
- if (g_file_test(dirname, G_FILE_TEST_IS_DIR) == FALSE &&
+ if (!g_file_test(dirname, G_FILE_TEST_IS_DIR) &&
mkdir(dirname, MODE) < 0) {
g_free(dirname);
return;
@@ -388,39 +388,39 @@ void __connman_storage_save_provider(GKeyFile *keyfile, const char *identifier)
g_free(pathname);
}
-static gboolean remove_all(const char *id)
+static bool remove_all(const char *id)
{
- gboolean removed;
+ bool removed;
remove_file(id, SETTINGS);
remove_file(id, "data");
removed = remove_dir(id);
- if (removed == FALSE)
- return FALSE;
+ if (!removed)
+ return false;
- return TRUE;
+ return true;
}
-gboolean __connman_storage_remove_provider(const char *identifier)
+bool __connman_storage_remove_provider(const char *identifier)
{
- gboolean removed;
+ bool removed;
gchar *id;
id = g_strdup_printf("%s_%s", "provider", identifier);
- if (id == NULL)
- return FALSE;
+ if (!id)
+ return false;
- if (remove_all(id) == TRUE)
+ if (remove_all(id))
DBG("Removed provider dir %s/%s", STORAGEDIR, id);
g_free(id);
id = g_strdup_printf("%s_%s", "vpn", identifier);
- if (id == NULL)
- return FALSE;
+ if (!id)
+ return false;
- if ((removed = remove_all(id)) == TRUE)
+ if ((removed = remove_all(id)))
DBG("Removed vpn dir %s/%s", STORAGEDIR, id);
g_free(id);
@@ -441,7 +441,7 @@ gchar **__connman_storage_get_providers(void)
GSList *iter;
dir = opendir(STORAGEDIR);
- if (dir == NULL)
+ if (!dir)
return NULL;
while ((d = readdir(dir))) {
@@ -465,8 +465,8 @@ gchar **__connman_storage_get_providers(void)
closedir(dir);
providers = g_try_new0(char *, num + 1);
- for (iter = list; iter != NULL; iter = g_slist_next(iter)) {
- if (providers != NULL)
+ for (iter = list; iter; iter = g_slist_next(iter)) {
+ if (providers)
providers[i] = iter->data;
else
g_free(iter->data);