Update fstapi.c to the latest from GTKWave
This commit is contained in:
parent
cc921de717
commit
407b5a1d7a
66
vpi/fstapi.c
66
vpi/fstapi.c
|
|
@ -194,7 +194,7 @@ if(nam) /* cppcheck warning fix: nam is always defined, so this is not needed */
|
|||
dwRetVal = GetTempPath(MAX_PATH, lpTempPathBuffer);
|
||||
if((dwRetVal > MAX_PATH) || (dwRetVal == 0))
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"GetTempPath() failed in "__FILE__" line %d, exiting.\n", __LINE__);
|
||||
fprintf(stderr, FST_APIMESS "GetTempPath() failed in " __FILE__ " line %d, exiting.\n", __LINE__);
|
||||
exit(255);
|
||||
}
|
||||
else
|
||||
|
|
@ -202,7 +202,7 @@ if(nam) /* cppcheck warning fix: nam is always defined, so this is not needed */
|
|||
uRetVal = GetTempFileName(lpTempPathBuffer, TEXT("FSTW"), 0, szTempFileName);
|
||||
if (uRetVal == 0)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"GetTempFileName() failed in "__FILE__" line %d, exiting.\n", __LINE__);
|
||||
fprintf(stderr, FST_APIMESS "GetTempFileName() failed in " __FILE__ " line %d, exiting.\n", __LINE__);
|
||||
exit(255);
|
||||
}
|
||||
else
|
||||
|
|
@ -806,7 +806,7 @@ if(rc<0)
|
|||
{
|
||||
xc->fseek_failed = 1;
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
|
||||
fprintf(stderr, FST_APIMESS "Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
|
||||
perror("Why");
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1666,7 +1666,7 @@ if(zerocnt)
|
|||
/* fpos += */ fstWriterVarint(f, (zerocnt << 1)); /* scan-build */
|
||||
}
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"value chains: %d\n", cnt);
|
||||
fprintf(stderr, FST_APIMESS "value chains: %d\n", cnt);
|
||||
#endif
|
||||
|
||||
xc->vchg_mem[0] = '!';
|
||||
|
|
@ -1741,7 +1741,7 @@ if(xc->dump_size_limit)
|
|||
xc2->size_limit_locked = 1;
|
||||
xc2->is_initial_time = 1; /* to trick emit value and emit time change */
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"<< dump file size limit reached, stopping dumping >>\n");
|
||||
fprintf(stderr, FST_APIMESS "<< dump file size limit reached, stopping dumping >>\n");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -2481,7 +2481,7 @@ if(xc)
|
|||
#ifndef FST_WRITER_PARALLEL
|
||||
if(xc->parallel_enabled)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstWriterSetParallelMode(), FST_WRITER_PARALLEL not enabled during compile, exiting.\n");
|
||||
fprintf(stderr, FST_APIMESS "fstWriterSetParallelMode(), FST_WRITER_PARALLEL not enabled during compile, exiting.\n");
|
||||
exit(255);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -2806,8 +2806,8 @@ if(ctx && name && literal_arr && val_arr && (elem_count != 0))
|
|||
attr_str[pos-1] = 0;
|
||||
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"fstWriterCreateEnumTable() total_len: %d, pos: %d\n", total_len, pos);
|
||||
fprintf(stderr, FST_APIMESS"*%s*\n", attr_str);
|
||||
fprintf(stderr, FST_APIMESS "fstWriterCreateEnumTable() total_len: %d, pos: %d\n", total_len, pos);
|
||||
fprintf(stderr, FST_APIMESS "*%s*\n", attr_str);
|
||||
#endif
|
||||
|
||||
fstWriterSetAttrBegin(xc, FST_AT_MISC, FST_MT_ENUMTABLE, attr_str, handle = ++xc->max_enumhandle);
|
||||
|
|
@ -2868,7 +2868,7 @@ if((xc) && (handle <= xc->maxhandle))
|
|||
xc->vchg_mem = (unsigned char *)realloc(xc->vchg_mem, xc->vchg_alloc_siz);
|
||||
if(!xc->vchg_mem)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"Could not realloc() in fstWriterEmitValueChange, exiting.\n");
|
||||
fprintf(stderr, FST_APIMESS "Could not realloc() in fstWriterEmitValueChange, exiting.\n");
|
||||
exit(255);
|
||||
}
|
||||
}
|
||||
|
|
@ -2982,7 +2982,7 @@ if((xc) && (handle <= xc->maxhandle))
|
|||
xc->vchg_mem = (unsigned char *)realloc(xc->vchg_mem, xc->vchg_alloc_siz);
|
||||
if(!xc->vchg_mem)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"Could not realloc() in fstWriterEmitVariableLengthValueChange, exiting.\n");
|
||||
fprintf(stderr, FST_APIMESS "Could not realloc() in fstWriterEmitVariableLengthValueChange, exiting.\n");
|
||||
exit(255);
|
||||
}
|
||||
}
|
||||
|
|
@ -3227,7 +3227,7 @@ if(rc<0)
|
|||
{
|
||||
xc->fseek_failed = 1;
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
|
||||
fprintf(stderr, FST_APIMESS "Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
|
||||
perror("Why");
|
||||
#endif
|
||||
}
|
||||
|
|
@ -4547,7 +4547,7 @@ if(gzread_pass_status)
|
|||
|
||||
if(rc != Z_OK)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstReaderInit(), geom uncompress rc = %d, exiting.\n", rc);
|
||||
fprintf(stderr, FST_APIMESS "fstReaderInit(), geom uncompress rc = %d, exiting.\n", rc);
|
||||
exit(255);
|
||||
}
|
||||
|
||||
|
|
@ -4838,7 +4838,7 @@ for(;;)
|
|||
if((sectype == EOF) || (sectype == FST_BL_SKIP))
|
||||
{
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"<< EOF >>\n");
|
||||
fprintf(stderr, FST_APIMESS "<< EOF >>\n");
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
|
@ -4877,9 +4877,9 @@ for(;;)
|
|||
mem_required_for_traversal = fstReaderUint64(xc->f);
|
||||
mem_for_traversal = (unsigned char *)malloc(mem_required_for_traversal + 66); /* add in potential fastlz overhead */
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"sec: %u seclen: %d begtim: %d endtim: %d\n",
|
||||
fprintf(stderr, FST_APIMESS "sec: %u seclen: %d begtim: %d endtim: %d\n",
|
||||
secnum, (int)seclen, (int)beg_tim, (int)end_tim);
|
||||
fprintf(stderr, FST_APIMESS"mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
|
||||
fprintf(stderr, FST_APIMESS "mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
|
||||
#endif
|
||||
/* process time block */
|
||||
{
|
||||
|
|
@ -4897,7 +4897,7 @@ for(;;)
|
|||
tsec_clen = fstReaderUint64(xc->f);
|
||||
tsec_nitems = fstReaderUint64(xc->f);
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"time section unc: %d, com: %d (%d items)\n",
|
||||
fprintf(stderr, FST_APIMESS "time section unc: %d, com: %d (%d items)\n",
|
||||
(int)tsec_uclen, (int)tsec_clen, (int)tsec_nitems);
|
||||
#endif
|
||||
if(tsec_clen > seclen) break; /* corrupted tsec_clen: by definition it can't be larger than size of section */
|
||||
|
|
@ -4917,7 +4917,7 @@ for(;;)
|
|||
|
||||
if(rc != Z_OK)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstReaderIterBlocks2(), tsec uncompress rc = %d, exiting.\n", rc);
|
||||
fprintf(stderr, FST_APIMESS "fstReaderIterBlocks2(), tsec uncompress rc = %d, exiting.\n", rc);
|
||||
exit(255);
|
||||
}
|
||||
|
||||
|
|
@ -4993,7 +4993,7 @@ for(;;)
|
|||
rc = uncompress(mu, &destlen, mc, sourcelen);
|
||||
if(rc != Z_OK)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstReaderIterBlocks2(), frame uncompress rc: %d, exiting.\n", rc);
|
||||
fprintf(stderr, FST_APIMESS "fstReaderIterBlocks2(), frame uncompress rc: %d, exiting.\n", rc);
|
||||
exit(255);
|
||||
}
|
||||
free(mc);
|
||||
|
|
@ -5156,9 +5156,9 @@ for(;;)
|
|||
packtype = fgetc(xc->f);
|
||||
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
|
||||
fprintf(stderr, FST_APIMESS "frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
|
||||
(int)frame_uclen, (int)frame_clen, (int)frame_maxhandle);
|
||||
fprintf(stderr, FST_APIMESS"vc_maxhandle: %d, packtype: %c\n", (int)vc_maxhandle, packtype);
|
||||
fprintf(stderr, FST_APIMESS "vc_maxhandle: %d, packtype: %c\n", (int)vc_maxhandle, packtype);
|
||||
#endif
|
||||
|
||||
indx_pntr = blkpos + seclen - 24 -tsec_clen -8;
|
||||
|
|
@ -5166,7 +5166,7 @@ for(;;)
|
|||
chain_clen = fstReaderUint64(xc->f);
|
||||
indx_pos = indx_pntr - chain_clen;
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
|
||||
fprintf(stderr, FST_APIMESS "indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
|
||||
#endif
|
||||
chain_cmem = (unsigned char *)malloc(chain_clen);
|
||||
if(!chain_cmem) goto block_err;
|
||||
|
|
@ -5285,7 +5285,7 @@ for(;;)
|
|||
}
|
||||
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"decompressed chain idx len: %" PRIu32 "\n", idx);
|
||||
fprintf(stderr, FST_APIMESS "decompressed chain idx len: %" PRIu32 "\n", idx);
|
||||
#endif
|
||||
|
||||
mc_mem_len = 16384;
|
||||
|
|
@ -5353,7 +5353,7 @@ for(;;)
|
|||
|
||||
if(rc != Z_OK)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstReaderIterBlocks2(), fac: %d clen: %d (rc=%d), exiting.\n", (int)i, (int)val, rc);
|
||||
fprintf(stderr, FST_APIMESS "fstReaderIterBlocks2(), fac: %d clen: %d (rc=%d), exiting.\n", (int)i, (int)val, rc);
|
||||
exit(255);
|
||||
}
|
||||
|
||||
|
|
@ -5905,9 +5905,9 @@ mem_required_for_traversal =
|
|||
fstReaderUint64(xc->f);
|
||||
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"rvat sec: %u seclen: %d begtim: %d endtim: %d\n",
|
||||
fprintf(stderr, FST_APIMESS "rvat sec: %u seclen: %d begtim: %d endtim: %d\n",
|
||||
secnum, (int)seclen, (int)beg_tim, (int)end_tim);
|
||||
fprintf(stderr, FST_APIMESS"mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
|
||||
fprintf(stderr, FST_APIMESS "mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
|
||||
#endif
|
||||
|
||||
/* process time block */
|
||||
|
|
@ -5926,7 +5926,7 @@ tsec_uclen = fstReaderUint64(xc->f);
|
|||
tsec_clen = fstReaderUint64(xc->f);
|
||||
tsec_nitems = fstReaderUint64(xc->f);
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"time section unc: %d, com: %d (%d items)\n",
|
||||
fprintf(stderr, FST_APIMESS "time section unc: %d, com: %d (%d items)\n",
|
||||
(int)tsec_uclen, (int)tsec_clen, (int)tsec_nitems);
|
||||
#endif
|
||||
ucdata = (unsigned char *)malloc(tsec_uclen);
|
||||
|
|
@ -5943,7 +5943,7 @@ if(tsec_uclen != tsec_clen)
|
|||
|
||||
if(rc != Z_OK)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstReaderGetValueFromHandleAtTime(), tsec uncompress rc = %d, exiting.\n", rc);
|
||||
fprintf(stderr, FST_APIMESS "fstReaderGetValueFromHandleAtTime(), tsec uncompress rc = %d, exiting.\n", rc);
|
||||
exit(255);
|
||||
}
|
||||
|
||||
|
|
@ -5991,7 +5991,7 @@ if(frame_uclen == frame_clen)
|
|||
rc = uncompress(xc->rvat_frame_data, &destlen, mc, sourcelen);
|
||||
if(rc != Z_OK)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstReaderGetValueFromHandleAtTime(), frame decompress rc: %d, exiting.\n", rc);
|
||||
fprintf(stderr, FST_APIMESS "fstReaderGetValueFromHandleAtTime(), frame decompress rc: %d, exiting.\n", rc);
|
||||
exit(255);
|
||||
}
|
||||
free(mc);
|
||||
|
|
@ -6002,9 +6002,9 @@ xc->rvat_vc_start = ftello(xc->f); /* points to '!' character */
|
|||
xc->rvat_packtype = fgetc(xc->f);
|
||||
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
|
||||
fprintf(stderr, FST_APIMESS "frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
|
||||
(int)frame_uclen, (int)frame_clen, (int)xc->rvat_frame_maxhandle);
|
||||
fprintf(stderr, FST_APIMESS"vc_maxhandle: %d\n", (int)xc->rvat_vc_maxhandle);
|
||||
fprintf(stderr, FST_APIMESS "vc_maxhandle: %d\n", (int)xc->rvat_vc_maxhandle);
|
||||
#endif
|
||||
|
||||
indx_pntr = blkpos + seclen - 24 -tsec_clen -8;
|
||||
|
|
@ -6012,7 +6012,7 @@ fstReaderFseeko(xc, xc->f, indx_pntr, SEEK_SET);
|
|||
chain_clen = fstReaderUint64(xc->f);
|
||||
indx_pos = indx_pntr - chain_clen;
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
|
||||
fprintf(stderr, FST_APIMESS "indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
|
||||
#endif
|
||||
chain_cmem = (unsigned char *)malloc(chain_clen);
|
||||
fstReaderFseeko(xc, xc->f, indx_pos, SEEK_SET);
|
||||
|
|
@ -6123,7 +6123,7 @@ for(i=0;i<idx;i++)
|
|||
}
|
||||
|
||||
#ifdef FST_DEBUG
|
||||
fprintf(stderr, FST_APIMESS"decompressed chain idx len: %" PRIu32 "\n", idx);
|
||||
fprintf(stderr, FST_APIMESS "decompressed chain idx len: %" PRIu32 "\n", idx);
|
||||
#endif
|
||||
|
||||
xc->rvat_data_valid = 1;
|
||||
|
|
@ -6183,7 +6183,7 @@ if(!xc->rvat_chain_mem)
|
|||
|
||||
if(rc != Z_OK)
|
||||
{
|
||||
fprintf(stderr, FST_APIMESS"fstReaderGetValueFromHandleAtTime(), rvat decompress clen: %d (rc=%d), exiting.\n", (int)xc->rvat_chain_len, rc);
|
||||
fprintf(stderr, FST_APIMESS "fstReaderGetValueFromHandleAtTime(), rvat decompress clen: %d (rc=%d), exiting.\n", (int)xc->rvat_chain_len, rc);
|
||||
exit(255);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue