From c0528332a1b0ab924721c9d5102eb2c6f68354b6 Mon Sep 17 00:00:00 2001 From: mquinson Date: Sat, 4 Jun 2005 20:37:16 +0000 Subject: [PATCH] type callbacks now get the typedesc they operate on as argument git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1331 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/DataDesc/cbps.c | 10 +++++----- src/gras/DataDesc/datadesc.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c index 9ce129b4f3..a9fb374087 100644 --- a/src/gras/DataDesc/cbps.c +++ b/src/gras/DataDesc/cbps.c @@ -308,31 +308,31 @@ gras_cbps_i_pop(gras_cbps_t ps) { * * Used by \ref gras_datadesc_ref_pop_arr */ -int gras_datadesc_cb_pop(gras_cbps_t vars, void *data) { +int gras_datadesc_cb_pop(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) { return gras_cbps_i_pop(vars); } /** \brief Cb to push an integer. Must be attached to the field you want to push */ -void gras_datadesc_cb_push_int(gras_cbps_t vars, void *data) { +void gras_datadesc_cb_push_int(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) { int *i = (int*)data; gras_cbps_i_push(vars, (int) *i); } /** \brief Cb to push an unsigned integer. Must be attached to the field you want to push */ -void gras_datadesc_cb_push_uint(gras_cbps_t vars, void *data) { +void gras_datadesc_cb_push_uint(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) { unsigned int *i = (unsigned int*)data; gras_cbps_i_push(vars, (int) *i); } /** \brief Cb to push an long integer. Must be attached to the field you want to push */ -void gras_datadesc_cb_push_lint(gras_cbps_t vars, void *data) { +void gras_datadesc_cb_push_lint(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) { long int *i = (long int*)data; gras_cbps_i_push(vars, (int) *i); } /** \brief Cb to push an long integer. Must be attached to the field you want to push */ -void gras_datadesc_cb_push_ulint(gras_cbps_t vars, void *data) { +void gras_datadesc_cb_push_ulint(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) { unsigned long int *i = (unsigned long int*)data; gras_cbps_i_push(vars, (int) *i); } diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c index c16f8e284a..dcb8b9ec21 100644 --- a/src/gras/DataDesc/datadesc.c +++ b/src/gras/DataDesc/datadesc.c @@ -18,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(datadesc,gras,"Data description"); /* callback for array size when sending strings */ static int -_strlen_cb(/*@unused@*/gras_cbps_t vars, void *data) { +_strlen_cb(/*@unused@*/gras_datadesc_type_t type,/*@unused@*/gras_cbps_t vars, void *data) { return 1+(int)strlen(data); } -- 2.20.1