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 DA84117592 for ; Sun, 15 Feb 2015 18:34:56 +0000 (UTC) Received: (qmail 82935 invoked by uid 500); 15 Feb 2015 18:34:56 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 82906 invoked by uid 500); 15 Feb 2015 18:34:56 -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 82897 invoked by uid 99); 15 Feb 2015 18:34:56 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Feb 2015 18:34:56 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 9D130AC006D for ; Sun, 15 Feb 2015 18:34:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1659969 - in /celix/trunk/dependency_manager_2/private/src: dm_activator_base.c dm_component_impl.c dm_dependency_manager_impl.c Date: Sun, 15 Feb 2015 18:34:56 -0000 To: commits@celix.apache.org From: bpetri@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150215183456.9D130AC006D@hades.apache.org> Author: bpetri Date: Sun Feb 15 18:34:55 2015 New Revision: 1659969 URL: http://svn.apache.org/r1659969 Log: CELIX-226: replace __unused attribute Modified: celix/trunk/dependency_manager_2/private/src/dm_activator_base.c celix/trunk/dependency_manager_2/private/src/dm_component_impl.c celix/trunk/dependency_manager_2/private/src/dm_dependency_manager_impl.c Modified: celix/trunk/dependency_manager_2/private/src/dm_activator_base.c URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/private/src/dm_activator_base.c?rev=1659969&r1=1659968&r2=1659969&view=diff ============================================================================== --- celix/trunk/dependency_manager_2/private/src/dm_activator_base.c (original) +++ celix/trunk/dependency_manager_2/private/src/dm_activator_base.c Sun Feb 15 18:34:55 2015 @@ -70,7 +70,7 @@ celix_status_t bundleActivator_start(voi return status; } -celix_status_t bundleActivator_stop(void * userData, bundle_context_pt __unused context) { +celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context __attribute__((unused))) { celix_status_t status = CELIX_SUCCESS; dependency_activator_base_pt dependency_activator = (dependency_activator_base_pt) userData; @@ -84,7 +84,7 @@ celix_status_t bundleActivator_stop(void return status; } -celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt __unused context) { +celix_status_t bundleActivator_destroy(void * userData, bundle_context_pt context __attribute__((unused))) { celix_status_t status = CELIX_SUCCESS; dependency_activator_base_pt dependency_activator = (dependency_activator_base_pt) userData; Modified: celix/trunk/dependency_manager_2/private/src/dm_component_impl.c URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/private/src/dm_component_impl.c?rev=1659969&r1=1659968&r2=1659969&view=diff ============================================================================== --- celix/trunk/dependency_manager_2/private/src/dm_component_impl.c (original) +++ celix/trunk/dependency_manager_2/private/src/dm_component_impl.c Sun Feb 15 18:34:55 2015 @@ -51,11 +51,11 @@ struct dm_handle_event_type { typedef struct dm_handle_event_type *dm_handle_event_type_pt; -static celix_status_t executor_runTasks(dm_executor_pt executor, pthread_t __unused currentThread); +static celix_status_t executor_runTasks(dm_executor_pt executor, pthread_t currentThread __attribute__((unused))); static celix_status_t executor_execute(dm_executor_pt executor); static celix_status_t executor_executeTask(dm_executor_pt executor, dm_component_pt component, void (*command), void *data); static celix_status_t executor_schedule(dm_executor_pt executor, dm_component_pt component, void (*command), void *data); -static celix_status_t executor_create(dm_component_pt __unused component, dm_executor_pt *executor); +static celix_status_t executor_create(dm_component_pt component __attribute__((unused)), dm_executor_pt *executor); static celix_status_t executor_destroy(dm_executor_pt *executor); static celix_status_t component_destroyComponent(dm_component_pt component); @@ -72,11 +72,11 @@ static celix_status_t component_allRequi static celix_status_t component_performTransition(dm_component_pt component, dm_component_state_pt oldState, dm_component_state_pt newState, bool *transition); static celix_status_t component_calculateNewState(dm_component_pt component, dm_component_state_pt currentState, dm_component_state_pt *newState); static celix_status_t component_handleChange(dm_component_pt component); -static celix_status_t component_startDependencies(dm_component_pt __unused component, array_list_pt dependencies); +static celix_status_t component_startDependencies(dm_component_pt component __attribute__((unused)), array_list_pt dependencies); static celix_status_t component_addTask(dm_component_pt component, array_list_pt dependencies); -static celix_status_t component_startTask(dm_component_pt component, void __unused * data); -static celix_status_t component_stopTask(dm_component_pt component, void __unused * data); +static celix_status_t component_startTask(dm_component_pt component, void * data __attribute__((unused))); +static celix_status_t component_stopTask(dm_component_pt component, void * data __attribute__((unused))); static celix_status_t component_removeTask(dm_component_pt component, dm_service_dependency_pt dependency); static celix_status_t component_handleEventTask(dm_component_pt component, dm_handle_event_type_pt data); @@ -243,7 +243,7 @@ celix_status_t component_start(dm_compon return status; } -celix_status_t component_startTask(dm_component_pt component, void __unused *data) { +celix_status_t component_startTask(dm_component_pt component, void *data __attribute__((unused))) { celix_status_t status = CELIX_SUCCESS; component->isStarted = true; @@ -262,7 +262,7 @@ celix_status_t component_stop(dm_compone return status; } -celix_status_t component_stopTask(dm_component_pt component, void __unused *data) { +celix_status_t component_stopTask(dm_component_pt component, void *data __attribute__((unused))) { celix_status_t status = CELIX_SUCCESS; component->isStarted = false; @@ -506,7 +506,7 @@ celix_status_t component_handleSwapped(d return status; } -celix_status_t component_startDependencies(dm_component_pt __unused component, array_list_pt dependencies) { +celix_status_t component_startDependencies(dm_component_pt component __attribute__((unused)), array_list_pt dependencies) { celix_status_t status = CELIX_SUCCESS; array_list_pt required_dependencies = NULL; arrayList_create(&required_dependencies); @@ -992,7 +992,7 @@ celix_status_t component_getBundleContex } -celix_status_t executor_create(dm_component_pt __unused component, dm_executor_pt *executor) { +celix_status_t executor_create(dm_component_pt component __attribute__((unused)), dm_executor_pt *executor) { celix_status_t status = CELIX_SUCCESS; *executor = malloc(sizeof(**executor)); @@ -1083,7 +1083,7 @@ celix_status_t executor_execute(dm_execu return status; } -celix_status_t executor_runTasks(dm_executor_pt executor, pthread_t __unused currentThread) { +celix_status_t executor_runTasks(dm_executor_pt executor, pthread_t currentThread __attribute__((unused))) { celix_status_t status = CELIX_SUCCESS; // bool execute = false; Modified: celix/trunk/dependency_manager_2/private/src/dm_dependency_manager_impl.c URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/private/src/dm_dependency_manager_impl.c?rev=1659969&r1=1659968&r2=1659969&view=diff ============================================================================== --- celix/trunk/dependency_manager_2/private/src/dm_dependency_manager_impl.c (original) +++ celix/trunk/dependency_manager_2/private/src/dm_dependency_manager_impl.c Sun Feb 15 18:34:55 2015 @@ -38,7 +38,7 @@ struct dm_dependency_manager { pthread_mutex_t mutex; }; -celix_status_t dependencyManager_create(bundle_context_pt __unused context, dm_dependency_manager_pt *manager) { +celix_status_t dependencyManager_create(bundle_context_pt context __attribute__((unused)), dm_dependency_manager_pt *manager) { celix_status_t status = CELIX_ENOMEM; (*manager) = calloc(1, sizeof(**manager));