diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/libgcry.c | 2 | ||||
| -rw-r--r-- | runtime/lmcry_gcry.c | 5 | ||||
| -rw-r--r-- | runtime/lmsig_gt.c | 8 | ||||
| -rw-r--r-- | runtime/queue.c | 2 | ||||
| -rw-r--r-- | runtime/stream.c | 3 |
5 files changed, 4 insertions, 16 deletions
diff --git a/runtime/libgcry.c b/runtime/libgcry.c index e57ee8bc..51c10af4 100644 --- a/runtime/libgcry.c +++ b/runtime/libgcry.c @@ -238,7 +238,7 @@ addPadding(gcryfile pF, uchar *buf, size_t *plen) unsigned i; size_t nPad; nPad = (pF->blkLength - *plen % pF->blkLength) % pF->blkLength; - dbgprintf("DDDD: addPadding %d chars, blkLength %d, mod %d, pad %d\n", + DBGPRINTF("libgcry: addPadding %d chars, blkLength %d, mod %d, pad %d\n", *plen, pF->blkLength, *plen % pF->blkLength, nPad); for(i = 0 ; i < nPad ; ++i) buf[(*plen)+i] = 0x00; diff --git a/runtime/lmcry_gcry.c b/runtime/lmcry_gcry.c index 2e4cfff3..0a9b94bc 100644 --- a/runtime/lmcry_gcry.c +++ b/runtime/lmcry_gcry.c @@ -69,7 +69,6 @@ errfunc(__attribute__((unused)) void *usrptr, uchar *emsg) /* Standard-Constructor */ BEGINobjConstruct(lmcry_gcry) - dbgprintf("DDDD: lmcry_gcry: called construct\n"); pThis->ctx = gcryCtxNew(); ENDobjConstruct(lmcry_gcry) @@ -77,7 +76,6 @@ ENDobjConstruct(lmcry_gcry) /* destructor for the lmcry_gcry object */ BEGINobjDestruct(lmcry_gcry) /* be sure to specify the object type also in END and CODESTART macros! */ CODESTARTobjDestruct(lmcry_gcry) - dbgprintf("DDDD: lmcry_gcry: called destruct\n"); rsgcryCtxDel(pThis->ctx); ENDobjDestruct(lmcry_gcry) @@ -198,7 +196,6 @@ OnFileOpen(void *pT, uchar *fn, void *pGF) lmcry_gcry_t *pThis = (lmcry_gcry_t*) pT; gcryfile *pgf = (gcryfile*) pGF; DEFiRet; -dbgprintf("DDDD: cry: onFileOpen: %s\n", fn); CHKiRet(rsgcryInitCrypt(pThis->ctx, pgf, fn)); finalize_it: @@ -213,7 +210,6 @@ static rsRetVal Encrypt(void *pF, uchar *rec, size_t *lenRec) { DEFiRet; -dbgprintf("DDDD: Encrypt (%u): %s\n", *lenRec-1, rec); iRet = rsgcryEncrypt(pF, rec, lenRec); RETiRet; @@ -223,7 +219,6 @@ static rsRetVal OnFileClose(void *pF, off64_t offsLogfile) { DEFiRet; -dbgprintf("DDDD: onFileClose\n"); gcryfileDestruct(pF, offsLogfile); RETiRet; diff --git a/runtime/lmsig_gt.c b/runtime/lmsig_gt.c index 09691292..e9194c76 100644 --- a/runtime/lmsig_gt.c +++ b/runtime/lmsig_gt.c @@ -66,7 +66,6 @@ errfunc(__attribute__((unused)) void *usrptr, uchar *emsg) /* Standard-Constructor */ BEGINobjConstruct(lmsig_gt) - dbgprintf("DDDD: lmsig_gt: called construct\n"); pThis->ctx = rsgtCtxNew(); rsgtsetErrFunc(pThis->ctx, errfunc, NULL); ENDobjConstruct(lmsig_gt) @@ -75,7 +74,6 @@ ENDobjConstruct(lmsig_gt) /* destructor for the lmsig_gt object */ BEGINobjDestruct(lmsig_gt) /* be sure to specify the object type also in END and CODESTART macros! */ CODESTARTobjDestruct(lmsig_gt) - dbgprintf("DDDD: lmsig_gt: called destruct\n"); rsgtCtxDel(pThis->ctx); ENDobjDestruct(lmsig_gt) @@ -133,7 +131,7 @@ OnFileOpen(void *pT, uchar *fn, void *pGF) lmsig_gt_t *pThis = (lmsig_gt_t*) pT; gtfile *pgf = (gtfile*) pGF; DEFiRet; -dbgprintf("DDDD: onFileOpen: %s\n", fn); + DBGPRINTF("lmsig_gt: onFileOpen: %s\n", fn); /* note: if *pgf is set to NULL, this auto-disables GT functions */ *pgf = rsgtCtxOpenFile(pThis->ctx, fn); sigblkInit(*pgf); @@ -152,7 +150,7 @@ static rsRetVal OnRecordWrite(void *pF, uchar *rec, rs_size_t lenRec) { DEFiRet; -dbgprintf("DDDD: onRecordWrite (%d): %s\n", lenRec-1, rec); + DBGPRINTF("lmsig_gt: onRecordWrite (%d): %s\n", lenRec-1, rec); sigblkAddRecord(pF, rec, lenRec-1); RETiRet; @@ -162,7 +160,7 @@ static rsRetVal OnFileClose(void *pF) { DEFiRet; -dbgprintf("DDDD: onFileClose\n"); + DBGPRINTF("lmsig_gt: onFileClose\n"); rsgtfileDestruct(pF); RETiRet; diff --git a/runtime/queue.c b/runtime/queue.c index 74090a4d..600b5688 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -1150,7 +1150,6 @@ tryShutdownWorkersWithinActionTimeout(qqueue_t *pThis) DBGOPRINT((obj_t*) pThis, "trying to shutdown workers within Action Timeout"); DBGOPRINT((obj_t*) pThis, "setting EnqOnly mode\n"); pThis->bEnqOnly = 1; -dbgprintf("DDDD: setting shutdownImmediate mode, ptr %p!\n", &pThis->bShutdownImmediate); pThis->bShutdownImmediate = 1; /* now DA queue */ if(pThis->bIsDA) { @@ -1856,7 +1855,6 @@ ConsumerReg(qqueue_t *pThis, wti_t *pWti) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &iCancelStateSave); -dbgprintf("DDDD: calling consumer with shutdownImmeditate ptr %p\n", &pThis->bShutdownImmediate); CHKiRet(pThis->pConsumer(pThis->pAction, &pWti->batch, &pThis->bShutdownImmediate)); /* we now need to check if we should deliberately delay processing a bit diff --git a/runtime/stream.c b/runtime/stream.c index b0df8418..b781324a 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -255,7 +255,6 @@ doPhysOpen(strm_t *pThis) pThis->bIsTTY = 0; } -dbgprintf("DDDD: cryprov %p\n", pThis->cryprov); if(pThis->cryprov != NULL) { CHKiRet(pThis->cryprov->OnFileOpen(pThis->cryprovData, pThis->pszCurrFName, &pThis->cryprovFileData)); @@ -1218,11 +1217,9 @@ strmPhysWrite(strm_t *pThis, uchar *pBuf, size_t lenBuf) CHKiRet(strmOpenFile(pThis)); /* here we place our crypto interface */ -dbgprintf("DDDD: doing crypto, len %d\n", lenBuf); if(pThis->cryprov != NULL) { pThis->cryprov->Encrypt(pThis->cryprovFileData, pBuf, &lenBuf); } -dbgprintf("DDDD: done crypto, len %d\n", lenBuf); /* end crypto */ iWritten = lenBuf; |