From 67e4fc38bc84c79c863cfc7c14ea500de5a8a413 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 12 Dec 2008 17:39:09 +0100 Subject: [PATCH] Updated to the changed prototype of fra_register() --- fwp/lib/frsh_fwp/fwp_fna.c | 3 +-- fwp/lib/frsh_fwp/fwp_fra.c | 4 ++-- fwp/lib/frsh_fwp/fwp_res.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fwp/lib/frsh_fwp/fwp_fna.c b/fwp/lib/frsh_fwp/fwp_fna.c index 986a955..ca7a4ab 100644 --- a/fwp/lib/frsh_fwp/fwp_fna.c +++ b/fwp/lib/frsh_fwp/fwp_fna.c @@ -58,8 +58,7 @@ int fwp_fna_init(const frsh_resource_id_t resource_id) if ((rv = fwp_init())) return rv; - return fra_fwp_init(frsh_forb_global.orb, frsh_forb_global.fcb, - &frsh_forb_global.alloc_executor); + return fra_fwp_init(); } int fwp_fna_network_budget_to_bytes(const frsh_resource_id_t resource_id, diff --git a/fwp/lib/frsh_fwp/fwp_fra.c b/fwp/lib/frsh_fwp/fwp_fra.c index ce50301..a0e3d55 100644 --- a/fwp/lib/frsh_fwp/fwp_fra.c +++ b/fwp/lib/frsh_fwp/fwp_fra.c @@ -119,8 +119,8 @@ static struct fres_allocator fwp_allocator = { .priv = NULL }; -int fra_fwp_init(forb_orb orb, fres_contract_broker fcb, forb_executor_t *executor) +int fra_fwp_init(void) { fres_block_register_fwp(); - return fra_register(orb, fcb, executor, &fwp_allocator); + return fra_register(&fwp_allocator); } diff --git a/fwp/lib/frsh_fwp/fwp_res.h b/fwp/lib/frsh_fwp/fwp_res.h index 46a9fd5..fd08797 100644 --- a/fwp/lib/frsh_fwp/fwp_res.h +++ b/fwp/lib/frsh_fwp/fwp_res.h @@ -51,7 +51,7 @@ #include #include "fwp_idl.h" -int fra_fwp_init(forb_orb orb, fres_contract_broker fcb, forb_executor_t *executor); +int fra_fwp_init(); int fres_block_register_fwp(); #endif /* FWP_RES_H */ -- 2.39.2