summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/ketcindy/ketlibC
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-03 22:44:58 +0000
committerKarl Berry <karl@freefriends.org>2019-02-03 22:44:58 +0000
commit2dcfe2f07af05124d5ebee4672d67d7eeae7af60 (patch)
tree7008760d5ea7041b1f981e9c3d1d8ef6719013ce /Master/texmf-dist/scripts/ketcindy/ketlibC
parent9c1b590fa92293b7bc04195a05641af25185dc64 (diff)
ketcindy (3feb19)
git-svn-id: svn://tug.org/texlive/trunk@49922 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/ketcindy/ketlibC')
-rw-r--r--Master/texmf-dist/scripts/ketcindy/ketlibC/ketlibClog.txt4
-rw-r--r--Master/texmf-dist/scripts/ketcindy/ketlibC/surflib.h90
2 files changed, 65 insertions, 29 deletions
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlibC/ketlibClog.txt b/Master/texmf-dist/scripts/ketcindy/ketlibC/ketlibClog.txt
index cb026b1a340..d3f9ac4d8d1 100644
--- a/Master/texmf-dist/scripts/ketcindy/ketlibC/ketlibClog.txt
+++ b/Master/texmf-dist/scripts/ketcindy/ketlibC/ketlibClog.txt
@@ -1,3 +1,7 @@
+190124
+ readoutdata3 changed (tmp,strtmp)
+190123
+ Use of sprintf
181105
output3h debugged ( ctr=0 added in varh )
readoutdata3 debugged (//,etc )
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlibC/surflib.h b/Master/texmf-dist/scripts/ketcindy/ketlibC/surflib.h
index a72eed58230..f700a071252 100644
--- a/Master/texmf-dist/scripts/ketcindy/ketlibC/surflib.h
+++ b/Master/texmf-dist/scripts/ketcindy/ketlibC/surflib.h
@@ -1356,16 +1356,24 @@ void wireparadata(short ch,double bdyk[][3], double udata[], double vdata[],cons
if(strlen(fnameh)>0){
allflg=0;
}
- char var[20]="wire3d";
- char varh[20]="wireh3d";
- char varnow[20]={'\0'};
- char varhnow[20]={'\0'};
- sprintf(var,"%s%d",var,ch);
- sprintf(varh,"%s%d",varh,ch);
- char dirfname[256] = {'\0'};
- char dirfnameh[256] = {'\0'};
- char varname[256] = {'\0'};
- char varnameh[256] = {'\0'};
+ char var0[]="wire3d";
+ char varh0[]="wireh3d";
+ char var[20];
+ char varh[20];
+ char varnow[40];
+ char varhnow[40];
+ varnow[0]='\0';
+ varhnow[0]='\0';
+ sprintf(var,"%s%d",var0,ch);
+ sprintf(varh,"%s%d",varh0,ch);
+ char dirfname[256];
+ char dirfnameh[256];
+ char varname[256];
+ char varnameh[256];
+ dirfname[0]='\0';
+ dirfnameh[0]='\0';
+ varname[0]='\0';
+ varnameh[0]='\0';
sprintf(varname,"%s%d",var,ch);
sprintf(varnameh,"%s%d",varh,ch);
sprintf(dirfname,"%s%s",Dirname,fname);
@@ -1440,9 +1448,11 @@ void intersectcrvsf(const char *wa, short chfd,double crv[][3],const char *fname
char chc[10];
sprintf(chc,"%d",chfd);
char var[]="intercrvsf";
- char dirfname[256] = {'\0'};
+ char dirfname[256];
+ dirfname[0] = '\0';
sprintf(dirfname,"%s%s",Dirname,fname);
- char varname[256] = {'\0'};
+ char varname[256];
+ varname[0] = '\0';
sprintf(varname,"%s%s",var,chc);
ptL[0][0]=0;
for(i=1;i<length3(crv);i++){
@@ -1471,16 +1481,24 @@ void sfcutparadata(short chfd, short ncut, double fbdy3[][3],const char *fname,c
if(strlen(fnameh)==0){
allflg=1;
}
- char var[20]="sfcut3d";
- char varh[20]="sfcuth3d";
- sprintf(var,"%s%d",var,chfd);
- sprintf(varh,"%s%d",varh,chfd);
- char varnow[20]={'\0'};
- char varhnow[20]={'\0'};
- char dirfname[256] = {'\0'};
- char dirfnameh[256] = {'\0'};
- char varname[256] = {'\0'};
- char varnameh[256] = {'\0'};
+ char var0[]="sfcut3d";
+ char varh0[]="sfcuth3d";
+ char var[20];
+ char varh[20];
+ sprintf(var,"%s%d",var0,chfd);
+ sprintf(varh,"%s%d",varh0,chfd);
+ char varnow[40];
+ char varhnow[40];
+ char dirfname[256];
+ char dirfnameh[256];
+ char varname[256];
+ char varnameh[256];
+ varnow[0]='\0';
+ varhnow[0]='\0';
+ dirfname[0]='\0';
+ dirfnameh[0]='\0';
+ varname[0]='\0';
+ varnameh[0]='\0';
sprintf(varname,"%s%d",var,chfd);
sprintf(varnameh,"%s%d",varh,chfd);
sprintf(dirfname,"%s%s",Dirname,fname);
@@ -1959,10 +1977,16 @@ int skeletondata3(double data[][3], double r00,
void readoutdata3(const char *fname, const char *var, double data[][3]){
double x,y,z;
float xx;
- char dstrorg[256] = {'\0'};
- char dstr[256] = {'\0'};
- char str[10] = {'\0'},tmp[2]={'\0'};
- int linectr=0, start=0, jj,nn,nctr;
+ char dstrorg[256];
+ dstrorg[0]='\0';
+ char dstr[256];
+ dstr[0]='\0';
+ char str[10];
+ str[0]='\0';
+ char strtmp[30];
+ char tmp[10];
+ tmp[0]='\0';
+ int linectr=0, start=0,ii,jj,nn,nctr;
FILE *fp;
fp=fopen(fname,"r");
if(fp==NULL){
@@ -2005,7 +2029,7 @@ void readoutdata3(const char *fname, const char *var, double data[][3]){
str[0]='\0';
nctr=0;
for(jj=2;jj<250;jj++){
- tmp[0]='\0'; sprintf(tmp,"%s%c",tmp,dstr[jj]);
+ tmp[0]='\0'; sprintf(tmp,"%c",dstr[jj]);
if(strncmp(tmp,"/",1)==0){
break;
}
@@ -2028,13 +2052,21 @@ void readoutdata3(const char *fname, const char *var, double data[][3]){
add3(data,x,y,z);
nctr=0;
jj++;
- tmp[0]='\0'; sprintf(tmp,"%s%c",tmp,dstr[jj]);
+ tmp[0]='\0'; sprintf(tmp,"%c",dstr[jj]);
if(strncmp(tmp,",",1)==0){
jj++;
}
continue;
}
- sprintf(str,"%s%s",str,tmp);
+ strtmp[0]='\0';
+ sprintf(strtmp,"%s%s",str,tmp);
+ str[0]='\0';
+ for(ii=0;ii<20;ii++){
+ str[ii]=strtmp[ii];
+ if(strtmp[ii]=='\0'){
+ break;
+ }
+ }
}
}
fclose(fp);