Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A8AF717921 for ; Sun, 19 Oct 2014 15:59:40 +0000 (UTC) Received: (qmail 15796 invoked by uid 500); 19 Oct 2014 15:59:40 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 15768 invoked by uid 500); 19 Oct 2014 15:59:40 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 15759 invoked by uid 99); 19 Oct 2014 15:59:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Oct 2014 15:59:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Oct 2014 15:59:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8C6EB23889BB; Sun, 19 Oct 2014 15:59:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1632950 - in /celix/trunk: examples/hello_world/private/src/ examples/hello_world_test/private/src/ examples/osgi-in-action/chapter04-correct-lookup/private/src/ framework/private/src/ log_service/private/src/ Date: Sun, 19 Oct 2014 15:59:16 -0000 To: commits@celix.apache.org From: bpetri@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141019155916.8C6EB23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bpetri Date: Sun Oct 19 15:59:15 2014 New Revision: 1632950 URL: http://svn.apache.org/r1632950 Log: minor fixes Modified: celix/trunk/examples/hello_world/private/src/activator.c celix/trunk/examples/hello_world_test/private/src/activator.c celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c celix/trunk/framework/private/src/service_registration.c celix/trunk/log_service/private/src/log_factory.c Modified: celix/trunk/examples/hello_world/private/src/activator.c URL: http://svn.apache.org/viewvc/celix/trunk/examples/hello_world/private/src/activator.c?rev=1632950&r1=1632949&r2=1632950&view=diff ============================================================================== --- celix/trunk/examples/hello_world/private/src/activator.c (original) +++ celix/trunk/examples/hello_world/private/src/activator.c Sun Oct 19 15:59:15 2014 @@ -44,7 +44,7 @@ celix_status_t bundleActivator_create(bu } else { status = CELIX_START_ERROR; } - return CELIX_SUCCESS; + return status; } celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) { Modified: celix/trunk/examples/hello_world_test/private/src/activator.c URL: http://svn.apache.org/viewvc/celix/trunk/examples/hello_world_test/private/src/activator.c?rev=1632950&r1=1632949&r2=1632950&view=diff ============================================================================== --- celix/trunk/examples/hello_world_test/private/src/activator.c (original) +++ celix/trunk/examples/hello_world_test/private/src/activator.c Sun Oct 19 15:59:15 2014 @@ -44,7 +44,7 @@ celix_status_t bundleActivator_create(bu } else { status = CELIX_START_ERROR; } - return CELIX_SUCCESS; + return status; } celix_status_t bundleActivator_start(void * userData, bundle_context_pt context) { Modified: celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c URL: http://svn.apache.org/viewvc/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c?rev=1632950&r1=1632949&r2=1632950&view=diff ============================================================================== --- celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c (original) +++ celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/private/src/activator.c Sun Oct 19 15:59:15 2014 @@ -124,11 +124,10 @@ void *APR_THREAD_FUNC LogServiceTest(apr void startTestThread(thread_data_pt data) { apr_pool_t *pool; - int rc; // start separate worker thread to run the actual tests, managed by the bundle lifecycle bundleContext_getMemoryPool(data->m_context, &pool); data->threadId++; - rc = apr_thread_create(&m_logTestThread, NULL, LogServiceTest, data, pool); + apr_thread_create(&m_logTestThread, NULL, LogServiceTest, data, pool); } void stopTestThread() { Modified: celix/trunk/framework/private/src/service_registration.c URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/src/service_registration.c?rev=1632950&r1=1632949&r2=1632950&view=diff ============================================================================== --- celix/trunk/framework/private/src/service_registration.c (original) +++ celix/trunk/framework/private/src/service_registration.c Sun Oct 19 15:59:15 2014 @@ -80,7 +80,7 @@ celix_status_t serviceRegistration_creat status = CELIX_ENOMEM; } - return CELIX_SUCCESS; + return status; } celix_status_t serviceRegistration_destroy(service_registration_pt registration) { Modified: celix/trunk/log_service/private/src/log_factory.c URL: http://svn.apache.org/viewvc/celix/trunk/log_service/private/src/log_factory.c?rev=1632950&r1=1632949&r2=1632950&view=diff ============================================================================== --- celix/trunk/log_service/private/src/log_factory.c (original) +++ celix/trunk/log_service/private/src/log_factory.c Sun Oct 19 15:59:15 2014 @@ -55,7 +55,7 @@ celix_status_t logFactory_create(apr_poo } } - return CELIX_SUCCESS; + return status; } celix_status_t logFactory_getService(void *factory, bundle_pt bundle, service_registration_pt registration, void **service) {