From 310be1b379eb3ecbb79171666a51ef8c36f4127f Mon Sep 17 00:00:00 2001 From: mquinson Date: Sat, 24 Jul 2004 00:44:41 +0000 Subject: [PATCH 1/1] Fix miscasted logging arguments git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@329 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/DataDesc/ddt_create.c | 8 ++++---- src/gras/DataDesc/ddt_exchange.c | 12 ++++++------ src/gras/DataDesc/ddt_parse.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c index 543ae354f4..c0adbf3e70 100644 --- a/src/gras/DataDesc/ddt_create.c +++ b/src/gras/DataDesc/ddt_create.c @@ -209,7 +209,7 @@ gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type, field->name = strdup(name); DEBUG0("----------------"); - DEBUG4("PRE s={size=%d,align=%d,asize=%d} struct_boundary=%d", + DEBUG4("PRE s={size=%ld,align=%ld,asize=%ld} struct_boundary=%d", struct_type->size[GRAS_THISARCH], struct_type->alignment[GRAS_THISARCH], struct_type->aligned_size[GRAS_THISARCH], @@ -233,13 +233,13 @@ gras_datadesc_declare_struct_append(gras_datadesc_type_t *struct_type, TRY(gras_dynar_push(struct_type->category.struct_data.fields, &field)); - DEBUG3("Push a %s into %s at offset %d.", + DEBUG3("Push a %s into %s at offset %ld.", field_type->name, struct_type->name,field->offset[GRAS_THISARCH]); - DEBUG3(" f={size=%d,align=%d,asize=%d}", + DEBUG3(" f={size=%ld,align=%ld,asize=%ld}", field_type->size[GRAS_THISARCH], field_type->alignment[GRAS_THISARCH], field_type->aligned_size[GRAS_THISARCH]); - DEBUG3(" s={size=%d,align=%d,asize=%d}", + DEBUG3(" s={size=%ld,align=%ld,asize=%ld}", struct_type->size[GRAS_THISARCH], struct_type->alignment[GRAS_THISARCH], struct_type->aligned_size[GRAS_THISARCH]); diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index c90975cb68..62400ba394 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -110,14 +110,14 @@ gras_dd_alloc_ref(gras_dict_t *refs, char *l_data = NULL; gras_error_t errcode; - gras_assert1(size>0,"Cannot allocate %d bytes!", size); + gras_assert1(size>0,"Cannot allocate %ld bytes!", size); if (! (l_data = malloc((size_t)size)) ) RAISE_MALLOC; *l_ref = l_data; DEBUG2("l_data=%p, &l_data=%p",l_data,&l_data); - DEBUG3("alloc_ref: r_ref=%p; *r_ref=%p, r_len=%d", + DEBUG3("alloc_ref: r_ref=%p; *r_ref=%p, r_len=%ld", r_ref, r_ref?*r_ref:NULL, r_len); if (r_ref && !gras_dd_is_r_null( r_ref, r_len)) { void *ptr = malloc(sizeof(void *)); @@ -164,21 +164,21 @@ int gras_datadesc_type_cmp(const gras_datadesc_type_t *d1, for (cpt=0; cptsize[cpt] != d2->size[cpt]) { - DEBUG5("ddt_cmp: %s->size=%d != %s->size=%d (on %s)", + DEBUG5("ddt_cmp: %s->size=%ld != %s->size=%ld (on %s)", d1->name,d1->size[cpt],d2->name,d2->size[cpt], gras_arches[cpt].name); return d1->size[cpt] > d2->size[cpt] ? 1 : -1; } if (d1->alignment[cpt] != d2->alignment[cpt]) { - DEBUG5("ddt_cmp: %s->alignment=%d != %s->alignment=%d (on %s)", + DEBUG5("ddt_cmp: %s->alignment=%ld != %s->alignment=%ld (on %s)", d1->name,d1->alignment[cpt],d2->name,d2->alignment[cpt], gras_arches[cpt].name); return d1->alignment[cpt] > d2->alignment[cpt] ? 1 : -1; } if (d1->aligned_size[cpt] != d2->aligned_size[cpt]) { - DEBUG5("ddt_cmp: %s->aligned_size=%d != %s->aligned_size=%d (on %s)", + DEBUG5("ddt_cmp: %s->aligned_size=%ld != %s->aligned_size=%ld (on %s)", d1->name,d1->aligned_size[cpt],d2->name,d2->aligned_size[cpt], gras_arches[cpt].name); return d1->aligned_size[cpt] > d2->aligned_size[cpt] ? 1 : -1; @@ -466,7 +466,7 @@ gras_datadesc_send_rec(gras_socket_t *sock, TRY(gras_datadesc_by_id(array_data.code, &sub_type)); elm_size = sub_type->aligned_size[GRAS_THISARCH]; if (sub_type->category_code == e_gras_datadesc_type_cat_scalar) { - VERB1("Array of %d scalars, send it in one shoot",count); + VERB1("Array of %ld scalars, send it in one shot",count); TRY(gras_trp_chunk_send(sock, data, sub_type->aligned_size[GRAS_THISARCH] * count)); } else { diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c index e49c7af452..3a3073ed4d 100644 --- a/src/gras/DataDesc/ddt_parse.c +++ b/src/gras/DataDesc/ddt_parse.c @@ -306,7 +306,7 @@ static gras_error_t parse_statement(char *definition, definition); gras_abort(); } - DEBUG1("Fixed size array, size=%d",size); + DEBUG1("Fixed size array, size=%ld",size); continue; } else { ERROR3("Unparsable size of array at %d:%d of %s", -- 2.20.1