Updated after rename of forb_exception_occurred()

diff --git a/fres/cbroker/fcb.c b/fres/cbroker/fcb.c
index 162b2223b375c56b98d86ae534904fc73768bed6..627ff5840baee9a8d8569dec23bc252fa96f94d2 100644 (file)
--- a/fres/cbroker/fcb.c
+++ b/fres/cbroker/fcb.c
@@ -208,7 +208,7 @@ negotiate_contract(fres_contract_broker obj,
        contract_seq_buf = contract;
        contracts._buffer = &contract_seq_buf;
        ret = fres_resource_manager_reserve_contracts(rm->rm, &contracts, ev);
-       if (forb_exception_occured(ev) || ret < 0) {
+       if (forb_exception_occurred(ev) || ret < 0) {
                goto err;
        }
        if (ret == 1) {
@@ -220,7 +220,7 @@ negotiate_contract(fres_contract_broker obj,
        ids._length = ids._maximum = 1;
        ids._buffer = id;
        fres_resource_manager_commit_contracts(rm->rm, &ids, &schedulable_contracts, ev);
-       if (forb_exception_occured(ev)) {
+       if (forb_exception_occurred(ev)) {
                goto err;
        }
 
@@ -234,7 +234,7 @@ negotiate_contract(fres_contract_broker obj,
                forb_free(schedulable_contracts->_buffer);
        }
        forb_free(schedulable_contracts);
-       if (forb_exception_occured(ev)) {
+       if (forb_exception_occurred(ev)) {
                goto err;
        }
        if (ret != 0) {

diff --git a/fres/resmng/frm_generic.c b/fres/resmng/frm_generic.c
index db3266fdd8f6c94f135663c5754ee3b1ae96c5a8..8ee93178923e94d0b565bdfb50885d19349c8bd6 100644 (file)
--- a/fres/resmng/frm_generic.c
+++ b/fres/resmng/frm_generic.c
@@ -226,7 +226,7 @@ fres_resource_manager frm_register(forb_orb orb, struct frm_data *frm_data,
                                                     desc->res_type,
                                                     desc->res_id,
                                                     &res_desc, &env);
-       if (forb_exception_occured(&env) || ret != 0) {
+       if (forb_exception_occurred(&env) || ret != 0) {
                save_errno(ul_logerr("fres_contract_broker_register_resource exception\n"));
                goto err_register;
        }

diff --git a/fres/ressched/frs_generic.c b/fres/ressched/frs_generic.c
index 6c02236f7ae44aed092bef1ec58cadd077b2449f..236994d5a5cf39eeaa4cd2620e4eca35194f73ad 100644 (file)
--- a/fres/ressched/frs_generic.c
+++ b/fres/ressched/frs_generic.c
@@ -244,7 +244,7 @@ int frs_register(forb_orb orb,
                                                      scheduler->res_type,
                                                      scheduler->res_id,
                                                      frs, &env);
-       if (forb_exception_occured(&env) || ret != 0) {
+       if (forb_exception_occurred(&env) || ret != 0) {
                goto err_release;
        }
        return 0;

diff --git a/frsh_api/frsh_contract.c b/frsh_api/frsh_contract.c
index 2c6e7906584190d34b563aaff7466e7165a35ccd..825b4bf2cb103d592329fe480fbf42dc1af9fdc1 100644 (file)
--- a/frsh_api/frsh_contract.c
+++ b/frsh_api/frsh_contract.c
@@ -166,7 +166,7 @@ int frsh_contract_negotiate
        ret = fres_contract_broker_negotiate_contract(frsh_forb_global.fcb,
                                                      *contract,
                                                      &id, &env);
-       if (forb_exception_occured(&env)) {
+       if (forb_exception_occurred(&env)) {
                ret = FRES_ERR_FORB_EXCEPTION;
        }
 

diff --git a/resources/item/frs_item.c b/resources/item/frs_item.c
index 83f73bda9c78fe1287e24ad9fdee877db4fe7d0d..f80ecf3350e98c8f6a138d5b93deebb3f75ef074 100644 (file)
--- a/resources/item/frs_item.c
+++ b/resources/item/frs_item.c
@@ -22,7 +22,7 @@ static int create_vres(fres_vres_t *vres, void *priv)
        if (!nodes) return FRES_ERR_NEEDS_MORE_DATA_IN_CONTRACT;
        
        ret = fres_item_scheduler_add_nodes(item->scheduler, nodes->mask, &env);
-       if (forb_exception_occured(&env)) return FRES_ERR_FORB_EXCEPTION;
+       if (forb_exception_occurred(&env)) return FRES_ERR_FORB_EXCEPTION;
        if (ret) return ret;
        return 0;
 }
@@ -38,7 +38,7 @@ static int cancel_vres(fres_vres_t *vres, void *priv)
        if (!nodes) return FRES_ERR_NEEDS_MORE_DATA_IN_CONTRACT;
        
        ret = fres_item_scheduler_del_nodes(item->scheduler, nodes->mask, &env);
-       if (forb_exception_occured(&env)) return FRES_ERR_FORB_EXCEPTION;
+       if (forb_exception_occurred(&env)) return FRES_ERR_FORB_EXCEPTION;
        if (ret) return ret;
        return 0;
 }