A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't decrement surfxml_buffer_stack_stack_ptr twice in SURFXML_END_TAG.
[simgrid.git]
/
include
/
surf
/
surfxml_parse.h
diff --git
a/include/surf/surfxml_parse.h
b/include/surf/surfxml_parse.h
index
6457ba6
..
c46eb40
100644
(file)
--- a/
include/surf/surfxml_parse.h
+++ b/
include/surf/surfxml_parse.h
@@
-35,8
+35,6
@@
XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_ASroute_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_ASroute_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassRoute_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassRoute_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_ASroute_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassRoute_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassRoute_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_cluster_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_cluster_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_peer_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_peer_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_include_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_peer_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_peer_cb_list;
XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_include_cb_list;
@@
-47,10
+45,10
@@
XBT_PUBLIC(void) surf_parse_close(void);
XBT_PUBLIC(void) surf_parse_init_callbacks(void);
XBT_PUBLIC(void) surf_parse_reset_callbacks(void);
XBT_PUBLIC(void) surf_parse_free_callbacks(void);
XBT_PUBLIC(void) surf_parse_init_callbacks(void);
XBT_PUBLIC(void) surf_parse_reset_callbacks(void);
XBT_PUBLIC(void) surf_parse_free_callbacks(void);
-XBT_PUBLIC(void) surf_parse_error(const char *msg) _XBT_GNUC_NORETURN;
+XBT_PUBLIC(void) surf_parse_error(const char *msg,...) _XBT_GNUC_PRINTF(1,2) _XBT_GNUC_NORETURN;
+XBT_PUBLIC(void) surf_parse_warn(const char *msg,...) _XBT_GNUC_PRINTF(1,2);
XBT_PUBLIC(double) surf_parse_get_double(const char *string);
XBT_PUBLIC(int) surf_parse_get_int(const char *string);
XBT_PUBLIC(double) surf_parse_get_double(const char *string);
XBT_PUBLIC(int) surf_parse_get_int(const char *string);
-XBT_PUBLIC(void) surf_parse_models_setup(void);
/* Prototypes of the functions offered by flex */
XBT_PUBLIC(int) surf_parse_lex(void);
XBT_PUBLIC(int) surf_parse_get_lineno(void);
/* Prototypes of the functions offered by flex */
XBT_PUBLIC(int) surf_parse_lex(void);
XBT_PUBLIC(int) surf_parse_get_lineno(void);
@@
-83,17
+81,17
@@
extern unsigned int surfxml_buffer_stack_stack[1024];
AX_ptr = 0; \
memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0)
AX_ptr = 0; \
memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0)
-#define SURFXML_START_TAG(tag)
do{
\
-
surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr] = AX_ptr;
\
-
surfxml_buffer_stack_stack_ptr++;
\
-
STag_surfxml_##tag();
\
-
}while(0)
+#define SURFXML_START_TAG(tag) \
+
do{
\
+
surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr++] = AX_ptr;
\
+
STag_surfxml_##tag();
\
+ }while(0)
-#define SURFXML_END_TAG(tag)
do{
\
-
surfxml_buffer_stack_stack_ptr--;
\
-
AX_ptr = surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr-1];
\
-
ETag_surfxml_##tag();
\
-
} while(0)
+#define SURFXML_END_TAG(tag)
\
+
do{
\
+
AX_ptr = surfxml_buffer_stack_stack[--surfxml_buffer_stack_stack_ptr];
\
+
ETag_surfxml_##tag();
\
+ } while(0)
XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list,
void_f_void_t function);
XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list,
void_f_void_t function);