diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
commit | 1f457376b478257b88d4a857f5ec1b6155442dd7 (patch) | |
tree | 2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk4rld.ctr | |
parent | ac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff) |
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4rld.ctr')
-rw-r--r-- | support/dktools/dk4rld.ctr | 54 |
1 files changed, 49 insertions, 5 deletions
diff --git a/support/dktools/dk4rld.ctr b/support/dktools/dk4rld.ctr index e981d30119..f49f6b187c 100644 --- a/support/dktools/dk4rld.ctr +++ b/support/dktools/dk4rld.ctr @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2015-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause %% header @@ -26,7 +26,22 @@ syntax. If the function returns DK4_EDSTM_ERROR, the input data stream was not properly run-length encoded. */ + +#ifndef DK4CONF_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 +#include "dk4conf.h" +#else +#include <dktools-4/dk4conf.h> +#endif +#endif + +#ifndef DK4ERROR_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4error.h" +#else +#include <dktools-4/dk4error.h> +#endif +#endif /** Run length decoder. */ @@ -110,7 +125,10 @@ dk4rld_finish(dk4_rl_dec_t *dec, dk4_er_t *erp); */ int dk4rld_output( - const unsigned char **dptr, size_t *szptr, dk4_rl_dec_t *dec, dk4_er_t *erp + const unsigned char **dptr, + size_t *szptr, + dk4_rl_dec_t const *dec, + dk4_er_t *erp ); #ifdef __cplusplus @@ -119,6 +137,15 @@ dk4rld_output( %% module +#include "dk4conf.h" + +#if DK4_HAVE_ASSERT_H +#ifndef ASSERT_H_INCLUDED +#include <assert.h> +#define ASSERT_H_INCLUDED 1 +#endif +#endif + #include "dk4rld.h" #include "dk4edstm.h" #include "dk4mem.h" @@ -157,6 +184,9 @@ void dk4rld_init(dk4_rl_dec_t *dec, dk4_er_t *erp) { $? "+ dk4rld_init" +#if DK4_USE_ASSERT + assert(NULL != dec); +#endif if (NULL != dec) { DK4_MEMRES(dec, sizeof(dk4_rl_dec_t)); dec->oused = 0; @@ -174,10 +204,13 @@ dk4rld_add(dk4_rl_dec_t *dec, unsigned char inbyte, dk4_er_t *erp) { int back = DK4_EDSTM_ERROR; $? "+ dk4rld_add" +#if DK4_USE_ASSERT + assert(NULL != dec); +#endif if (NULL != dec) { switch (dec->st) { case RLD_ST_EXPECT_KEY_BYTE : { - if ((unsigned char)128 > inbyte) { + if ((unsigned char)128U > inbyte) { /* Literal byte sequence */ @@ -185,7 +218,7 @@ dk4rld_add(dk4_rl_dec_t *dec, unsigned char inbyte, dk4_er_t *erp) dec->ll = (size_t)inbyte + 1; back = DK4_EDSTM_ACCEPT; } else { - if ((unsigned char)128 < inbyte) { + if ((unsigned char)128U < inbyte) { /* Run of equal bytes */ @@ -233,6 +266,9 @@ dk4rld_finish(dk4_rl_dec_t *dec, dk4_er_t *erp) { int back = DK4_EDSTM_ERROR; $? "+ dk4rld_finish" +#if DK4_USE_ASSERT + assert(NULL != dec); +#endif if (NULL != dec) { switch (dec->st) { case RLD_ST_EXPECT_KEY_BYTE : case RLD_ST_EOD_FOUND : { @@ -252,11 +288,19 @@ dk4rld_finish(dk4_rl_dec_t *dec, dk4_er_t *erp) int dk4rld_output( - const unsigned char **dptr, size_t *szptr, dk4_rl_dec_t *dec, dk4_er_t *erp + const unsigned char **dptr, + size_t *szptr, + dk4_rl_dec_t const *dec, + dk4_er_t *erp ) { int back = 0; $? "+ dk4rld_output" +#if DK4_USE_ASSERT + assert(NULL != dptr); + assert(NULL != szptr); + assert(NULL != dec); +#endif if (NULL != dec) { if (0 < dec->oused) { *dptr = &(dec->ob[0]); |