From 73b0d555ddb9b47398caf81758e0acbb0ec21652 Mon Sep 17 00:00:00 2001 From: Hyungdeuk Kim Date: Tue, 24 Sep 2013 19:20:30 +0900 Subject: [PATCH] remove no meaningful initialized check code --- packaging/vconf.spec | 8 ++++---- vconf-init | 2 +- vconf.c | 13 +++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/packaging/vconf.spec b/packaging/vconf.spec index b43b649..a1a4552 100755 --- a/packaging/vconf.spec +++ b/packaging/vconf.spec @@ -1,6 +1,6 @@ Name: vconf Summary: Configuration system library -Version: 0.2.50 +Version: 0.2.51 Release: 1 Group: System/Libraries License: Apache License, Version 2.0 @@ -57,8 +57,8 @@ ln -sf /etc/rc.d/init.d/vconf-init %{buildroot}/etc/rc.d/rc3.d/S04vconf-init ln -sf /etc/rc.d/init.d/vconf-init %{buildroot}/etc/rc.d/rc4.d/S04vconf-init mkdir -p %{buildroot}/opt/var/kdb/db mkdir -p %{buildroot}/opt/var/kdb/db/.backup -mkdir -p %{buildroot}/tmp -touch %{buildroot}/tmp/vconf-initialized +#mkdir -p %{buildroot}/tmp +#touch %{buildroot}/tmp/vconf-initialized mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/basic.target.wants mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d install -m0644 %SOURCE1 %{buildroot}%{_prefix}/lib/systemd/system/ @@ -87,7 +87,7 @@ systemctl daemon-reload %{_libdir}/*.so.* %dir %attr(777,root,root) /opt/var/kdb/db %dir %attr(777,root,root) /opt/var/kdb/db/.backup -/tmp/vconf-initialized +#/tmp/vconf-initialized %{_prefix}/lib/systemd/system/basic.target.wants/vconf-setup.service %{_prefix}/lib/systemd/system/vconf-setup.service %{_prefix}/lib/tmpfiles.d/vconf-setup.conf diff --git a/vconf-init b/vconf-init index c14a7c5..56ce024 100755 --- a/vconf-init +++ b/vconf-init @@ -8,4 +8,4 @@ set -e cp -a /opt/var/kdb/memory_init/memory/* /var/run/memory find /opt/var/kdb/memory_init/memory/ -type d -print0 | xargs -0 chsmack -t -touch /tmp/vconf-initialized +#touch /tmp/vconf-initialized diff --git a/vconf.c b/vconf.c index 3865182..aa09a61 100755 --- a/vconf.c +++ b/vconf.c @@ -1037,10 +1037,12 @@ static int _vconf_set_key_filesys(keynode_t *keynode, int prefix) ret = _vconf_get_key_path(keynode->keyname, path); retv_if(ret != VCONF_OK, ret); +#ifdef VCONF_CHECK_IS_INITIALIZED if(prefix == VCONF_BACKEND_MEMORY && VCONF_NOT_INITIALIZED) { func_ret = VCONF_ERROR_NOT_INITIALIZED; goto out_return; } +#endif #ifdef VCONF_USE_BACKUP_TRANSACTION if(prefix == VCONF_BACKEND_DB && keynode->type == VCONF_TYPE_STRING) { @@ -1216,12 +1218,17 @@ static int _vconf_set_key(keynode_t *keynode) is_busy_err = 0; retry++; +#ifdef VCONF_CHECK_INITIALIZED if(VCONF_NOT_INITIALIZED) { ERR("%s : vconf is not initialized\n", keynode->keyname); is_busy_err = 1; } else if(ret == VCONF_ERROR_FILE_OPEN) +#else + + if(ret == VCONF_ERROR_FILE_OPEN) +#endif { switch (errno) { @@ -1707,11 +1714,13 @@ static int _vconf_get_key_filesys(keynode_t *keynode, int prefix) ret = _vconf_get_key_path(keynode->keyname, path); retv_if(ret != VCONF_OK, ret); +#ifdef VCONF_CHECK_INITIALIZED if(prefix == VCONF_BACKEND_MEMORY && VCONF_NOT_INITIALIZED) { func_ret = VCONF_ERROR_NOT_INITIALIZED; goto out_return; } +#endif #ifdef VCONF_USE_BACKUP_TRANSACTION if(prefix == VCONF_BACKEND_DB) { @@ -1907,12 +1916,16 @@ int _vconf_get_key(keynode_t *keynode) is_busy_err = 0; retry++; +#ifdef VCONF_CHECK_INITIALIZED if(VCONF_NOT_INITIALIZED) { ERR("%s : vconf is not initialized\n", keynode->keyname); is_busy_err = 1; } else if(ret == VCONF_ERROR_FILE_OPEN) +#else + if(ret == VCONF_ERROR_FILE_OPEN) +#endif { switch (errno) { -- 1.7.9.5