#include "datadesc_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ddt_create, xbt_ddt,
- "Creating new datadescriptions");
+ "Creating new data descriptions");
/*** prototypes ***/
static xbt_dd_cat_field_t
xbt_datadesc_type_t res;
long int arch;
- XBT_IN("");
+ XBT_IN();
res = xbt_datadesc_by_name_or_null(name);
if (res) {
xbt_assert(res->category_code == e_xbt_datadesc_type_cat_scalar,
void xbt_dd_cat_field_free(void *f)
{
xbt_dd_cat_field_t field = *(xbt_dd_cat_field_t *) f;
- XBT_IN("");
+ XBT_IN();
if (field) {
free(field->name);
free(field);
field->name = (char *) strdup(name);
XBT_DEBUG("----------------");
- XBT_DEBUG("PRE s={size=%ld,align=%ld,asize=%ld}",
+ XBT_DEBUG("PRE s={size=%ld,align=%lu,asize=%lu}",
struct_type->size[GRAS_THISARCH],
struct_type->alignment[GRAS_THISARCH],
struct_type->aligned_size[GRAS_THISARCH]);
XBT_DEBUG("Push a %s into %s at offset %ld.",
field_type->name, struct_type->name,
field->offset[GRAS_THISARCH]);
- XBT_DEBUG(" f={size=%ld,align=%ld,asize=%ld}",
+ XBT_DEBUG(" f={size=%ld,align=%lu,asize=%lu}",
field_type->size[GRAS_THISARCH],
field_type->alignment[GRAS_THISARCH],
field_type->aligned_size[GRAS_THISARCH]);
- XBT_DEBUG(" s={size=%ld,align=%ld,asize=%ld}",
+ XBT_DEBUG(" s={size=%ld,align=%lu,asize=%lu}",
struct_type->size[GRAS_THISARCH],
struct_type->alignment[GRAS_THISARCH],
struct_type->aligned_size[GRAS_THISARCH]);
void xbt_datadesc_struct_close(xbt_datadesc_type_t struct_type)
{
int arch;
- XBT_IN("");
+ XBT_IN();
struct_type->category.struct_data.closed = 1;
for (arch = 0; arch < xbt_arch_count; arch++) {
struct_type->size[arch] = struct_type->aligned_size[arch];
}
- XBT_DEBUG("structure %s closed. size=%ld,align=%ld,asize=%ld",
+ XBT_DEBUG("structure %s closed. size=%ld,align=%lu,asize=%lu",
struct_type->name,
struct_type->size[GRAS_THISARCH],
struct_type->alignment[GRAS_THISARCH],
}
if (d1->alignment[cpt] != d2->alignment[cpt]) {
- XBT_DEBUG("ddt_cmp: %s->alignment=%ld != %s->alignment=%ld (on %s)",
+ XBT_DEBUG("ddt_cmp: %s->alignment=%lu != %s->alignment=%lu (on %s)",
d1->name, d1->alignment[cpt], d2->name, d2->alignment[cpt],
xbt_arches[cpt].name);
return d1->alignment[cpt] > d2->alignment[cpt] ? 1 : -1;
if (d1->aligned_size[cpt] != d2->aligned_size[cpt]) {
XBT_DEBUG
- ("ddt_cmp: %s->aligned_size=%ld != %s->aligned_size=%ld (on %s)",
+ ("ddt_cmp: %s->aligned_size=%lu != %s->aligned_size=%lu (on %s)",
d1->name, d1->aligned_size[cpt], d2->name,
d2->aligned_size[cpt], xbt_arches[cpt].name);
return d1->aligned_size[cpt] > d2->aligned_size[cpt] ? 1 : -1;
field_desc_2 = field2->type;
ret = xbt_datadesc_type_cmp(field_desc_1, field_desc_2);
if (ret) {
- XBT_DEBUG("%s->field[%d]=%s != %s->field[%d]=%s",
+ XBT_DEBUG("%s->field[%u]=%s != %s->field[%u]=%s",
d1->name, cpt, field1->name, d2->name, cpt, field2->name);
return ret;
}