Unify parameters of forb_sequence_*()

diff --git a/fres/cbroker/fcb.c b/fres/cbroker/fcb.c
index 8cebbf670eca312a1daece35924ef829c5c5e940..f34d47f003ad5348d4667957410bfd65c26622ef 100644 (file)
--- a/fres/cbroker/fcb.c
+++ b/fres/cbroker/fcb.c
@@ -428,7 +428,7 @@ rebalance_spare_capacity_and_reserve(struct resource *resource,
        fres_block_spare_capacity *s;
 
        fres_contract_ptr_seq contracts;
-       if (!forb_sequence_alloc_buf(contracts, rl->length)) {
+       if (!forb_sequence_alloc_buf(&contracts, rl->length)) {
                return errno;
        }
        contracts._length = rl->length;
@@ -441,7 +441,7 @@ rebalance_spare_capacity_and_reserve(struct resource *resource,
                        NULL;
                assert(fc->to_be_reserved_contract != NULL);
 
-               forb_sequence_elem(contracts, i) = fc->to_be_reserved_contract;
+               forb_sequence_elem(&contracts, i) = fc->to_be_reserved_contract;
                i++;
                
                s = fres_contract_get_spare_capacity(fc->to_be_reserved_contract);
@@ -466,7 +466,7 @@ rebalance_spare_capacity_and_reserve(struct resource *resource,
                        /* TODO: Simulate continuous granularity by discretization */
                        if (s && s->granularity == FRSH_GR_DISCRETE) {
                                fres_container_copy(fc->to_be_reserved_contract->container,
-                                                   forb_sequence_elem(s->variants, fc->sc_variant.try));
+                                                   forb_sequence_elem(&s->variants, fc->sc_variant.try));
                                criterion += fc->sc_variant.try;
 
                                if (fcb_changed == NULL) {
@@ -524,7 +524,7 @@ err:
                fres_contract_destroy(fc->to_be_reserved_contract);
                fc->to_be_reserved_contract = NULL;
        }
-       forb_sequence_free_buf(contracts, forb_no_destructor);
+       forb_sequence_free_buf(&contracts, forb_no_destructor);
        return ret;
 }
 
@@ -545,7 +545,7 @@ change_vreses(struct fcb *fcb, fres_contract_ptr_seq *schedulable_contracts)
        int i, ret = 0;
        CORBA_Environment ev;
        
-       if (!forb_sequence_alloc_buf(vreses, schedulable_contracts->_length)) {
+       if (!forb_sequence_alloc_buf(&vreses, schedulable_contracts->_length)) {
                return errno;
        }
        vreses._length = 0;
@@ -587,7 +587,7 @@ change_vreses(struct fcb *fcb, fres_contract_ptr_seq *schedulable_contracts)
                        ret = fres_forbex2err(&ev);
        }
 err:
-       forb_sequence_free_buf(vreses, forb_no_destructor);
+       forb_sequence_free_buf(&vreses, forb_no_destructor);
        return ret;
 }
 
@@ -637,7 +637,7 @@ negotiate_contracts(fres_contract_broker obj,
        /* Allocate all the needed memory before doing reservation. If
         * there is no enough memory, it has no sense to call resource
         * manager. */
-       if (!forb_sequence_alloc_buf(commit_ids, rl.length)) {
+       if (!forb_sequence_alloc_buf(&commit_ids, rl.length)) {
                ret = errno;
                goto err_free_fcb_contracts;
        }
@@ -659,7 +659,7 @@ negotiate_contracts(fres_contract_broker obj,
        commit_ids._length = rl.length;
        i=0;
        ul_list_for_each(reservation_list, &rl, fc) {
-               forb_sequence_elem(commit_ids, i) = fc->id;
+               forb_sequence_elem(&commit_ids, i) = fc->id;
                i++;
        }
        
@@ -706,14 +706,14 @@ negotiate_contracts(fres_contract_broker obj,
 
 
        /* Return IDs and delete canceled contracts from out database */
-       if (!forb_sequence_alloc_buf(**ids_out, contracts->_length)) {
+       if (!forb_sequence_alloc_buf(*ids_out, contracts->_length)) {
                ev->major = FORB_EX_NO_MEMORY;
                goto err_cancel_contracts;
        }
        (*ids_out)->_length = contracts->_length;
        for (i=0; i<contracts->_length; i++) {
                struct fcb_contract *fc =  fcb_contracts[i];
-               forb_sequence_elem(**ids_out, i) = fc->id;
+               forb_sequence_elem(*ids_out, i) = fc->id;
 
                if (fc->requested_contract &&
                    fres_contract_get_num_blocks(fc->requested_contract) == 0) {

diff --git a/fres/contract/fres_container.c b/fres/contract/fres_container.c
index c3656bcfb87aa062a4d502d7db108ffef39f6ab8..dfee5d5223d1c58d67d78aa1e393bd79b798adb0 100644 (file)
--- a/fres/contract/fres_container.c
+++ b/fres/contract/fres_container.c
@@ -160,7 +160,7 @@ int fres_block_spare_capacity_to_string(char *dest, size_t size, enum fres_block
                dest += ret;
                size -= ret;
                ret = fres_container_to_string(tmp, sizeof(tmp),
-                                              forb_sequence_elem(s->variants, i));
+                                              forb_sequence_elem(&s->variants, i));
                ret = fres_indent_str(dest, size, tmp, 2);
                dest += ret;
                size -= ret;

diff --git a/frsh_api/frsh_spare_capacity.c b/frsh_api/frsh_spare_capacity.c
index 77b5bb113fd31cdcb22e16e0d76d89d0e0e657e1..fb3efff088cffe4a12c37194d49f53c0a58d209e 100644 (file)
--- a/frsh_api/frsh_spare_capacity.c
+++ b/frsh_api/frsh_spare_capacity.c
@@ -103,7 +103,7 @@ int frsh_contract_set_reclamation_params
 
        if (utilization_set) {
                int i;
-               if (!forb_sequence_alloc_buf(s->variants, utilization_set->size)) {
+               if (!forb_sequence_alloc_buf(&s->variants, utilization_set->size)) {
                        goto err;
                }
                for (i=0; i<utilization_set->size; i++) {
@@ -138,7 +138,7 @@ int frsh_contract_set_reclamation_params
 
                        ret = fres_container_add_timing_reqs(c, t);
 
-                       forb_sequence_elem(s->variants, i) = c;
+                       forb_sequence_elem(&s->variants, i) = c;
                        continue;
                err_ut:
                        fres_container_destroy(c);
@@ -162,7 +162,7 @@ int frsh_contract_set_reclamation_params
 
        return FRSH_NO_ERROR;
 err:
-       forb_sequence_free_buf(s->variants, forb_no_destructor);
+       forb_sequence_free_buf(&s->variants, forb_no_destructor);
        free(s);
        return errno;
 }