jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oops, can't Delete() a String* which we've passed to Setattr.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9342 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2006-09-24 03:44:08 +00:00
commit 3c935aa489
1 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/Swig/tree.c
View file

@ -268,7 +268,6 @@ Swig_require(const char *ns, Node *n, ...) {
va_list ap; va_list ap;
char *name; char *name;
DOH *obj; DOH *obj;
String *temp = NewStringEmpty();
va_start(ap, n); va_start(ap, n);
name = va_arg(ap, char *); name = va_arg(ap, char *);
@ -292,9 +291,7 @@ Swig_require(const char *ns, Node *n, ...) {
if (!obj) obj = DohNone; if (!obj) obj = DohNone;
if (newref) { if (newref) {
/* Save a copy of the attribute */ /* Save a copy of the attribute */
Printf(temp, "%s:%s", ns, name); Setattr(n, NewStringf("%s:%s", ns, name), obj);
Setattr(n,temp,obj);
Clear(temp);
} }
name = va_arg(ap, char *); name = va_arg(ap, char *);
} }
@ -305,18 +302,14 @@ Swig_require(const char *ns, Node *n, ...) {
String *view = Getattr(n,k_view); String *view = Getattr(n,k_view);
if (view) { if (view) {
if (Strcmp(view,ns) != 0) { if (Strcmp(view,ns) != 0) {
Printf(temp, "%s:view", ns); Setattr(n, NewStringf("%s:view", ns), view);
Setattr(n,temp,view);
Setattr(n,k_view,ns); Setattr(n,k_view,ns);
Clear(temp);
} }
} else { } else {
Setattr(n,k_view,ns); Setattr(n,k_view,ns);
} }
} }
Delete(temp);
return 1; return 1;
} }
@ -332,7 +325,6 @@ Swig_save(const char *ns, Node *n, ...) {
va_list ap; va_list ap;
char *name; char *name;
DOH *obj; DOH *obj;
String *temp = NewStringEmpty();
va_start(ap, n); va_start(ap, n);
name = va_arg(ap, char *); name = va_arg(ap, char *);
@ -346,12 +338,10 @@ Swig_save(const char *ns, Node *n, ...) {
if (!obj) obj = DohNone; if (!obj) obj = DohNone;
/* Save a copy of the attribute */ /* Save a copy of the attribute */
Printf(temp, "%s:%s", ns, name); if (Setattr(n, NewStringf("%s:%s", ns, name), obj)) {
if (Setattr(n,temp,obj)) { Printf(stderr,"Swig_save('%s','%s'): Warning, attribute '%s' was already saved.\n", ns, nodeType(n), name);
Printf(stderr,"Swig_save('%s','%s'): Warning, attribute '%s' was already saved. [%s]\n", ns, nodeType(n), name);
} }
name = va_arg(ap, char *); name = va_arg(ap, char *);
Clear(temp);
} }
va_end(ap); va_end(ap);
@ -360,18 +350,14 @@ Swig_save(const char *ns, Node *n, ...) {
String *view = Getattr(n,k_view); String *view = Getattr(n,k_view);
if (view) { if (view) {
if (Strcmp(view,ns) != 0) { if (Strcmp(view,ns) != 0) {
Printf(temp, "%s:view", ns); Setattr(n, NewStringf("%s:view", ns), view);
Setattr(n,temp,view);
Setattr(n,k_view,ns); Setattr(n,k_view,ns);
Clear(temp);
} }
} else { } else {
Setattr(n,k_view,ns); Setattr(n,k_view,ns);
} }
} }
Delete(temp);
return 1; return 1;
} }
@ -397,7 +383,7 @@ Swig_restore(Node *n) {
len = Len(temp); len = Len(temp);
for (ki = First(n); ki.key; ki = Next(ki)) { for (ki = First(n); ki.key; ki = Next(ki)) {
if (strncmp(Char(temp),Char(ki.key),len) == 0) { if (Strncmp(temp, ki.key, len) == 0) {
Append(l,ki.key); Append(l,ki.key);
} }
} }