luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

protect vec_free() and free_pnode() macro for use in non braced blocks 

if ()
  vec_free()
This commit is contained in:
rlar 2017-03-25 19:47:36 +01:00
parent c7811a76df
commit ab409ad62e
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/parse.h
View File

@ -10,7 +10,11 @@
#include "ngspice/wordlist.h" #include "ngspice/wordlist.h"
#ifndef free_pnode #ifndef free_pnode
#define free_pnode(ptr) free_pnode_x(ptr); ptr=NULL; #define free_pnode(ptr) \
do { \
free_pnode_x(ptr); \
ptr = NULL; \
} while(0)
#endif #endif

6
src/frontend/vectors.h
View File

@ -6,7 +6,11 @@
#ifndef ngspice_VECTORS_H #ifndef ngspice_VECTORS_H
#define ngspice_VECTORS_H #define ngspice_VECTORS_H
#define vec_free(ptr) vec_free_x(ptr); ptr=NULL #define vec_free(ptr) \
do { \
vec_free_x(ptr); \
ptr = NULL; \
} while(0)
#endif #endif

12
src/include/ngspice/fteext.h
View File

@ -262,7 +262,11 @@ extern struct func func_not;
extern struct func func_uminus; extern struct func func_uminus;
extern struct pnode *ft_getpnames(wordlist *wl, bool check); extern struct pnode *ft_getpnames(wordlist *wl, bool check);
extern struct pnode *alloc_pnode(void); extern struct pnode *alloc_pnode(void);
#define free_pnode(ptr) free_pnode_x(ptr); ptr=NULL #define free_pnode(ptr) \
do { \
free_pnode_x(ptr); \
ptr = NULL; \
} while(0)
extern void free_pnode_x(struct pnode *t); extern void free_pnode_x(struct pnode *t);
/* plotcurve.c */ /* plotcurve.c */
@ -335,7 +339,11 @@ extern struct plot *plot_alloc(char *name);
extern struct plot *plot_list; extern struct plot *plot_list;
extern int plotl_changed; extern int plotl_changed;
extern void plot_add(struct plot *pl); extern void plot_add(struct plot *pl);
#define vec_free(ptr) vec_free_x(ptr); ptr=NULL #define vec_free(ptr) \
do { \
vec_free_x(ptr); \
ptr = NULL; \
} while(0)
extern void vec_free_x(struct dvec *v); extern void vec_free_x(struct dvec *v);
extern void vec_gc(void); extern void vec_gc(void);
extern void ft_loadfile(char *file); extern void ft_loadfile(char *file);