alpha portability again (damn size_t)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@422 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c
index 6a82100..99f3390 100644 (file)
--- a/src/gras/DataDesc/ddt_convert.c
+++ b/src/gras/DataDesc/ddt_convert.c
@@ -76,7 +76,7 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
   int cpt;
   const void *r_data;
   void *l_data;
-  size_t r_size, l_size;
+  unsigned long r_size, l_size;
   /* Hexadecimal displayer
   union {
     char c[sizeof(int)];
@@ -89,7 +89,7 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
   
   r_size = type->size[r_arch];
   l_size = type->size[GRAS_THISARCH];
-  DEBUG4("r_size=%d l_size=%d,    src=%p dst=%p",
+  DEBUG4("r_size=%lu l_size=%lu,    src=%p dst=%p",
         r_size,l_size,src,dst);
 
   DEBUG2("remote=%c local=%c", gras_arches[r_arch].endian?'B':'l',
@@ -120,7 +120,7 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
       int lowOrderFirst = !gras_arches[r_arch].endian ||
        gras_arches[r_arch].endian == gras_arches[GRAS_THISARCH].endian; 
 
-      DEBUG5("Resize integer %d from %d @%p to %d @%p",
+      DEBUG5("Resize integer %d from %lu @%p to %lu @%p",
             cpt, r_size,r_data, l_size,l_data);
       gras_assert0(r_data != l_data, "Impossible to resize in place");
 

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index fd9d4a5..f4f98f2 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -227,7 +227,7 @@ int gras_datadesc_type_cmp(const gras_datadesc_type_t *d1,
   case e_gras_datadesc_type_cat_struct:    
     if (gras_dynar_length(d1->category.struct_data.fields) != 
        gras_dynar_length(d2->category.struct_data.fields)) {
-      DEBUG4("ddt_cmp: %s (having %d fields) !=  %s (having %d fields)",
+      DEBUG4("ddt_cmp: %s (having %lu fields) !=  %s (having %lu fields)",
             d1->name, gras_dynar_length(d1->category.struct_data.fields),
             d2->name, gras_dynar_length(d2->category.struct_data.fields));
       
@@ -388,7 +388,7 @@ gras_datadesc_send_rec(gras_socket_t        *sock,
                 type->name);
     
     gras_assert3(field_num < gras_dynar_length(union_data.fields),
-        "union field selector of %s returned %d but there is only %d fields", 
+        "union field selector of %s returned %d but there is only %lu fields",
                 type->name, field_num, gras_dynar_length(union_data.fields));
 
     /* Send the field number */
@@ -608,7 +608,7 @@ gras_datadesc_recv_rec(gras_socket_t        *sock,
             "Received union field for %s is negative", type->name);
     if (field_num < gras_dynar_length(union_data.fields)) 
       RAISE3(mismatch_error,
-            "Received union field for %s is %d but there is only %d fields", 
+            "Received union field for %s is %d but there is only %lu fields",
             type->name, field_num, gras_dynar_length(union_data.fields));
     
     /* Recv the content */

diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c
index cf3a2ff..41f3ba2 100644 (file)
--- a/src/gras/DataDesc/ddt_parse.c
+++ b/src/gras/DataDesc/ddt_parse.c
@@ -427,7 +427,7 @@ static gras_error_t parse_statement(char     *definition,
       DEBUG1("Found the identifier \"%s\"",identifier.name);
       
       TRY(gras_dynar_push(identifiers, &identifier));
-      DEBUG1("Dynar_len=%d",gras_dynar_length(identifiers));
+      DEBUG1("Dynar_len=%lu",gras_dynar_length(identifiers));
       expect_id_separator = 1;
       continue;
     }
