This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/509-remove-osgi-defines
in repository https://gitbox.apache.org/repos/asf/celix.git

commit e9efed7dab133116e01339be5946f55f8429276d
Author: Pepijn Noltes <[email protected]>
AuthorDate: Sun Oct 29 14:27:37 2023 +0100

    #509: Refactor get config property utils functions in bundle cache
---
 libs/framework/src/celix_bundle_cache.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/libs/framework/src/celix_bundle_cache.c 
b/libs/framework/src/celix_bundle_cache.c
index 8a746e81..d1917e2d 100644
--- a/libs/framework/src/celix_bundle_cache.c
+++ b/libs/framework/src/celix_bundle_cache.c
@@ -67,30 +67,24 @@ static const char* bundleCache_progamName() {
 }
 
 static const char* celix_bundleCache_cacheDirPath(celix_framework_t* fw) {
-    bool found = false;
-    const char* cacheDir = celix_framework_getConfigProperty(fw,
+    return celix_framework_getConfigProperty(fw,
                                                              
CELIX_FRAMEWORK_CACHE_DIR,
                                                              
CELIX_FRAMEWORK_CACHE_DIR_DEFAULT,
-                                                             &found);
-    return cacheDir;
+                                                             NULL);
 }
 
 static bool celix_bundleCache_useTmpDir(celix_framework_t* fw) {
-    bool converted = false;
-    bool useTmp = celix_framework_getConfigPropertyAsBool(fw,
+    return celix_framework_getConfigPropertyAsBool(fw,
                                                           
CELIX_FRAMEWORK_CACHE_USE_TMP_DIR,
                                                           
CELIX_FRAMEWORK_CACHE_USE_TMP_DIR_DEFAULT,
-                                                          &converted);
-    return useTmp;
+                                                          NULL);
 }
 
 static bool celix_bundleCache_cleanOnCreate(celix_framework_t* fw) {
-    bool converted = false;
-    bool cleanOnCreate = celix_framework_getConfigPropertyAsBool(fw,
+    return celix_framework_getConfigPropertyAsBool(fw,
                                                                  
CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE,
                                                                  
CELIX_FRAMEWORK_CLEAN_CACHE_DIR_ON_CREATE_DEFAULT,
-                                                                 &converted);
-    return cleanOnCreate;
+                                                                 NULL);
 }
 
 celix_status_t celix_bundleCache_create(celix_framework_t* fw, 
celix_bundle_cache_t** out) {

Reply via email to