4545
4646#define WRITEBUFFERSIZE (16384 )
4747
48- bool ZipLoadFile (PGLOBAL g, char * zfn, char * fn, char * entry, bool append, bool mul);
48+ bool ZipLoadFile (PGLOBAL g, PCSZ zfn, PCSZ fn, PCSZ entry, bool append, bool mul);
4949
5050/* **********************************************************************/
5151/* Compress a file in zip when creating a table. */
5252/* **********************************************************************/
53- static bool ZipFile (PGLOBAL g, ZIPUTIL *zutp, char * fn, char * entry, char *buf)
53+ static bool ZipFile (PGLOBAL g, ZIPUTIL *zutp, PCSZ fn, PCSZ entry, char *buf)
5454{
5555 int rc = RC_OK, size_read, size_buf = WRITEBUFFERSIZE;
5656 FILE *fin;
@@ -88,7 +88,7 @@ static bool ZipFile(PGLOBAL g, ZIPUTIL *zutp, char *fn, char *entry, char *buf)
8888/* **********************************************************************/
8989/* Find and Compress several files in zip when creating a table. */
9090/* **********************************************************************/
91- static bool ZipFiles (PGLOBAL g, ZIPUTIL *zutp, char * pat, char *buf)
91+ static bool ZipFiles (PGLOBAL g, ZIPUTIL *zutp, PCSZ pat, char *buf)
9292{
9393 char filename[_MAX_PATH];
9494 int rc;
@@ -203,7 +203,7 @@ static bool ZipFiles(PGLOBAL g, ZIPUTIL *zutp, char *pat, char *buf)
203203/* **********************************************************************/
204204/* Load and Compress a file in zip when creating a table. */
205205/* **********************************************************************/
206- bool ZipLoadFile (PGLOBAL g, char * zfn, char * fn, char * entry, bool append, bool mul)
206+ bool ZipLoadFile (PGLOBAL g, PCSZ zfn, PCSZ fn, PCSZ entry, bool append, bool mul)
207207{
208208 char *buf;
209209 bool err;
@@ -228,7 +228,7 @@ bool ZipLoadFile(PGLOBAL g, char *zfn, char *fn, char *entry, bool append, bool
228228/* **********************************************************************/
229229/* Constructors. */
230230/* **********************************************************************/
231- ZIPUTIL::ZIPUTIL (PSZ tgt)
231+ ZIPUTIL::ZIPUTIL (PCSZ tgt)
232232{
233233 zipfile = NULL ;
234234 target = tgt;
@@ -269,7 +269,7 @@ void ZIPUTIL::getTime(tm_zip& tmZip)
269269/* append: set true to append the zip file */
270270/* return: true if open, false otherwise. */
271271/* **********************************************************************/
272- bool ZIPUTIL::open (PGLOBAL g, char * filename, bool append)
272+ bool ZIPUTIL::open (PGLOBAL g, PCSZ filename, bool append)
273273{
274274 if (!zipfile && !(zipfile = zipOpen64 (filename,
275275 append ? APPEND_STATUS_ADDINZIP
@@ -295,7 +295,7 @@ void ZIPUTIL::close()
295295/* **********************************************************************/
296296/* OpenTableFile: Open a DOS/UNIX table file from a ZIP file. */
297297/* **********************************************************************/
298- bool ZIPUTIL::OpenTable (PGLOBAL g, MODE mode, char * fn, bool append)
298+ bool ZIPUTIL::OpenTable (PGLOBAL g, MODE mode, PCSZ fn, bool append)
299299{
300300 /* ********************************************************************/
301301 /* The file will be compressed. */
@@ -338,7 +338,7 @@ bool ZIPUTIL::OpenTable(PGLOBAL g, MODE mode, char *fn, bool append)
338338/* **********************************************************************/
339339/* Add target in zip file. */
340340/* **********************************************************************/
341- bool ZIPUTIL::addEntry (PGLOBAL g, char * entry)
341+ bool ZIPUTIL::addEntry (PGLOBAL g, PCSZ entry)
342342{
343343 // ?? we dont need the stinking time
344344 zip_fileinfo zi = { 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 };
@@ -382,7 +382,7 @@ void ZIPUTIL::closeEntry()
382382/* **********************************************************************/
383383/* Constructors. */
384384/* **********************************************************************/
385- UNZIPUTL::UNZIPUTL (PSZ tgt, bool mul)
385+ UNZIPUTL::UNZIPUTL (PCSZ tgt, bool mul)
386386{
387387 zipfile = NULL ;
388388 target = tgt;
@@ -439,8 +439,8 @@ UNZIPUTL::UNZIPUTL(PZIPUTIL zutp)
439439/* This code is the copyright property of Alessandro Felice Cantatore. */
440440/* http://xoomer.virgilio.it/acantato/dev/wildcard/wildmatch.html */
441441/* **********************************************************************/
442- bool UNZIPUTL::WildMatch (PSZ pat, PSZ str) {
443- PSZ s, p;
442+ bool UNZIPUTL::WildMatch (PCSZ pat, PCSZ str) {
443+ PCSZ s, p;
444444 bool star = FALSE ;
445445
446446loopStart:
@@ -474,7 +474,7 @@ bool UNZIPUTL::WildMatch(PSZ pat, PSZ str) {
474474/* param: filename path and the filename of the zip file to open. */
475475/* return: true if open, false otherwise. */
476476/* **********************************************************************/
477- bool UNZIPUTL::open (PGLOBAL g, char * filename)
477+ bool UNZIPUTL::open (PGLOBAL g, PCSZ filename)
478478{
479479 if (!zipfile && !(zipfile = unzOpen64 (filename)))
480480 sprintf (g->Message , " Zipfile open error on %s"
@@ -564,7 +564,7 @@ int UNZIPUTL::nextEntry(PGLOBAL g)
564564/* **********************************************************************/
565565/* OpenTableFile: Open a DOS/UNIX table file from a ZIP file. */
566566/* **********************************************************************/
567- bool UNZIPUTL::OpenTable (PGLOBAL g, MODE mode, char * fn)
567+ bool UNZIPUTL::OpenTable (PGLOBAL g, MODE mode, PCSZ fn)
568568{
569569 /* ********************************************************************/
570570 /* The file will be decompressed into virtual memory. */
@@ -636,7 +636,7 @@ bool UNZIPUTL::OpenTable(PGLOBAL g, MODE mode, char *fn)
636636/* **********************************************************************/
637637/* Insert only if the entry does not exist. */
638638/* **********************************************************************/
639- bool UNZIPUTL::IsInsertOk (PGLOBAL g, char * fn)
639+ bool UNZIPUTL::IsInsertOk (PGLOBAL g, PCSZ fn)
640640{
641641 bool ok = true , b = open (g, fn);
642642
0 commit comments