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
Remove useless check for null before free.
[simgrid.git]
/
src
/
xbt
/
automaton
/
automatonparse_promela.c
diff --git
a/src/xbt/automaton/automatonparse_promela.c
b/src/xbt/automaton/automatonparse_promela.c
index
3d83df1
..
6f59cb4
100644
(file)
--- a/
src/xbt/automaton/automatonparse_promela.c
+++ b/
src/xbt/automaton/automatonparse_promela.c
@@
-1,7
+1,6
@@
/* methods for implementation of automaton from promela description */
/* methods for implementation of automaton from promela description */
-/* Copyright (c) 2011-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2011-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-13,28
+12,30
@@
#if HAVE_UNISTD_H
# include <unistd.h> /* isatty */
#endif
#if HAVE_UNISTD_H
# include <unistd.h> /* isatty */
#endif
+#include <xbt/log.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_automaton);
static xbt_automaton_t parsed_automaton;
char* state_id_src;
static void new_state(char* id, int src){
static xbt_automaton_t parsed_automaton;
char* state_id_src;
static void new_state(char* id, int src){
-
+ char* saveptr = NULL; // for strtok_r()
char* id_copy = xbt_strdup(id);
char* id_copy = xbt_strdup(id);
- char* first_part = strtok
(id_copy,"_"
);
+ char* first_part = strtok
_r(id_copy, "_", &saveptr
);
int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
if(strcmp(first_part,"accept")==0){
type = 1;
}else{
int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
if(strcmp(first_part,"accept")==0){
type = 1;
}else{
- char* second_part = strtok
(NULL,"_"
);
+ char* second_part = strtok
_r(NULL, "_", &saveptr
);
if(strcmp(second_part,"init")==0){
type = -1;
}
}
if(strcmp(second_part,"init")==0){
type = -1;
}
}
- free(id_copy);
+
xbt_
free(id_copy);
- xbt_automaton_state_t state = NULL;
- state = xbt_automaton_state_exists(parsed_automaton, id);
+ xbt_automaton_state_t state = xbt_automaton_state_exists(parsed_automaton, id);
if(state == NULL){
state = xbt_automaton_state_new(parsed_automaton, type, id);
}
if(state == NULL){
state = xbt_automaton_state_new(parsed_automaton, type, id);
}
@@
-43,19
+44,17
@@
static void new_state(char* id, int src){
parsed_automaton->current_state = state;
if(src) {
parsed_automaton->current_state = state;
if(src) {
- if (state_id_src)
- free(state_id_src);
+ xbt_free(state_id_src);
state_id_src = xbt_strdup(id);
}
}
static void new_transition(char* id, xbt_automaton_exp_label_t label)
{
state_id_src = xbt_strdup(id);
}
}
static void new_transition(char* id, xbt_automaton_exp_label_t label)
{
- xbt_automaton_state_t state_dst = NULL;
new_state(id, 0);
new_state(id, 0);
- state_dst = xbt_automaton_state_exists(parsed_automaton, id);
+
xbt_automaton_state_t
state_dst = xbt_automaton_state_exists(parsed_automaton, id);
xbt_automaton_state_t state_src = xbt_automaton_state_exists(parsed_automaton, state_id_src);
xbt_automaton_state_t state_src = xbt_automaton_state_exists(parsed_automaton, state_id_src);
-
+
//xbt_transition_t trans = NULL;
xbt_automaton_transition_new(parsed_automaton, state_src, state_dst, label);
//xbt_transition_t trans = NULL;
xbt_automaton_transition_new(parsed_automaton, state_src, state_dst, label);
@@
-92,6
+91,9
@@
static xbt_automaton_exp_label_t new_label(int type, ...){
case 4 :
label = xbt_automaton_exp_label_new(type);
break;
case 4 :
label = xbt_automaton_exp_label_new(type);
break;
+ default:
+ XBT_DEBUG("Invalid type: %d", type);
+ break;
}
va_end(ap);
return label;
}
va_end(ap);
return label;