From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 7 Nov 2011 15:40:25 +0000 (+0100)
Subject: also deprecate ETag_surfxml_router
X-Git-Tag: exp_20120216~453
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4ce5c470afd6b579354fd46d5ed50967df28a437?hp=2599ef96125066e141d69d3348c8b4c23d773938

also deprecate ETag_surfxml_router
---

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 4b7a25a8ab..65407b8b15 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -17,7 +17,6 @@ SG_BEGIN_DECL()
 /* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_platform_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_platform_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_router_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_link_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_link_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_route_cb_list;
diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 894e405d8c..2a39d393b4 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -51,7 +51,6 @@ int surf_parse_get_int(const char *string) {
 //xbt_dynar_t STag_surfxml_host_cb_list = NULL;
 xbt_dynar_t STag_surfxml_platform_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_platform_cb_list = NULL;
-xbt_dynar_t ETag_surfxml_router_cb_list = NULL;
 xbt_dynar_t STag_surfxml_link_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_link_cb_list = NULL;
 xbt_dynar_t STag_surfxml_route_cb_list = NULL;
@@ -160,7 +159,6 @@ void surf_parse_init_callbacks(void)
 	      xbt_dynar_new(sizeof(void_f_void_t), NULL);
 
 	  sg_platf_init();
-	  ETag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
 	  STag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
 	  ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
 	  STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
@@ -223,7 +221,6 @@ void surf_parse_free_callbacks(void)
 
   xbt_dynar_free(&STag_surfxml_platform_cb_list);
   xbt_dynar_free(&ETag_surfxml_platform_cb_list);
-  xbt_dynar_free(&ETag_surfxml_router_cb_list);
   xbt_dynar_free(&STag_surfxml_link_cb_list);
   xbt_dynar_free(&ETag_surfxml_link_cb_list);
   xbt_dynar_free(&STag_surfxml_route_cb_list);
@@ -257,6 +254,8 @@ void surf_parse_free_callbacks(void)
 }
 
 /* Stag and Etag parse functions */
+void ETag_surfxml_host(void)  { /* ignored -- do not add content here */ }
+void ETag_surfxml_router(void){ /* ignored -- do not add content here */ }
 
 void STag_surfxml_platform(void)
 {
@@ -310,8 +309,6 @@ void STag_surfxml_host(void){
 
   current_property_set = NULL;
 }
-void ETag_surfxml_host(void){ /* ignored -- do not add content here */ }
-
 
 void STag_surfxml_router(void){
   s_sg_platf_router_cbarg_t router;
@@ -321,10 +318,6 @@ void STag_surfxml_router(void){
 	router.V_router_coord = A_surfxml_router_coordinates;
 	sg_platf_new_router(&router);
 }
-void ETag_surfxml_router(void){
-	surfxml_call_cb_functions(ETag_surfxml_router_cb_list);
-
-}
 
 void STag_surfxml_cluster(void){
 	struct_cluster = xbt_new0(s_surf_parsing_cluster_arg_t, 1);