@@ -482,7 +482,7 @@ static gras_datadesc_type_t *parse_struct(char *definition) {
        errcode == no_error                            ;
        errcode=parse_statement(definition,identifiers,fields_to_push)) {
     
-    DEBUG1("This statement contained %d identifiers",gras_dynar_length(identifiers));
+    DEBUG1("This statement contained %lu identifiers",gras_dynar_length(identifiers));
     /* append the identifiers we've found */
     gras_dynar_foreach(identifiers,i, field) {
       if (field.tm.is_ref)

diff --git a/src/xbt/config.c b/src/xbt/config.c
index c3202c8..e537770 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -558,7 +558,8 @@ gras_cfg_set_parse(gras_cfg_t *cfg, const char *options) {
       break;
     name=option;
     len=strlen(name);
-    DEBUG3("Still to parse and set: '%s'. len=%d; option-name=%d",name,len,option-name);
+    DEBUG3("Still to parse and set: '%s'. len=%d; option-name=%ld",
+          name,len,(long)(option-name));
 
     /* Pass the value */
     while (option-name<=(len-1) && *option != ' ' && *option != '\n' && *option != '\t') {
@@ -964,7 +965,7 @@ gras_cfg_get_int   (gras_cfg_t  *cfg,
   TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_int,&cell));
 
   if (gras_dynar_length(cell->content) > 1) {
-    WARN2("You asked for the first value of the config element '%s', but there is %d values",
+    WARN2("You asked for the first value of the config element '%s', but there is %lu values",
             name, gras_dynar_length(cell->content));
   }
 
@@ -995,7 +996,7 @@ gras_cfg_get_double(gras_cfg_t *cfg,
   TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_double,&cell));
 
   if (gras_dynar_length(cell->content) > 1) {
-    WARN2("You asked for the first value of the config element '%s', but there is %d values\n",
+    WARN2("You asked for the first value of the config element '%s', but there is %lu values\n",
             name, gras_dynar_length(cell->content));
   }
 
@@ -1028,7 +1029,7 @@ gras_error_t gras_cfg_get_string(gras_cfg_t *cfg,
   TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_string,&cell));
 
   if (gras_dynar_length(cell->content) > 1) {
-    WARN2("You asked for the first value of the config element '%s', but there is %d values\n",
+    WARN2("You asked for the first value of the config element '%s', but there is %lu values\n",
             name, gras_dynar_length(cell->content));
   }
 
@@ -1062,7 +1063,7 @@ gras_error_t gras_cfg_get_host  (gras_cfg_t *cfg,
   TRY (gras_cfgelm_get(cfg,name,gras_cfgelm_host,&cell));
 
   if (gras_dynar_length(cell->content) > 1) {
-    WARN2("You asked for the first value of the config element '%s', but there is %d values\n",
+    WARN2("You asked for the first value of the config element '%s', but there is %lu values\n",
             name, gras_dynar_length(cell->content));
   }
 

diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c
index faff555..498beb6 100644 (file)
--- a/src/xbt/dict_elm.c
+++ b/src/xbt/dict_elm.c
@@ -363,7 +363,7 @@ _gras_dictelm_child_search(gras_dictelm_t *p_elm,
   int          len     = 0;
 
   
-  CDEBUG5(dict_search, "search child [%.*s] under [%.*s] (len=%d)",
+  CDEBUG5(dict_search, "search child [%.*s] under [%.*s] (len=%lu)",
          key_len, key,
           p_elm?p_elm->key_len:6, p_elm?p_elm->key:"(head)",
          (p_elm&&p_elm->sub)?gras_dynar_length(p_elm->sub):0);
@@ -978,7 +978,7 @@ _gras_dictelm_dump_rec(gras_dictelm_t *p_head,
     printf("(null)");
   }
 
-  printf("    \t\t\t[ %d child(s) ]\n", gras_dynar_length(p_head->sub));
+  printf("    \t\t\t[ %lu child(s) ]\n", gras_dynar_length(p_head->sub));
 
   gras_dynar_foreach(p_head->sub, i, p_child) 
     TRY(_gras_dictelm_dump_rec(p_child, p_child->offset, output));

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index d059ec1..2594b5d 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -9,6 +9,7 @@
    under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "gras_private.h"
+#include <sys/types.h>
 
 GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(dynar,gros,"Dynamic arrays");
 
@@ -26,15 +27,15 @@ struct gras_dynar_s {
 #define __sanity_check_idx(idx)                \
            gras_assert1(idx >= 0,             \
                        "dynar idx(=%d) < 0", \
-                       idx)
+                       (int) (idx))
 #define __check_inbound_idx(dynar, idx)                                                \
            gras_assert2(idx < dynar->used,                                             \
-                       "dynar is not that long. You asked %d, but it's only %d long", \
-                       idx, dynar->used)
+                       "dynar is not that long. You asked %d, but it's only %lu long", \
+                       (int) (idx), (unsigned long) dynar->used)
 #define __check_sloppy_inbound_idx(dynar, idx)                                         \
            gras_assert2(idx <= dynar->used,                                            \
-                       "dynar is not that long. You asked %d, but it's only %d long", \
-                       idx, dynar->used)
+                       "dynar is not that long. You asked %d, but it's only %lu long", \
+                       (int) (idx), (unsigned long) dynar->used)
 #define __check_populated_dynar(dynar)            \
            gras_assert1(dynar->used,              \
                        "dynar %p contains nothing",dynar)
@@ -67,7 +68,7 @@ _gras_dynar_expand(gras_dynar_t * const dynar,
     const size_t new_length  = new_size*elmsize;
     char * const new_data    = gras_malloc0(elmsize*new_size);
 
-    DEBUG3("expend %p from %d to %d elements", dynar, old_size, nb);
+    DEBUG3("expend %p from %lu to %d elements", dynar, (unsigned long)old_size, nb);
     if (!new_data)
       RAISE_MALLOC;
 
@@ -219,9 +220,9 @@ gras_dynar_free(gras_dynar_t * const dynar) {
  *
  * Returns the count of elements in a dynar
  */
-size_t
+unsigned long
 gras_dynar_length(const gras_dynar_t * const dynar) {
-  return (dynar ? dynar->used : (size_t)0);
+  return (dynar ? (unsigned long) dynar->used : (unsigned long)0);
 }
 
 /**

diff --git a/src/xbt/set.c b/src/xbt/set.c
index 3818021..8463b7d 100644 (file)
--- a/src/xbt/set.c
+++ b/src/xbt/set.c
@@ -155,7 +155,7 @@ gras_error_t gras_set_get_by_id      (gras_set_t     *set,
   /* Don't bother checking the bounds, the dynar does so */
 
   gras_dynar_get(set->dynar,id,dst);
-  DEBUG3("Lookup type of id %d (of %d): %s", 
+  DEBUG3("Lookup type of id %d (of %lu): %s", 
         id, gras_dynar_length(set->dynar), (*dst)->name);
   
   return no_error;

diff --git a/testsuite/xbt/config_usage.c b/testsuite/xbt/config_usage.c
index 475bab4..d0c5488 100644 (file)
--- a/testsuite/xbt/config_usage.c
+++ b/testsuite/xbt/config_usage.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
   gras_cfg_set_parse(set,"speed:42");
   gras_cfg_check(set);
   gras_cfg_get_dynar(set,"user",&dyn);
-  fprintf(stderr,"Count: %d; Options: ",gras_dynar_length(dyn));
+  fprintf(stderr,"Count: %lu; Options: ",gras_dynar_length(dyn));
   gras_dynar_foreach(dyn,ival,str) {
     fprintf(stderr,"%s;",str);
   }

diff --git a/testsuite/xbt/dynar_double.c b/testsuite/xbt/dynar_double.c
index 0166813..a8ddaf5 100644 (file)
--- a/testsuite/xbt/dynar_double.c
+++ b/testsuite/xbt/dynar_double.c
@@ -85,7 +85,7 @@ int main(int argc,char *argv[]) {
      gras_assert2(d1 == d2,
            "The retrieved value is not the same than the injected one at the begining (%f!=%f)",
                  d1,d2);
-     DEBUG2("Pop %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Pop %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=999; cpt>=0; cpt--) {
      d1=(double)cpt;

diff --git a/testsuite/xbt/dynar_int.c b/testsuite/xbt/dynar_int.c
index 2802c75..eaaedb4 100644 (file)
--- a/testsuite/xbt/dynar_int.c
+++ b/testsuite/xbt/dynar_int.c
@@ -33,7 +33,7 @@ int main(int argc,char *argv[]) {
    TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      TRYFAIL(gras_dynar_push(d,&cpt));
-     DEBUG2("Push %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cursor=0; cursor< NB_ELEM; cursor++) {
      gras_dynar_get(d,cursor,&cpt);
@@ -71,7 +71,7 @@ int main(int argc,char *argv[]) {
      gras_assert2(i == cpt,
            "The retrieved value is not the same than the injected one (%d!=%d)",
               i,cpt);
-     DEBUG2("Pop %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Pop %d, length=%lu",cpt, gras_dynar_length(d));
    }
    gras_dynar_free(d);
 
@@ -80,14 +80,14 @@ int main(int argc,char *argv[]) {
    TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      TRYFAIL(gras_dynar_unshift(d,&cpt));
-     DEBUG2("Push %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      gras_dynar_pop(d,&i);
      gras_assert2(i == cpt,
            "The retrieved value is not the same than the injected one (%d!=%d)",
                 i,cpt);
-     DEBUG2("Pop %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Pop %d, length=%lu",cpt, gras_dynar_length(d));
    }
    gras_dynar_free(d);
 
@@ -97,11 +97,11 @@ int main(int argc,char *argv[]) {
    TRYFAIL(gras_dynar_new(&d,sizeof(int),NULL));
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      TRYFAIL(gras_dynar_push(d,&cpt));
-     DEBUG2("Push %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=0; cpt< 1000; cpt++) {
      TRYFAIL(gras_dynar_insert_at(d,2500,&cpt));
-     DEBUG2("Push %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Push %d, length=%lu",cpt, gras_dynar_length(d));
    }
 
    for (cpt=0; cpt< 2500; cpt++) {
@@ -109,7 +109,7 @@ int main(int argc,char *argv[]) {
      gras_assert2(i == cpt,
            "The retrieved value is not the same than the injected one at the begining (%d!=%d)",
               i,cpt);
-     DEBUG2("Pop %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("Pop %d, length=%lu",cpt, gras_dynar_length(d));
    }
    for (cpt=999; cpt>=0; cpt--) {
      gras_dynar_shift(d,&i);
@@ -136,7 +136,7 @@ int main(int argc,char *argv[]) {
      gras_assert2(i == cpt,
                  "Remove a bad value. Got %d, expected %d",
                  i,cpt);
-     DEBUG2("remove %d, length=%d",cpt, gras_dynar_length(d));
+     DEBUG2("remove %d, length=%lu",cpt, gras_dynar_length(d));
    }
    gras_dynar_free(d);