luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix false wcnt warning in draw_graph()

This commit is contained in:
stefan schippers 2023-10-13 23:09:27 +02:00
parent 25ab8a8b8a
commit 8ceb4b6b41
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/draw.c
View File

@ -3174,8 +3174,13 @@ void draw_graph(int i, const int flags, Graph_ctx *gr, void *ct)
} }
/* process each node given in "node" attribute, get also associated color/sweep var if any*/ /* process each node given in "node" attribute, get also associated color/sweep var if any*/
while( (ntok = my_strtok_r(nptr, "\n\t ", "\"", 4, &saven)) ) { while( (ntok = my_strtok_r(nptr, "\n\t ", "\"", 4, &saven)) ) {
/* if %<n> is specified after node name, <n> is the dataset number to plot in graph */
char *nd = find_nth(ntok, "%", "\"", 0, 2); char *nd = find_nth(ntok, "%", "\"", 0, 2);
if(wcnt >= n_nodes) {
dbg(0, "draw_graph(): WARNING: wcnt (wave #) >= n_nodes (counted # of waves)\n");
dbg(0, "draw_graph(): n_nodes=%d\n", n_nodes);
wcnt--; /* nosense, but avoid a crash */
}
/* if %<n> is specified after node name, <n> is the dataset number to plot in graph */
if(nd[0]) { if(nd[0]) {
node_dataset = atoi(nd); node_dataset = atoi(nd);
my_strdup(_ALLOC_ID_, &ntok_copy, find_nth(ntok, "%", "\"", 0, 1)); my_strdup(_ALLOC_ID_, &ntok_copy, find_nth(ntok, "%", "\"", 0, 1));
@ -3333,10 +3338,6 @@ void draw_graph(int i, const int flags, Graph_ctx *gr, void *ct)
if(idx_arr) my_free(_ALLOC_ID_, &idx_arr); if(idx_arr) my_free(_ALLOC_ID_, &idx_arr);
} /* if( expression || (idx = get_raw_index(bus_msb ? bus_msb : express)) != -1 ) */ } /* if( expression || (idx = get_raw_index(bus_msb ? bus_msb : express)) != -1 ) */
++wcnt; ++wcnt;
if(wcnt >= n_nodes) {
dbg(0, "draw_graph(): WARNING: wcnt (wave #) >= n_nodes (counted # of waves)\n");
wcnt--; /* nosense, but avoid a crash */
}
if(bus_msb) my_free(_ALLOC_ID_, &bus_msb); if(bus_msb) my_free(_ALLOC_ID_, &bus_msb);
} /* while( (ntok = my_strtok_r(nptr, "\n\t ", "", 0, &saven)) ) */ } /* while( (ntok = my_strtok_r(nptr, "\n\t ", "", 0, &saven)) ) */
if(ntok_copy) my_free(_ALLOC_ID_, &ntok_copy); if(ntok_copy) my_free(_ALLOC_ID_, &ntok_copy);