[sonar] Add attribute "noreturn".

diff --git a/src/surf/xml/simgrid_dtd.h b/src/surf/xml/simgrid_dtd.h
index 0d42263..7558fc0 100644 (file)
--- a/src/surf/xml/simgrid_dtd.h
+++ b/src/surf/xml/simgrid_dtd.h
@@ -84,7 +84,7 @@ XBT_PUBLIC void STag_surfxml_link___ctn(void);
 XBT_PUBLIC void ETag_surfxml_link___ctn(void);
 XBT_PUBLIC void STag_surfxml_model___prop(void);
 XBT_PUBLIC void ETag_surfxml_model___prop(void);
-XBT_PUBLIC void STag_surfxml_mount(void);
+XBT_ATTRIB_NORETURN XBT_PUBLIC void STag_surfxml_mount(void);
 XBT_PUBLIC void ETag_surfxml_mount(void);
 XBT_PUBLIC void STag_surfxml_peer(void);
 XBT_PUBLIC void ETag_surfxml_peer(void);
@@ -100,9 +100,9 @@ XBT_PUBLIC void STag_surfxml_route(void);
 XBT_PUBLIC void ETag_surfxml_route(void);
 XBT_PUBLIC void STag_surfxml_router(void);
 XBT_PUBLIC void ETag_surfxml_router(void);
-XBT_PUBLIC void STag_surfxml_storage(void);
+XBT_ATTRIB_NORETURN XBT_PUBLIC void STag_surfxml_storage(void);
 XBT_PUBLIC void ETag_surfxml_storage(void);
-XBT_PUBLIC void STag_surfxml_storage___type(void);
+XBT_ATTRIB_NORETURN XBT_PUBLIC void STag_surfxml_storage___type(void);
 XBT_PUBLIC void ETag_surfxml_storage___type(void);
 XBT_PUBLIC void STag_surfxml_trace(void);
 XBT_PUBLIC void ETag_surfxml_trace(void);

diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake
index 8bf37e7..5487904 100644 (file)
--- a/tools/cmake/MaintainerMode.cmake
+++ b/tools/cmake/MaintainerMode.cmake
@@ -163,6 +163,7 @@ if(enable_maintainer_mode AND NOT WIN32)
     set(string1  "'s/extern /XBT_PUBLIC_DATA /'")
     set(string2  "'s/XBT_PUBLIC_DATA \\([^(]*\\)(/XBT_PUBLIC \\1(/'")
     set(string3  "'s/XBT_PUBLIC void STag_surfxml_include/XBT_ATTRIB_NORETURN &/'") # remove with v5 of the dtd
+    set(string4  "'s/XBT_PUBLIC void STag_surfxml_\\(mount\\|storage\\)/XBT_ATTRIB_NORETURN &/'") # remove with v5 of the dtd
     set(string5  "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'")
     set(string9  "'s/#include <unistd.h>/#if defined(_WIN32)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g'")
     set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'")
@@ -195,6 +196,7 @@ if(enable_maintainer_mode AND NOT WIN32)
       COMMAND ${SED_EXE} -i ${string1} src/surf/xml/simgrid_dtd.h
       COMMAND ${SED_EXE} -i ${string2} src/surf/xml/simgrid_dtd.h
       COMMAND ${SED_EXE} -i ${string3} src/surf/xml/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string4} src/surf/xml/simgrid_dtd.h
       COMMAND ${SED_EXE} -i ${string14} src/surf/xml/simgrid_dtd.h
       COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/surf/xml/simgrid_dtd.h"