summaryrefslogtreecommitdiff
path: root/support/dktools/dk4a85d.ctr
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
committerNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
commit1f457376b478257b88d4a857f5ec1b6155442dd7 (patch)
tree2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk4a85d.ctr
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4a85d.ctr')
-rw-r--r--support/dktools/dk4a85d.ctr50
1 files changed, 47 insertions, 3 deletions
diff --git a/support/dktools/dk4a85d.ctr b/support/dktools/dk4a85d.ctr
index ac17417f27..cf64aefc44 100644
--- a/support/dktools/dk4a85d.ctr
+++ b/support/dktools/dk4a85d.ctr
@@ -2,7 +2,7 @@
copyright owner = Dirk Krause
copyright year = 2015-xxxx
-license = bsd
+SPDX-License-Identifier: BSD-3-Clause
@@ -34,8 +34,23 @@ DK4_EDSTM_STOP from dk4a85_dec_add(), the call to dk4a85_dec_finish()
is required.
*/
+
+#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/dk4conf.h>
+#endif
+#endif
+
/** ASCII 85 decoder.
*/
@@ -105,7 +120,10 @@ dk4a85_dec_finish(dk4_a85_dec_t *dec, dk4_er_t *erp);
*/
int
dk4a85_dec_output(
- const unsigned char **dptr, size_t *szptr, dk4_a85_dec_t *dec, dk4_er_t *erp
+ const unsigned char **dptr,
+ size_t *szptr,
+ dk4_a85_dec_t const *dec,
+ dk4_er_t *erp
);
@@ -117,6 +135,15 @@ dk4a85_dec_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 "dk4a85d.h"
#include "dk4mem.h"
#include "dk4edstm.h"
@@ -141,6 +168,9 @@ static const unsigned long dk4a85e_pow_85[] = {
void
dk4a85_dec_init(dk4_a85_dec_t *dec, dk4_er_t *erp)
{
+#if DK4_USE_ASSERT
+ assert(NULL != dec);
+#endif
if (NULL != dec) {
DK4_MEMRES(dec, sizeof(dk4_a85_dec_t));
dec->os = 0;
@@ -158,6 +188,9 @@ dk4a85_dec_add(dk4_a85_dec_t *dec, char input, dk4_er_t *erp)
{
unsigned long val;
int back = DK4_EDSTM_ERROR;
+#if DK4_USE_ASSERT
+ assert(NULL != dec);
+#endif
if (NULL != dec) {
if (0 != dec->tf) {
if ('>' == input) {
@@ -266,6 +299,9 @@ dk4a85_dec_finish(dk4_a85_dec_t *dec, dk4_er_t *erp)
unsigned long val; /* 32 bit value */
int back = DK4_EDSTM_ERROR;
$? "+ dk4a85_dec_finish"
+#if DK4_USE_ASSERT
+ assert(NULL != dec);
+#endif
if (NULL != dec) {
if (0 == dec->is) {
back = DK4_EDSTM_ACCEPT;
@@ -379,10 +415,18 @@ dk4a85_dec_finish(dk4_a85_dec_t *dec, dk4_er_t *erp)
int
dk4a85_dec_output(
- const unsigned char **dptr, size_t *szptr, dk4_a85_dec_t *dec, dk4_er_t *erp
+ const unsigned char **dptr,
+ size_t *szptr,
+ dk4_a85_dec_t const *dec,
+ dk4_er_t *erp
)
{
int back = 0;
+#if DK4_USE_ASSERT
+ assert(NULL != dec);
+ assert(NULL != dptr);
+ assert(NULL != szptr);
+#endif
if ((NULL != dec) && (NULL != dptr) && (NULL != szptr)) {
if (0 < dec->os) {
*dptr = &(dec->ob[0]);