From bbd3673a13d740d2adfba7c603aeede025fbeae5 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 14 Feb 2016 13:23:22 +0100 Subject: [PATCH 1/1] All elements must exist, having one of them is not enough --- src/surf/surfxml_parse.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/surf/surfxml_parse.cpp b/src/surf/surfxml_parse.cpp index 59e99e8bc8..7bb17c0256 100644 --- a/src/surf/surfxml_parse.cpp +++ b/src/surf/surfxml_parse.cpp @@ -730,9 +730,9 @@ void STag_surfxml_route(void){ void STag_surfxml_ASroute(void){ xbt_assert(strlen(A_surfxml_ASroute_src) > 0 - || strlen(A_surfxml_ASroute_dst) > 0 - || strlen(A_surfxml_ASroute_gw___src) > 0 - || strlen(A_surfxml_ASroute_gw___dst) > 0, + && strlen(A_surfxml_ASroute_dst) > 0 + && strlen(A_surfxml_ASroute_gw___src) > 0 + && strlen(A_surfxml_ASroute_gw___dst) > 0, "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", A_surfxml_ASroute_src, A_surfxml_ASroute_dst, A_surfxml_ASroute_gw___src, A_surfxml_ASroute_gw___dst); @@ -741,17 +741,17 @@ void STag_surfxml_ASroute(void){ void STag_surfxml_bypassRoute(void){ xbt_assert(strlen(A_surfxml_bypassRoute_src) > 0 - || strlen(A_surfxml_bypassRoute_dst) > 0, - "Missing end-points while defining bupass route \"%s\"->\"%s\"", + && strlen(A_surfxml_bypassRoute_dst) > 0, + "Missing end-points while defining bypass route \"%s\"->\"%s\"", A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } void STag_surfxml_bypassASroute(void){ xbt_assert(strlen(A_surfxml_bypassASroute_src) > 0 - || strlen(A_surfxml_bypassASroute_dst) > 0 - || strlen(A_surfxml_bypassASroute_gw___src) > 0 - || strlen(A_surfxml_bypassASroute_gw___dst) > 0, + && strlen(A_surfxml_bypassASroute_dst) > 0 + && strlen(A_surfxml_bypassASroute_gw___src) > 0 + && strlen(A_surfxml_bypassASroute_gw___dst) > 0, "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", A_surfxml_bypassASroute_src, A_surfxml_bypassASroute_dst, A_surfxml_bypassASroute_gw___src,A_surfxml_bypassASroute_gw___dst); -- 2.20.1