From: Martin Quinson Date: Wed, 9 Mar 2016 00:25:09 +0000 (+0100) Subject: use C++ constants when possible X-Git-Tag: v3_13~459 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/903d96f4c7e2f761608b4591faa573aab5891994?hp=96f27c279bcb5dd32cf0e8af04bd273240d298ef use C++ constants when possible --- diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 5d186cc42f..e089aff122 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -394,13 +394,13 @@ int console_add_route(lua_State *L) { if (lua_isstring(L, -1)) { const char* value = lua_tostring(L, -1); if (strcmp("YES", value) == 0) { - route.symmetrical = TRUE; + route.symmetrical = true; } else - route.symmetrical = FALSE; + route.symmetrical = false; } else { - route.symmetrical = TRUE; + route.symmetrical = true; } lua_pop(L,1); @@ -471,12 +471,12 @@ int console_add_ASroute(lua_State *L) { if (lua_isstring(L, -1)) { const char* value = lua_tostring(L, -1); if (strcmp("YES", value) == 0) - ASroute.symmetrical = TRUE; + ASroute.symmetrical = true; else - ASroute.symmetrical = FALSE; + ASroute.symmetrical = false; } else { - ASroute.symmetrical = TRUE; + ASroute.symmetrical = true; } lua_pop(L,1); diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 446097787a..b84e5eb7e5 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -64,7 +64,7 @@ int user_max_depth_reached = 0; /* MC global data structures */ mc_state_t mc_current_state = nullptr; -char mc_replay_mode = FALSE; +char mc_replay_mode = false; mc_stats_t mc_stats = nullptr; mc_global_t initial_global_state = nullptr; @@ -175,13 +175,13 @@ int MC_deadlock_check() return message.value; } - int deadlock = FALSE; + bool deadlock = false; smx_process_t process; if (xbt_swag_size(simix_global->process_list)) { - deadlock = TRUE; + deadlock = true; xbt_swag_foreach(process, simix_global->process_list) if (simgrid::mc::process_is_enabled(process)) { - deadlock = FALSE; + deadlock = false; break; } } diff --git a/src/smpi/smpi_mpi_dt.cpp b/src/smpi/smpi_mpi_dt.cpp index 5e5b242222..670f53eeb5 100644 --- a/src/smpi/smpi_mpi_dt.cpp +++ b/src/smpi/smpi_mpi_dt.cpp @@ -1443,7 +1443,7 @@ static void replace_func(void *a, void *b, int *length, MPI_Datatype * datatype) } #define CREATE_MPI_OP(name, func) \ - static s_smpi_mpi_op_t mpi_##name = { &(func) /* func */, TRUE }; \ + static s_smpi_mpi_op_t mpi_##name = { &(func) /* func */, true }; \ MPI_Op name = &mpi_##name; CREATE_MPI_OP(MPI_MAX, max_func); diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp index d1f49457d5..31b7a8e266 100644 --- a/src/smpi/smpi_pmpi.cpp +++ b/src/smpi/smpi_pmpi.cpp @@ -1352,7 +1352,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) if (request == NULL || flag == NULL) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { - *flag= TRUE; + *flag= true; smpi_empty_status(status); retval = MPI_SUCCESS; } else { @@ -1432,7 +1432,7 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (source == MPI_PROC_NULL) { - *flag=TRUE; + *flag=true; smpi_empty_status(status); status->MPI_SOURCE = MPI_PROC_NULL; retval = MPI_SUCCESS; @@ -3156,7 +3156,7 @@ int PMPI_Info_free( MPI_Info *info){ } int PMPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){ - *flag=FALSE; + *flag=false; if (info == NULL || key == NULL || valuelen <0) return MPI_ERR_ARG; if (value == NULL) @@ -3164,7 +3164,7 @@ int PMPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){ char* tmpvalue=(char*)xbt_dict_get_or_null(info->info_dict, key); if(tmpvalue){ memcpy(value,tmpvalue, (strlen(tmpvalue) + 1 < static_cast(valuelen)) ? strlen(tmpvalue) + 1 : valuelen); - *flag=TRUE; + *flag=true; } return MPI_SUCCESS; } @@ -3222,13 +3222,13 @@ int PMPI_Info_get_nthkey( MPI_Info info, int n, char *key){ } int PMPI_Info_get_valuelen( MPI_Info info, char *key, int *valuelen, int *flag){ - *flag=FALSE; + *flag=false; if (info == NULL || key == NULL || valuelen==NULL || *valuelen <0) return MPI_ERR_ARG; char* tmpvalue=(char*)xbt_dict_get_or_null(info->info_dict, key); if(tmpvalue){ *valuelen=strlen(tmpvalue); - *flag=TRUE; + *flag=true; } return MPI_SUCCESS; } diff --git a/src/smpi/smpi_replay.cpp b/src/smpi/smpi_replay.cpp index bd12425777..ee16669182 100644 --- a/src/smpi/smpi_replay.cpp +++ b/src/smpi/smpi_replay.cpp @@ -366,7 +366,7 @@ static void action_test(const char *const *action){ double clock = smpi_process_simulated_elapsed(); MPI_Request request; MPI_Status status; - int flag = TRUE; + int flag = true; request = xbt_dynar_pop_as(get_reqq_self(),MPI_Request); //if request is null here, this may mean that a previous test has succeeded diff --git a/src/surf/AsDijkstra.cpp b/src/surf/AsDijkstra.cpp index bcdb23b448..3d542a510b 100644 --- a/src/surf/AsDijkstra.cpp +++ b/src/surf/AsDijkstra.cpp @@ -334,7 +334,7 @@ void AsDijkstra::addRoute(sg_platf_route_cbarg_t route) newRoute(src->id(), dst->id(), e_route); // Symmetrical YES - if (route->symmetrical == TRUE) { + if (route->symmetrical == true) { if(!route->gw_dst && !route->gw_src) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName); else diff --git a/src/surf/AsFloyd.cpp b/src/surf/AsFloyd.cpp index ec45a1c4ca..891675af67 100644 --- a/src/surf/AsFloyd.cpp +++ b/src/surf/AsFloyd.cpp @@ -121,7 +121,7 @@ void AsFloyd::addRoute(sg_platf_route_cbarg_t route) TO_FLOYD_COST(src->id(), dst->id()) = (TO_FLOYD_LINK(src->id(), dst->id()))->link_list->size(); - if (route->symmetrical == TRUE) { + if (route->symmetrical == true) { if (route->gw_dst) // AS route (to adapt the error message, if any) xbt_assert(nullptr == TO_FLOYD_LINK(dst->id(), src->id()), "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.", diff --git a/src/surf/AsFull.cpp b/src/surf/AsFull.cpp index dbe966e4f5..9f757613d5 100644 --- a/src/surf/AsFull.cpp +++ b/src/surf/AsFull.cpp @@ -110,7 +110,7 @@ void AsFull::addRoute(sg_platf_route_cbarg_t route) TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id()) = newExtendedRoute(hierarchy_, route, 1); TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id())->link_list->shrink_to_fit(); - if (route->symmetrical == TRUE && src_net_elm != dst_net_elm) { + if (route->symmetrical == true && src_net_elm != dst_net_elm) { if (route->gw_dst && route->gw_src) { NetCard* gw_tmp = route->gw_src; route->gw_src = route->gw_dst; diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index f57f02c8a8..c571dccb15 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -100,7 +100,7 @@ typedef struct s_sg_platf_peer_cbarg { typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; typedef struct s_sg_platf_route_cbarg { - int symmetrical; + bool symmetrical; const char *src; const char *dst; sg_netcard_t gw_src; diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index f84c8014c3..6d1612db7c 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -27,9 +27,9 @@ int ETag_surfxml_include_state(void); #include "simgrid_dtd.c" -char* surf_parsed_filename = NULL; // to locate parse error messages +char* surf_parsed_filename = nullptr; // to locate parse error messages -xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */ +xbt_dynar_t parsed_link_list = nullptr; /* temporary store of current list link of a route */ /* * Helping functions */ @@ -87,8 +87,7 @@ struct unit_scale { double scale; }; -/* Note: field `unit' for the last element of parameter `units' should be - * NULL. */ +/* Note: field `unit' for the last element of parameter `units' should be nullptr. */ static double surf_parse_get_value_with_unit(const char *string, const struct unit_scale *units, const char *entity_kind, const char *name, const char *error_msg, const char *default_unit) @@ -109,9 +108,9 @@ static double surf_parse_get_value_with_unit(const char *string, const struct un XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s",string, entity_kind, name, error_msg); ptr = (char*)default_unit; } - for (i = 0; units[i].unit != NULL && strcmp(ptr, units[i].unit) != 0; i++) { + for (i = 0; units[i].unit != nullptr && strcmp(ptr, units[i].unit) != 0; i++) { } - if (units[i].unit != NULL) + if (units[i].unit != nullptr) res *= units[i].scale; else surf_parse_error("unknown unit: %s", ptr); @@ -130,7 +129,7 @@ double surf_parse_get_time(const char *string, const char *entity_kind, const ch { "us", 1e-6 }, { "ns", 1e-9 }, { "ps", 1e-12 }, - { NULL, 0 } + { nullptr, 0 } }; return surf_parse_get_value_with_unit(string, units, entity_kind, name, "Append 's' to your time to get seconds", "s"); @@ -157,7 +156,7 @@ double surf_parse_get_size(const char *string, const char *entity_kind, const ch { "Mb", 0.125 * 1e6 }, { "kb", 0.125 * 1e3 }, { "b", 0.125 }, - { NULL, 0 } + { nullptr, 0 } }; return surf_parse_get_value_with_unit(string, units, entity_kind, name, "Append 'B' to get bytes (or 'b' for bits but 1B = 8b).", "B"); @@ -184,7 +183,7 @@ double surf_parse_get_bandwidth(const char *string, const char *entity_kind, con { "Mbps", 0.125 * 1e6 }, { "kbps", 0.125 * 1e3 }, { "bps", 0.125 }, - { NULL, 0 } + { nullptr, 0 } }; return surf_parse_get_value_with_unit(string, units, entity_kind, name, "Append 'Bps' to get bytes per second (or 'bps' for bits but 1Bps = 8bps)", "Bps"); @@ -211,7 +210,7 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c { "kf", 1e3 }, { "flops", 1.0 }, { "f", 1.0 }, - { NULL, 0 } + { nullptr, 0 } }; return surf_parse_get_value_with_unit(string, units, entity_kind, name, "Append 'f' or 'flops' to your speed to get flop per second", "f"); @@ -225,9 +224,9 @@ double surf_parse_get_speed(const char *string, const char *entity_kind, const c /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */ /* The default current property receiver. Setup in the corresponding opening callbacks. */ -xbt_dict_t current_property_set = NULL; -xbt_dict_t current_model_property_set = NULL; -xbt_dict_t as_current_property_set = NULL; +xbt_dict_t current_property_set = nullptr; +xbt_dict_t current_model_property_set = nullptr; +xbt_dict_t as_current_property_set = nullptr; int AS_TAG = 0; char* as_name_tab[1024]; void* as_dict_tab[1024]; @@ -235,10 +234,10 @@ int as_prop_nb = 0; /* dictionary of random generator data */ -xbt_dict_t random_data_list = NULL; +xbt_dict_t random_data_list = nullptr; YY_BUFFER_STATE surf_input_buffer; -FILE *surf_file_to_parse = NULL; +FILE *surf_file_to_parse = nullptr; /* * Stuff relative to storage @@ -247,7 +246,7 @@ void STag_surfxml_storage(void) { AS_TAG = 0; XBT_DEBUG("STag_surfxml_storage"); - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void ETag_surfxml_storage(void) { @@ -261,14 +260,14 @@ void ETag_surfxml_storage(void) storage.properties = current_property_set; storage.attach = A_surfxml_storage_attach; sg_platf_new_storage(&storage); - current_property_set = NULL; + current_property_set = nullptr; } void STag_surfxml_storage___type(void) { AS_TAG = 0; XBT_DEBUG("STag_surfxml_storage___type"); - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); - xbt_assert(current_model_property_set == NULL, "Someone forgot to reset the model property set to NULL in its closing tag (or XML malformed)"); + xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); + xbt_assert(current_model_property_set == nullptr, "Someone forgot to reset the model property set to nullptr in its closing tag (or XML malformed)"); } void ETag_surfxml_storage___type(void) { @@ -284,8 +283,8 @@ void ETag_surfxml_storage___type(void) storage_type.size = surf_parse_get_size(A_surfxml_storage___type_size, "size of storage type", storage_type.id); sg_platf_new_storage_type(&storage_type); - current_property_set = NULL; - current_model_property_set = NULL; + current_property_set = nullptr; + current_model_property_set = nullptr; } void STag_surfxml_mstorage(void) { @@ -317,9 +316,9 @@ void ETag_surfxml_mount(void) /* * Stuff relative to the tag */ -static xbt_dynar_t surf_input_buffer_stack = NULL; -static xbt_dynar_t surf_file_to_parse_stack = NULL; -static xbt_dynar_t surf_parsed_filename_stack = NULL; +static xbt_dynar_t surf_input_buffer_stack = nullptr; +static xbt_dynar_t surf_file_to_parse_stack = nullptr; +static xbt_dynar_t surf_parsed_filename_stack = nullptr; void STag_surfxml_include(void) { @@ -337,7 +336,7 @@ void STag_surfxml_include(void) surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE); surf_parse_push_buffer_state(surf_input_buffer); - fflush(NULL); + fflush(nullptr); } void ETag_surfxml_include(void) { @@ -358,7 +357,7 @@ void ETag_surfxml_include(void) { */ int ETag_surfxml_include_state(void) { - fflush(NULL); + fflush(nullptr); XBT_DEBUG("ETag_surfxml_include_state '%s'",A_surfxml_include_file); if(xbt_dynar_is_empty(surf_input_buffer_stack)) // nope, that's a true premature EOF. Let the parser die verbosely. @@ -420,7 +419,7 @@ void ETag_surfxml_platform(void){ void STag_surfxml_host(void){ AS_TAG = 0; - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void STag_surfxml_prop(void) @@ -435,7 +434,7 @@ void STag_surfxml_prop(void) as_prop_nb++; } XBT_DEBUG("add prop %s=%s into current AS property set", A_surfxml_prop_id, A_surfxml_prop_value); - xbt_dict_set(as_current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), NULL); + xbt_dict_set(as_current_property_set, A_surfxml_prop_id, xbt_strdup(A_surfxml_prop_value), nullptr); } else{ if (!current_property_set) @@ -457,8 +456,8 @@ void ETag_surfxml_host(void) { buf = A_surfxml_host_speed; XBT_DEBUG("Buffer: %s", buf); - host.speed_peak = xbt_dynar_new(sizeof(double), NULL); - if (strchr(buf, ',') == NULL){ + host.speed_peak = xbt_dynar_new(sizeof(double), nullptr); + if (strchr(buf, ',') == nullptr){ double speed = surf_parse_get_speed(A_surfxml_host_speed,"speed of host", host.id); xbt_dynar_push_as(host.speed_peak,double, speed); } @@ -470,7 +469,7 @@ void ETag_surfxml_host(void) { char* speed_str; xbt_dynar_get_cpy(pstate_list, i, &speed_str); - xbt_str_trim(speed_str, NULL); + xbt_str_trim(speed_str, nullptr); speed = surf_parse_get_speed(speed_str,"speed of host", host.id); xbt_dynar_push_as(host.speed_peak, double, speed); XBT_DEBUG("Speed value: %f", speed); @@ -487,7 +486,7 @@ void ETag_surfxml_host(void) { sg_platf_new_host(&host); xbt_dynar_free(&host.speed_peak); - current_property_set = NULL; + current_property_set = nullptr; } void STag_surfxml_host___link(void){ @@ -585,12 +584,12 @@ void ETag_surfxml_cluster(void){ cluster.state_trace = A_surfxml_cluster_state___file; sg_platf_new_cluster(&cluster); - current_property_set = NULL; + current_property_set = nullptr; } void STag_surfxml_cluster(void){ parse_after_config(); - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void STag_surfxml_cabinet(void){ @@ -626,7 +625,7 @@ void STag_surfxml_peer(void){ void STag_surfxml_link(void){ AS_TAG = 0; - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void ETag_surfxml_link(void){ @@ -658,7 +657,7 @@ void ETag_surfxml_link(void){ sg_platf_new_link(&link); - current_property_set = NULL; + current_property_set = nullptr; } void STag_surfxml_link___ctn(void){ @@ -686,7 +685,7 @@ void ETag_surfxml_backbone(void){ s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER; memset(&link,0,sizeof(link)); - link.properties = NULL; + link.properties = nullptr; link.id = A_surfxml_backbone_id; link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth, "bandwidth of backbone", link.id); @@ -747,8 +746,8 @@ void ETag_surfxml_route(void){ route.src = A_surfxml_route_src; route.dst = A_surfxml_route_dst; - route.gw_src = NULL; - route.gw_dst = NULL; + route.gw_src = nullptr; + route.gw_dst = nullptr; route.link_list = new std::vector(); route.symmetrical = (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES); @@ -762,7 +761,7 @@ void ETag_surfxml_route(void){ sg_platf_new_route(&route); - parsed_link_list = NULL; + parsed_link_list = nullptr; } void ETag_surfxml_ASroute(void){ @@ -794,15 +793,15 @@ void ETag_surfxml_ASroute(void){ switch (A_surfxml_ASroute_symmetrical) { case AU_surfxml_ASroute_symmetrical: case A_surfxml_ASroute_symmetrical_YES: - ASroute.symmetrical = TRUE; + ASroute.symmetrical = true; break; case A_surfxml_ASroute_symmetrical_NO: - ASroute.symmetrical = FALSE; + ASroute.symmetrical = false; break; } sg_platf_new_route(&ASroute); - parsed_link_list = NULL; + parsed_link_list = nullptr; } void ETag_surfxml_bypassRoute(void){ @@ -811,9 +810,9 @@ void ETag_surfxml_bypassRoute(void){ route.src = A_surfxml_bypassRoute_src; route.dst = A_surfxml_bypassRoute_dst; - route.gw_src = NULL; - route.gw_dst = NULL; - route.symmetrical = FALSE; + route.gw_src = nullptr; + route.gw_dst = nullptr; + route.symmetrical = false; route.link_list = new std::vector(); unsigned int cpt; @@ -841,7 +840,7 @@ void ETag_surfxml_bypassASroute(void){ ASroute.link_list->push_back(link); } xbt_dynar_free(&parsed_link_list); - ASroute.symmetrical = FALSE; + ASroute.symmetrical = false; ASroute.gw_src = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___src); ASroute.gw_dst = sg_netcard_by_name_or_null(A_surfxml_bypassASroute_gw___dst); @@ -897,7 +896,7 @@ void STag_surfxml_AS(void){ AS.id = A_surfxml_AS_id; AS.routing = (int)A_surfxml_AS_routing; - as_current_property_set = NULL; + as_current_property_set = nullptr; sg_platf_new_AS_begin(&AS); } @@ -918,14 +917,14 @@ void ETag_surfxml_AS(void){ void STag_surfxml_config(void){ AS_TAG = 0; - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); if (_sg_cfg_init_status == 2) { surf_parse_error("All tags must be given before any platform elements (such as , , , , etc)."); } } void ETag_surfxml_config(void){ - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; char *key; char *elem; char *cfg; @@ -940,7 +939,7 @@ void ETag_surfxml_config(void){ XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); xbt_dict_free(¤t_property_set); - current_property_set = NULL; + current_property_set = nullptr; } static int argc; @@ -951,7 +950,7 @@ void STag_surfxml_process(void){ argc = 1; argv = xbt_new(char *, 1); argv[0] = xbt_strdup(A_surfxml_process_function); - xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)"); + xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); } void ETag_surfxml_process(void){ @@ -977,7 +976,7 @@ void ETag_surfxml_process(void){ } sg_platf_new_process(&process); - current_property_set = NULL; + current_property_set = nullptr; } void STag_surfxml_argument(void){ @@ -990,7 +989,7 @@ void STag_surfxml_model___prop(void){ if (!current_model_property_set) current_model_property_set = xbt_dict_new_homogeneous(xbt_free_f); - xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), NULL); + xbt_dict_set(current_model_property_set, A_surfxml_model___prop_id, xbt_strdup(A_surfxml_model___prop_value), nullptr); } void STag_surfxml_gpu(void) {} @@ -1015,21 +1014,12 @@ void ETag_surfxml_model___prop(void){} void surf_parse_open(const char *file) { - static int warned = 0; /* warn only once */ - if (!file) { - if (!warned) { - XBT_WARN - ("Bypassing the XML parser since surf_parse_open received a NULL pointer. " - "If it is not what you want, go fix your code."); - warned = 1; - } - return; - } + xbt_assert(file, "Cannot parse the NULL file. Bypassing the parser is strongly deprecated nowadays."); if (!surf_input_buffer_stack) - surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL); + surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr); if (!surf_file_to_parse_stack) - surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL); + surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), nullptr); if (!surf_parsed_filename_stack) surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref); @@ -1051,18 +1041,18 @@ void surf_parse_close(void) xbt_dynar_free(&surf_file_to_parse_stack); xbt_dynar_free(&surf_parsed_filename_stack); if (surf_parsed_filename) { - char *dir = NULL; + char *dir = nullptr; xbt_dynar_pop(surf_path, &dir); free(dir); } free(surf_parsed_filename); - surf_parsed_filename = NULL; + surf_parsed_filename = nullptr; if (surf_file_to_parse) { surf_parse__delete_buffer(surf_input_buffer); fclose(surf_file_to_parse); - surf_file_to_parse = NULL; //Must be reset for Bypass + surf_file_to_parse = nullptr; //Must be reset for Bypass } }