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

Modified Files: 

Tag: TCLSPICE
 	main.c frontend/vectors.c misc/ivars.c
 	spicelib/devices/bsim3/b3temp.c

	Fixes from last patch
This commit is contained in:
stefanjones 2003-07-21 12:18:36 +00:00
parent 54b3079232
commit 3c44d3d4a4
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/vectors.c
View File

@ -621,13 +621,11 @@ vec_free(struct dvec *v)
} }
} }
tfree(v->v_name); tfree(v->v_name);
if(v->v_length) {
if (isreal(v)) { if (isreal(v)) {
tfree(v->v_realdata); tfree(v->v_realdata);
} else { } else {
tfree(v->v_compdata); tfree(v->v_compdata);
} }
}
tfree(v); tfree(v);
return; return;
} }

6
src/main.c
View File

@ -569,10 +569,10 @@ main(int argc, char **argv)
pw = getpwuid(getuid()); pw = getpwuid(getuid());
#ifdef HAVE_ASPRINTF
asprintf(&s, "%s/.spiceinit", pw->pw_dir);
#else /* ~ HAVE_ASPRINTF */
#define INITSTR "/.spiceinit" #define INITSTR "/.spiceinit"
#ifdef HAVE_ASPRINTF
asprintf(&s, "%s%s", pw->pw_dir,INITSTR);
#else /* ~ HAVE_ASPRINTF */
s=(char *) tmalloc(1 + strlen(pw->pw_dir)+strlen(INITSTR)); s=(char *) tmalloc(1 + strlen(pw->pw_dir)+strlen(INITSTR));
sprintf(s,"%s%s",pw->pw_dir,INITSTR); sprintf(s,"%s%s",pw->pw_dir,INITSTR);
#endif /* HAVE_ASPRINTF */ #endif /* HAVE_ASPRINTF */

4
src/misc/ivars.c
View File

@ -42,12 +42,12 @@ mkvar(char **p, char *path_prefix, char *var_dir, char *env_var)
asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir); asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir);
#else /* ~ HAVE_ASPRINTF */ #else /* ~ HAVE_ASPRINTF */
if (buffer){ if (buffer){
p = (char *) tmalloc(strlen(buffer)+1); *p = (char *) tmalloc(strlen(buffer)+1);
sprintf(*p,"%s",buffer); sprintf(*p,"%s",buffer);
/* asprintf(p, "%s", buffer); */ /* asprintf(p, "%s", buffer); */
} }
else{ else{
ip = (char *) tmalloc(strlen(path_prefix) + *p = (char *) tmalloc(strlen(path_prefix) +
strlen(DIR_PATHSEP) + strlen(var_dir) + 1); strlen(DIR_PATHSEP) + strlen(var_dir) + 1);
sprintf(*p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir); sprintf(*p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir);
/* asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir); */ /* asprintf(p, "%s%s%s", path_prefix, DIR_PATHSEP, var_dir); */

5
src/spicelib/devices/bsim3/b3temp.c
View File

@ -789,6 +789,11 @@ int Size_Not_Found;
* pParam->BSIM3sqrtPhi; * pParam->BSIM3sqrtPhi;
/* End of vfbzb */ /* End of vfbzb */
} }
else /* !Size_Not_Found */
{
/* va: pParam might be uninitialized, if !Size_Not_Found */
pParam = here->pParam;
}
/* process source/drain series resistance */ /* process source/drain series resistance */
here->BSIM3drainConductance = model->BSIM3sheetResistance here->BSIM3drainConductance = model->BSIM3sheetResistance