A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
infrastructure
[simgrid.git]
/
src
/
gras
/
DataDesc
/
cbps.c
diff --git
a/src/gras/DataDesc/cbps.c
b/src/gras/DataDesc/cbps.c
index
7cb4252
..
a9fb374
100644
(file)
--- a/
src/gras/DataDesc/cbps.c
+++ b/
src/gras/DataDesc/cbps.c
@@
-29,7
+29,7
@@
typedef struct s_gras_cbps {
static void free_string(void *d);
static void free_string(void *d){
static void free_string(void *d);
static void free_string(void *d){
-
xbt_
free(*(void**)d);
+ free(*(void**)d);
}
gras_cbps_t gras_cbps_new(void) {
}
gras_cbps_t gras_cbps_new(void) {
@@
-57,7
+57,7
@@
void gras_cbps_free(gras_cbps_t *state) {
xbt_dynar_free( &( (*state)->frames ) );
xbt_dynar_free( &( (*state)->globals ) );
xbt_dynar_free( &( (*state)->frames ) );
xbt_dynar_free( &( (*state)->globals ) );
-
xbt_
free(*state);
+ free(*state);
*state = NULL;
}
*state = NULL;
}
@@
-138,7
+138,7
@@
gras_cbps_v_pop (gras_cbps_t ps,
*ddt = var->type;
data = var->data;
*ddt = var->type;
data = var->data;
-
xbt_
free(var);
+ free(var);
xbt_dynar_pop(ps->frames, &frame);
{
xbt_dynar_pop(ps->frames, &frame);
{
@@
-150,7
+150,7
@@
gras_cbps_v_pop (gras_cbps_t ps,
_name = xbt_dynar_get_as(frame, l, char*);
if (!strcmp(name, _name)) {
xbt_dynar_remove_at(frame, l, &_name);
_name = xbt_dynar_get_as(frame, l, char*);
if (!strcmp(name, _name)) {
xbt_dynar_remove_at(frame, l, &_name);
-
xbt_
free(_name);
+ free(_name);
break;
}
}
break;
}
}
@@
-276,9
+276,9
@@
gras_cbps_block_end(gras_cbps_t ps) {
xbt_dynar_free_container(&varstack); /*already empty, save a test ;) */
}
xbt_dynar_free_container(&varstack); /*already empty, save a test ;) */
}
- if (var->data)
xbt_
free(var->data);
-
xbt_
free(var);
-
xbt_
free(name);
+ if (var->data) free(var->data);
+ free(var);
+ free(name);
}
xbt_dynar_free_container(&frame);/* we just emptied it */
DEBUG0("<<< Block end");
}
xbt_dynar_free_container(&frame);/* we just emptied it */
DEBUG0("<<< Block end");
@@
-308,31
+308,31
@@
gras_cbps_i_pop(gras_cbps_t ps) {
*
* Used by \ref gras_datadesc_ref_pop_arr
*/
*
* 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 */
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 */
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
*/
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
*/
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);
}
unsigned long int *i = (unsigned long int*)data;
gras_cbps_i_push(vars, (int) *i);
}