Removed a bunch of unused variables. Mostly some xbt_error_t errcode that

were used before making memory errors fatal.

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

diff --git a/include/xbt/error.h b/include/xbt/error.h
index c88d536..46df96b 100644 (file)
--- a/include/xbt/error.h
+++ b/include/xbt/error.h
@@ -130,7 +130,7 @@ typedef enum {
           __FILE__,__LINE__,__FUNCTION__,a1,a2,a3,a4,a5,a6); \
   _XBT_ERR_POST(code)
 
-//#define RAISE_MALLOC     RAISE0(malloc_error,"Malloc error")
+/* #define RAISE_MALLOC     RAISE0(malloc_error,"Malloc error") */
 #define RAISE_IMPOSSIBLE RAISE0(unknown_error,"The Impossible did happen")
 #define RAISE_UNIMPLEMENTED RAISE1(unknown_error,"Function %s unimplemented",__FUNCTION__)
 
@@ -154,7 +154,7 @@ typedef enum {
 #define xbt_assert6(cond,msg,a,b,c,d,e,f) if (!(cond)) { CRITICAL6(msg,a,b,c,d,e,f); xbt_abort(); }
 #endif
 
-void xbt_die(const char *msg);
+void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
 
 #define DIE_IMPOSSIBLE xbt_assert0(0,"The Impossible did happen (yet again)")
 #define xbt_assert_error(a) xbt_assert1(errcode == (a), "Error %s unexpected",xbt_error_name(errcode))

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 6c2df2f..62bd71a 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -76,14 +76,7 @@ BEGIN_DECL
 
 
 void xbt_abort(void) _XBT_GNUC_NORETURN;
-
-/* FIXME: This is a very good candidate to rewrite (along with a proper string stuff) 
-   but I'm too lazy right now, so copy the definition */
-long int strtol(const char *nptr, char **endptr, int base);
-double strtod(const char *nptr, char **endptr);
-int atoi(const char *nptr);
-
-END_DECL   
+   
 #include "xbt/error.h" /* needed for xbt_die */
 
 #endif /* _XBT_SYSDEP_H */

diff --git a/src/amok/Bandwidth/bandwidth.c b/src/amok/Bandwidth/bandwidth.c
index 9415022..d0d82a6 100644 (file)
--- a/src/amok/Bandwidth/bandwidth.c
+++ b/src/amok/Bandwidth/bandwidth.c
@@ -17,7 +17,6 @@ static short _amok_bw_initialized = 0;
 
 /**** code ****/
 void amok_bw_init(void) {
-  xbt_error_t errcode;
   gras_datadesc_type_t bw_request_desc, bw_res_desc, sat_request_desc;
 
   if (_amok_bw_initialized)

diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c
index e37d6fe..ad50759 100644 (file)
--- a/src/gras/DataDesc/cbps.c
+++ b/src/gras/DataDesc/cbps.c
@@ -32,7 +32,6 @@ static void free_string(void *d){
 }
 
 gras_cbps_t gras_cbps_new(void) {
-  xbt_error_t errcode;
   gras_cbps_t  res;
 
   res=xbt_new(s_gras_cbps_t,1);
@@ -306,7 +305,6 @@ gras_cbps_block_end(gras_cbps_t ps) {
 void
 gras_cbps_i_push(gras_cbps_t ps,
                 int val) {
-  xbt_error_t errcode;
   DEBUG1("push %d as a size",val);
   xbt_dynar_push_as(ps->lints,int,val);
 }

diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c
index e7e7ce1..03c8c8f 100644 (file)
--- a/src/gras/DataDesc/datadesc.c
+++ b/src/gras/DataDesc/datadesc.c
@@ -32,7 +32,6 @@ _strlen_cb(gras_cbps_t vars, void *data) {
  **/
 void
 gras_datadesc_init(void) {
-  xbt_error_t errcode;
   gras_datadesc_type_t ddt; /* What to add */
 
   /* only initialize once */

diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c
index 5b77b43..9bd48b7 100644 (file)
--- a/src/gras/DataDesc/ddt_create.c
+++ b/src/gras/DataDesc/ddt_create.c
@@ -27,7 +27,6 @@ void gras_ddt_freev(void *ddt) {
 }
 
 static gras_datadesc_type_t gras_ddt_new(const char *name) {
-  xbt_error_t errcode;
   gras_datadesc_type_t res;
 
   XBT_IN1("(%s)",name);
@@ -103,8 +102,10 @@ gras_datadesc_type_t
   res = gras_ddt_new(name);
 
   for (arch = 0; arch < gras_arch_count; arch ++) {
+#if 0
     long int sz;
     long int mask;
+#endif
     res->size[arch]         = gras_arches[arch].sizeofs[type];
     res->alignment[arch]    = gras_arches[arch].boundaries[type];
     res->aligned_size[arch] = aligned(res->size[arch], res->alignment[arch]);
@@ -174,7 +175,6 @@ void gras_dd_cat_field_free(void *f) {
 gras_datadesc_type_t 
   gras_datadesc_struct(const char            *name) {
 
-  xbt_error_t errcode;
   gras_datadesc_type_t res;
   long int arch;
   
@@ -213,7 +213,6 @@ gras_datadesc_struct_append(gras_datadesc_type_t struct_type,
                            const char          *name,
                            gras_datadesc_type_t field_type) {
 
-  xbt_error_t errcode;
   gras_dd_cat_field_t field;
   int arch;
 
@@ -310,7 +309,6 @@ gras_datadesc_type_t
 gras_datadesc_union(const char                   *name,
                    gras_datadesc_type_cb_int_t   selector) {
 
-  xbt_error_t errcode;
   gras_datadesc_type_t res;
   int arch;
 
@@ -401,7 +399,6 @@ gras_datadesc_type_t
   gras_datadesc_ref(const char           *name,
                    gras_datadesc_type_t  referenced_type) {
 
-  xbt_error_t errcode;
   gras_datadesc_type_t res;
   gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer");
   int arch;
@@ -650,7 +647,6 @@ void gras_datadesc_cb_recv(gras_datadesc_type_t          type,
 static gras_datadesc_type_t 
   gras_dd_find_field(gras_datadesc_type_t  type,
                     const char           *field_name) {
-   gras_datadesc_type_t sub_type=NULL;
    xbt_dynar_t         field_array;
    
    gras_dd_cat_field_t  field=NULL;

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index eaead7f..09d56c1 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -125,7 +125,6 @@ gras_dd_alloc_ref(xbt_dict_t  refs,
   DEBUG3("alloc_ref: r_ref=%p; *r_ref=%p, r_len=%ld",
         (void*)r_ref, (void*)(r_ref?*r_ref:NULL), r_len);
   if (detect_cycle && r_ref && !gras_dd_is_r_null( r_ref, r_len)) {
-    xbt_error_t errcode;
     void *ptr = xbt_malloc(sizeof(void *));
 
     CRITICAL0("detect_cycle");

diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c
index e4a8bf9..abda4cd 100644 (file)
--- a/src/gras/DataDesc/ddt_parse.c
+++ b/src/gras/DataDesc/ddt_parse.c
@@ -159,7 +159,6 @@ static void change_to_ref_pop_array(xbt_dynar_t dynar) {
 static xbt_error_t parse_statement(char         *definition,
                                    xbt_dynar_t  identifiers,
                                    xbt_dynar_t  fields_to_push) {
-  xbt_error_t errcode;
   char buffname[512];
 
   s_identifier_t identifier;

diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c
index c7a5097..c197ddd 100644 (file)
--- a/src/gras/Msg/msg.c
+++ b/src/gras/Msg/msg.c
@@ -25,8 +25,6 @@ static char *make_namev(const char *name, short int ver);
  * Initialize this submodule.
  */
 void gras_msg_init(void) {
-  xbt_error_t errcode;
-  
   /* only initialize once */
   if (_gras_msgtype_set != NULL)
     return;

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index 3c89e80..587c370 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -16,7 +16,7 @@ XBT_LOG_NEW_SUBCATEGORY(raw_trp,transport,"Conveying bytes over the network with
 static xbt_dict_t _gras_trp_plugins;      /* All registered plugins */
 static void gras_trp_plugin_free(void *p); /* free one of the plugins */
 
-static void gras_trp_socket_free(void *s); /* free one socket */
+/* static void gras_trp_socket_free(void *s); /\* free one socket *\/ */
 
 static void
 gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
@@ -344,7 +344,7 @@ xbt_error_t gras_socket_raw_send(gras_socket_t peer,
          gras_socket_peer_name(peer), gras_socket_peer_port(peer));
             
   xbt_free(chunk);
-  return no_error;//gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize);   
+  return no_error;/* gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize);    */
 }
 
 xbt_error_t gras_socket_raw_recv(gras_socket_t peer, 
@@ -368,5 +368,5 @@ xbt_error_t gras_socket_raw_recv(gras_socket_t peer,
          gras_socket_peer_name(peer), gras_socket_peer_port(peer));
 
   xbt_free(chunk);
-  return no_error;//gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize);   
+  return no_error;/* gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize);    */
 }

diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c
index c5cb397..f687aa5 100644 (file)
--- a/src/gras/Transport/transport_plugin_tcp.c
+++ b/src/gras/Transport/transport_plugin_tcp.c
@@ -203,7 +203,6 @@ xbt_error_t
 gras_trp_tcp_socket_accept(gras_socket_t  sock,
                           gras_socket_t *dst) {
   gras_socket_t res;
-  xbt_error_t errcode;
   
   struct sockaddr_in peer_in;
   socklen_t peer_in_len = sizeof(peer_in);
@@ -412,7 +411,7 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer,
    int res_last, msg_sofar, exp_sofar;
    
    fd_set rd_set;
-   int rv;
+/*    int rv; */
    
    struct timeval timeOut;
    

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 3ac397f..abba5cd 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -110,7 +110,7 @@ static void action_change_state(surf_action_t action, e_surf_action_state_t stat
   return;
 }
 
-static xbt_heap_float_t share_resources()
+static xbt_heap_float_t share_resources(xbt_heap_float_t now)
 {
   surf_action_cpu_t action = NULL;
   xbt_swag_t running_actions= surf_cpu_resource->common_public->states.running_action_set;
@@ -148,7 +148,6 @@ static void update_actions_state(xbt_heap_float_t now,
       action_change_state((surf_action_t)action, SURF_ACTION_DONE);
     } else { /* Need to check that none of the resource has failed*/
       lmm_constraint_t cnst = NULL;
-      int tab_size =  lmm_get_number_of_cnst_from_var(maxmin_system, action->variable);
       int i=0;
       cpu_t cpu = NULL;
 
@@ -191,7 +190,6 @@ static void update_resource_state(void *id,
 
 static surf_action_t execute(void *cpu, xbt_maxmin_float_t size)
 {
-  lmm_variable_t var;
   surf_action_cpu_t action = NULL;
   cpu_t CPU = cpu;
   

diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h
index c5b2cde..7897a9d 100644 (file)
--- a/src/surf/cpu_private.h
+++ b/src/surf/cpu_private.h
@@ -27,10 +27,4 @@ typedef struct cpu {
   lmm_constraint_t constraint;
 } s_cpu_t, *cpu_t;
 
-/* typedef struct surf_cpu_resource_extension_private { */
-/* } s_surf_cpu_resource_extension_private_t; */
-
-void surf_cpu_resource_init(const char *filename);
-
-
 #endif                         /* _SURF_CPU_PRIVATE_H */

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index a4c1bbb..637555f 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -194,8 +194,6 @@ static void saturated_constraints_update(lmm_system_t sys,
   if (cnst->remaining <= 0)
     return;
   if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
-    xbt_swag_t active_elem_list = &(cnst->active_element_set);
-
     *min_usage = cnst->remaining / cnst->usage;
 
     while ((useless_cnst = xbt_swag_getFirst(&(sys->saturated_constraint_set))))

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index c7a78a0..23dfafc 100644 (file)
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -38,8 +38,6 @@ tmgr_trace_t tmgr_trace_new(const char *filename)
   FILE *f = NULL;
   int linecount = 0;
   char line[256];
-  xbt_heap_float_t current_time = 0.0, previous_time = 0.0;
-  xbt_maxmin_float_t value = -1.0;
   xbt_heap_float_t periodicity = -1.0; /* No periodicity by default */
   s_tmgr_event_t event;
   tmgr_event_t last_event = NULL;

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 3f8b43d..0b6474b 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -117,7 +117,6 @@ xbt_cfg_dump(const char *name,const char *indent,xbt_cfg_t cfg) {
   xbt_cfgelm_t cell=NULL;
   char *key=NULL;
   int i; 
-  xbt_error_t errcode;
   int size;
   int ival;
   char *sval;

diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index 48eab46..6c45381 100644 (file)
--- a/src/xbt/dict_cursor.c
+++ b/src/xbt/dict_cursor.c
@@ -47,7 +47,6 @@ _cursor_push_keys(xbt_dict_cursor_t p_cursor,
  */
 xbt_dict_cursor_t 
 xbt_dict_cursor_new(const xbt_dict_t head) {
-  xbt_error_t        errcode  = no_error;
   xbt_dict_cursor_t res = NULL;
 
   res = xbt_new(s_xbt_dict_cursor_t,1);
@@ -102,7 +101,6 @@ static _XBT_INLINE
 void
 _cursor_push_keys(xbt_dict_cursor_t cursor,
                   xbt_dictelm_t     elm) {
-  xbt_error_t         errcode = no_error;
   xbt_dictelm_t       child = NULL;
   int                  i       = 0;
   static volatile int  count   = 0; /* ??? */
@@ -132,7 +130,6 @@ _cursor_push_keys(xbt_dict_cursor_t cursor,
  */
 void
 xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) {
-  xbt_error_t errcode = no_error;
 
   CDEBUG0(dict_cursor, "xbt_dict_cursor_rewind");
   xbt_assert(cursor);

diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c
index 5616959..e97a91c 100644 (file)
--- a/src/xbt/dict_elm.c
+++ b/src/xbt/dict_elm.c
@@ -131,7 +131,6 @@ _xbt_dictelm_alloc(char                *key,
                    void                *data,
                    void_f_pvoid_t      *free_f,
                  /*OUT*/s_xbt_dictelm_t **pp_elm) {
-  xbt_error_t   errcode = no_error;
   s_xbt_dictelm_t *p_elm  = NULL;
 
   p_elm = xbt_new(s_xbt_dictelm_t,1);
@@ -653,7 +652,6 @@ _xbt_dictelm_get_rec(s_xbt_dictelm_t *p_head,
                      int             key_len,
                      int             offset,
                      void **data) {
-  void *res;
 
   CDEBUG3(dict_search, "Search %.*s in %p", key_len, key, (void*)p_head); 
 

diff --git a/src/xbt/module.c b/src/xbt/module.c
index 44e6e87..d435369 100644 (file)
--- a/src/xbt/module.c
+++ b/src/xbt/module.c
@@ -49,7 +49,6 @@ void
 xbt_init_defaultlog(int *argc,char **argv, const char *defaultlog) {
   int i,j;
   char *opt;
-  xbt_error_t errcode;
   int found=0;
 
   INFO0("Initialize GRAS");

diff --git a/src/xbt/set.c b/src/xbt/set.c
index 2d912e5..fe1bfe4 100644 (file)
--- a/src/xbt/set.c
+++ b/src/xbt/set.c
@@ -34,7 +34,6 @@ typedef struct xbt_set_ {
  */
 xbt_set_t xbt_set_new (void) {
   xbt_set_t res=xbt_new(s_xbt_set_t,1);
-  xbt_error_t errcode;
 
   res->dict=xbt_dict_new ();
   res->dynar=xbt_dynar_new(sizeof(void*),NULL);