d_data = calloc(1, sizeof(ttd_data));
ttd_log_init(TTD_LOG_TYPE_ALL);
+ ttd_config_init();
d_data->mainloop = g_main_loop_new(NULL, FALSE);
vconf_notify_key_changed(VCONFKEY_SYSTEM_TIME_CHANGED, __system_time_changed, d_data);
- ttd_conn_mgr_init();
ttd_http_init();
+ ttd_conn_mgr_init();
+
ttd_cloud_conn_state_set(TTD_CLOUD_CONN_STATE_DISCONNECTED);
ttd_worker_interface_init(&(d_data->worker_itf_h));
ttd_conn_mgr_fini();
ttd_http_fini();
-
+ ttd_config_fini();
ttd_log_fini();
return 0;
#define CONF_FILE_NAME "ttd.conf"
#define CONF_PATH tzplatform_mkpath3(TZ_SYS_ETC, "ttd", "ttd.conf")
-GKeyFile *gkf = NULL;
-int is_initialized = 0;
+static GKeyFile *gkf = NULL;
int ttd_config_init(void)
{
- gkf = g_key_file_new();
- retv_if(!gkf, -1);
+ GKeyFile *tmp_gkf = NULL;
+ tmp_gkf = g_key_file_new();
+ retv_if(!tmp_gkf, -1);
- if (!g_key_file_load_from_file(gkf, CONF_PATH, G_KEY_FILE_NONE, NULL)) {
+ if (!g_key_file_load_from_file(tmp_gkf, CONF_PATH, G_KEY_FILE_NONE, NULL)) {
_E("Failed to load conf file");
- ttd_config_fini();
+ g_key_file_free(tmp_gkf);
return -1;
}
-
- is_initialized = 1;
-
+ gkf = tmp_gkf;
return 0;
}
{
if (gkf)
g_key_file_free(gkf);
+
+ gkf = NULL;
}
int ttd_config_read_integer(const char *group, const char *key, int *value)
retv_if(!group, -1);
retv_if(!key, -1);
+ retv_if(!value, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;
retv_if(!group, -1);
retv_if(!key, -1);
+ retv_if(!value, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;
retv_if(!group, -1);
retv_if(!key, -1);
+ retv_if(!value, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;
{
retv_if(!group, -1);
retv_if(!key, -1);
- retv_if(!value, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;
{
retv_if(!group, -1);
retv_if(!key, -1);
- retv_if(!value, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;
retv_if(!key, -1);
retv_if(!value, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;
retv_if(!group, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;
gboolean ret = FALSE;
GError *error = NULL;
+ retv_if(!group, -1);
retv_if(!key, -1);
- if (!is_initialized) {
+ if (!gkf) {
if (ttd_config_init() < 0) {
_E("Failed to initialize configure");
return -1;