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/dk4tspdk.ctr | |
parent | ac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff) |
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4tspdk.ctr')
-rw-r--r-- | support/dktools/dk4tspdk.ctr | 91 |
1 files changed, 87 insertions, 4 deletions
diff --git a/support/dktools/dk4tspdk.ctr b/support/dktools/dk4tspdk.ctr index 7ea2d7d7c4..239eaff81d 100644 --- a/support/dktools/dk4tspdk.ctr +++ b/support/dktools/dk4tspdk.ctr @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2015-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause @@ -15,15 +15,27 @@ license = bsd */ #ifndef DK4CONF_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4conf.h" +#else +#include <dktools-4/dk4conf.h> +#endif #endif #ifndef DK4TYPES_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4types.h" +#else +#include <dktools-4/dk4types.h> +#endif #endif #ifndef DK4ERROR_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4error.h" +#else +#include <dktools-4/dk4error.h> +#endif #endif #if DK4_CHAR_SIZE > 1 @@ -31,7 +43,11 @@ license = bsd /* +++++ dkChar 4 bytes */ #ifndef DK4TSP32_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4tsp32.h" +#else +#include <dktools-4/dk4tsp32.h> +#endif #endif /** Handler function to process a single character. @@ -51,7 +67,11 @@ typedef dk4_tsp32_t dk4_tspdk_t; /* +++++ dkChar 2 bytes */ #ifndef DK4TSP16_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4tsp16.h" +#else +#include <dktools-4/dk4tsp16.h> +#endif #endif /** Handler function to process a single character. @@ -72,7 +92,11 @@ typedef dk4_tsp16_t dk4_tspdk_t; /* +++++ dkChar 1 byte */ #ifndef DK4TSP08_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4tsp08.h" +#else +#include <dktools-4/dk4tsp08.h> +#endif #endif /** Handler function to process a single character. @@ -195,7 +219,7 @@ dk4tspdk_finish(dk4_tspdk_t *tsp); @param tsp Text stream processor to retrieve errors from. */ void -dk4tspdk_get_errors(dk4_er_t *er_en, dk4_er_t *er_pr, dk4_tspdk_t *tsp); +dk4tspdk_get_errors(dk4_er_t *er_en, dk4_er_t *er_pr, dk4_tspdk_t const *tsp); #ifdef __cplusplus } @@ -205,8 +229,16 @@ dk4tspdk_get_errors(dk4_er_t *er_en, dk4_er_t *er_pr, dk4_tspdk_t *tsp); +#include "dk4conf.h" #include "dk4tspdk.h" +#include "dk4unused.h" +#if DK4_HAVE_ASSERT_H +#ifndef ASSERT_H_INCLUDED +#include <assert.h> +#define ASSERT_H_INCLUDED 1 +#endif +#endif int @@ -214,12 +246,22 @@ dk4tspdk_setup_char( dk4_tspdk_t *tsp, void *obj, dk4_dk_handler_t *fct, +#if 1 == DK4_CHAR_SIZE int pre, +#else + int DK4_ARG_UNUSED(pre), +#endif int eie, dk4_er_t *erp ) { #if DK4_CHAR_SIZE > 1 + DK4_UNUSED_ARG(pre) +#endif +#if DK4_USE_ASSERT + assert(NULL != tsp); +#endif +#if DK4_CHAR_SIZE > 1 #if DK4_CHAR_SIZE > 2 return (dk4tsp32_setup_char(tsp, obj, fct, eie, erp)); #else @@ -239,12 +281,24 @@ dk4tspdk_setup_line( dk4_dk_line_handler_t *fct, dkChar *inbuf, size_t szin, +#if 1 == DK4_CHAR_SIZE int pre, +#else + int DK4_ARG_UNUSED(pre), +#endif int eie, dk4_er_t *erp ) { #if DK4_CHAR_SIZE > 1 + DK4_UNUSED_ARG(pre) +#endif +#if DK4_USE_ASSERT + assert(NULL != tsp); + assert(NULL != inbuf); + assert(0 < szin); +#endif +#if DK4_CHAR_SIZE > 1 #if DK4_CHAR_SIZE > 2 return (dk4tsp32_setup_line(tsp, obj, fct, inbuf, szin, eie, erp)); #else @@ -263,6 +317,9 @@ dk4tspdk_add_one_byte( unsigned char inbyte ) { +#if DK4_USE_ASSERT + assert(NULL != tsp); +#endif #if DK4_CHAR_SIZE > 1 #if DK4_CHAR_SIZE > 2 return (dk4tsp32_add_one_byte(tsp, inbyte)); @@ -283,6 +340,11 @@ dk4tspdk_add_bytes( size_t sz ) { +#if DK4_USE_ASSERT + assert(NULL != tsp); + assert(NULL != buffer); + assert(0 < sz); +#endif #if DK4_CHAR_SIZE > 1 #if DK4_CHAR_SIZE > 2 return (dk4tsp32_add_bytes(tsp, buffer, sz)); @@ -299,6 +361,9 @@ dk4tspdk_add_bytes( int dk4tspdk_finish(dk4_tspdk_t *tsp) { +#if DK4_USE_ASSERT + assert(NULL != tsp); +#endif #if DK4_CHAR_SIZE > 1 #if DK4_CHAR_SIZE > 2 return (dk4tsp32_finish(tsp)); @@ -313,8 +378,11 @@ dk4tspdk_finish(dk4_tspdk_t *tsp) void -dk4tspdk_get_errors(dk4_er_t *er_en, dk4_er_t *er_pr, dk4_tspdk_t *tsp) +dk4tspdk_get_errors(dk4_er_t *er_en, dk4_er_t *er_pr, dk4_tspdk_t const *tsp) { +#if DK4_USE_ASSERT + assert(NULL != tsp); +#endif #if DK4_CHAR_SIZE > 1 #if DK4_CHAR_SIZE > 2 dk4tsp32_get_errors(er_en, er_pr, tsp); @@ -329,8 +397,23 @@ dk4tspdk_get_errors(dk4_er_t *er_en, dk4_er_t *er_pr, dk4_tspdk_t *tsp) void -dk4tspdk_enable_utf8_pass_through(dk4_tspdk_t *tsp, int fl) +dk4tspdk_enable_utf8_pass_through( +#if 1 == DK4_CHAR_SIZE + dk4_tspdk_t *tsp, + int fl +#else + dk4_tspdk_t * DK4_ARG_UNUSED(tsp), + int DK4_ARG_UNUSED(fl) +#endif +) { +#if DK4_CHAR_SIZE > 1 + DK4_UNUSED_ARG(tsp) + DK4_UNUSED_ARG(fl) +#endif +#if DK4_USE_ASSERT + assert(NULL != tsp); +#endif #if DK4_CHAR_SIZE == 1 dk4tsp08_enable_utf8_pass_through(tsp, fl); #endif |