svn commit: r1547869 - /incubator/celix/trunk/framework/private/src/framework.c

[abroekhuis]

Author: abroekhuis
Date: Wed Dec  4 18:18:08 2013
New Revision: 1547869

URL: http://svn.apache.org/r1547869
Log:
CELIX-95: Applied patch and fix a few similar uninitialised issues.

Modified:
    incubator/celix/trunk/framework/private/src/framework.c

Modified: incubator/celix/trunk/framework/private/src/framework.c
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1547869&r1=1547868&r2=1547869&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Wed Dec  4 18:18:08 
2013
@@ -389,7 +389,7 @@ celix_status_t fw_init(framework_pt fram
     status = CELIX_DO_IF(status, bundleContext_create(framework, 
framework->bundle, &context));
     status = CELIX_DO_IF(status, bundle_setContext(framework->bundle, 
context));
     if (status == CELIX_SUCCESS) {
-        activator_pt activator;
+        activator_pt activator = NULL;
         activator = (activator_pt) apr_palloc(framework->mp, 
(sizeof(*activator)));
         if (activator != NULL) {
             bundle_context_pt context = NULL;
@@ -605,7 +605,7 @@ celix_status_t fw_startBundle(framework_
        long refreshCount;
        char *archiveRoot;
        long revisionNumber;
-       activator_pt activator;
+       activator_pt activator = NULL;
        bundle_archive_pt archive = NULL;
        apr_pool_t *bundlePool = NULL;
        char *error = NULL;
@@ -810,7 +810,7 @@ celix_status_t framework_updateBundle(fr
 celix_status_t fw_stopBundle(framework_pt framework, bundle_pt bundle, bool 
record) {
        celix_status_t status = CELIX_SUCCESS;
        bundle_state_e state;
-    activator_pt activator;
+    activator_pt activator = NULL;
     bundle_context_pt context = NULL;
     module_pt module = NULL;
     manifest_pt manifest = NULL;