Overview
| Comment: | Change the internal composite_slice function |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
2312d4d6df5810807e5262df84edd856 |
| User & Date: | user on 2021-10-05 00:26:12.723 |
| Other Links: | manifest | tags |
Context
|
2021-10-07
| ||
| 05:50 | Add a FAQ entry relating to MIME types. check-in: 6f7620efc8 user: user tags: trunk | |
|
2021-10-05
| ||
| 00:26 | Change the internal composite_slice function check-in: 2312d4d6df user: user tags: trunk | |
|
2021-10-02
| ||
| 01:55 | Implement composite puzzle sets check-in: 4919d2c22e user: user tags: trunk | |
Changes
Modified class.c
from [1ee8b910eb]
to [197962d870].
| ︙ | ︙ | |||
2109 2110 2111 2112 2113 2114 2115 |
int i;
int gloptr=0;
Hash*glolocalhash;
char*nam=sqlite3_mprintf("%s.class",basefilename);
sqlite3_stmt*vst=0;
fprintf(stderr,"Loading class definitions...\n");
if(!nam) fatal("Allocation failed\n");
| | | 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 |
int i;
int gloptr=0;
Hash*glolocalhash;
char*nam=sqlite3_mprintf("%s.class",basefilename);
sqlite3_stmt*vst=0;
fprintf(stderr,"Loading class definitions...\n");
if(!nam) fatal("Allocation failed\n");
classfp=main_options['z']?composite_slice(".class",1):fopen(nam,"r");
sqlite3_free(nam);
if(!classfp) fatal("Cannot open class file '%s': %m\n",nam);
glohash=calloc(HASH_SIZE,sizeof(Hash));
if(!glohash) fatal("Allocation failed\n");
glolocalhash=calloc(LOCAL_HASH_SIZE,sizeof(Hash));
if(!glolocalhash) fatal("Allocation failed\n");
strcpy(tokenstr,"+"); glohash[look_hash_mac()].id=MAC_ADD;
|
| ︙ | ︙ |
Modified main.c
from [4242250daf]
to [2701a43599].
| ︙ | ︙ | |||
104 105 106 107 108 109 110 | FILE*fp; SliceCookie*d; int c,n; sqlite3_int64 t; rewind(compositefp); look: n=0; | | | > | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 |
FILE*fp;
SliceCookie*d;
int c,n;
sqlite3_int64 t;
rewind(compositefp);
look:
n=0;
if(*suffix=='.') for(;;) {
c=fgetc(compositefp);
if(c==EOF) goto notfound;
if(!c) goto skip;
if(c=='.') goto name;
}
for(;;) {
c=fgetc(compositefp);
if(c==EOF) goto notfound;
name:
if(!c) {
if(suffix[n]) goto skip; else goto found;
}
if(c==suffix[n]) {
n++;
} else {
do c=fgetc(compositefp); while(c>0);
|
| ︙ | ︙ | |||
556 557 558 559 560 561 562 |
if(!fp) fatal("Cannot open '%s' for reading: %m\n",basefilename);
fprintf(stderr,"Loading puzzle set...\n");
if(z=sqlite3_exec(userdb,"BEGIN;",0,0,0)) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb));
if(z=sqlite3_prepare_v2(userdb,"SELECT `ID`, `TIME` FROM `USERCACHEINDEX` WHERE `NAME` = CHAR(?2)||'//'||?1;",-1,&st,0)) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb));
basefilename=realpath(basefilename,0);
if(!basefilename) fatal("Cannot find real path of puzzle set: %m\n");
sqlite3_bind_text(st,1,basefilename,-1,0);
| | | | 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 |
if(!fp) fatal("Cannot open '%s' for reading: %m\n",basefilename);
fprintf(stderr,"Loading puzzle set...\n");
if(z=sqlite3_exec(userdb,"BEGIN;",0,0,0)) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb));
if(z=sqlite3_prepare_v2(userdb,"SELECT `ID`, `TIME` FROM `USERCACHEINDEX` WHERE `NAME` = CHAR(?2)||'//'||?1;",-1,&st,0)) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb));
basefilename=realpath(basefilename,0);
if(!basefilename) fatal("Cannot find real path of puzzle set: %m\n");
sqlite3_bind_text(st,1,basefilename,-1,0);
levelfp=composite_slice(".level",1);
solutionfp=composite_slice(".solution",1);
sqlite3_bind_int(st,2,'L');
z=sqlite3_step(st);
if(z==SQLITE_ROW) {
leveluc=sqlite3_column_int64(st,0);
t1=sqlite3_column_int64(st,1);
} else if(z==SQLITE_DONE) {
leveluc=t1=-1;
|
| ︙ | ︙ |
Modified picture.c
from [5b37db371e]
to [fcd841c5a5].
| ︙ | ︙ | |||
665 666 667 668 669 670 671 |
Uint8 havesize1[256];
Uint16 havesize[256];
char*nam=sqlite3_mprintf("%s.xclass",basefilename);
const char*v;
int i,j,n;
if(!nam) fatal("Allocation failed\n");
fprintf(stderr,"Loading pictures...\n");
| | | 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 |
Uint8 havesize1[256];
Uint16 havesize[256];
char*nam=sqlite3_mprintf("%s.xclass",basefilename);
const char*v;
int i,j,n;
if(!nam) fatal("Allocation failed\n");
fprintf(stderr,"Loading pictures...\n");
fp=main_options['z']?composite_slice(".xclass",1):fopen(nam,"r");
if(!fp) fatal("Failed to open xclass file (%m)\n");
sqlite3_free(nam);
optionquery[1]=Q_altImage;
altImage=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"0",0,10);
optionquery[1]=Q_imageSize;
v=xrm_get_resource(resourcedb,optionquery,optionquery,2);
if(v) while(nwantsize<32) {
|
| ︙ | ︙ |