summaryrefslogtreecommitdiff
path: root/support/dktools/dk4serf.c
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/dk4serf.c
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4serf.c')
-rw-r--r--support/dktools/dk4serf.c81
1 files changed, 46 insertions, 35 deletions
diff --git a/support/dktools/dk4serf.c b/support/dktools/dk4serf.c
index 8f91d08db6..4fb856bf74 100644
--- a/support/dktools/dk4serf.c
+++ b/support/dktools/dk4serf.c
@@ -1,43 +1,21 @@
/*
- WARNING: This file was generated by dkct.
- Changes you make here will be lost if dkct is run again!
- You should modify the original source and run dkct on it.
- Original source: dk4serf.ctr
+Copyright (C) 2016-2020, Dirk Krause
+SPDX-License-Identifier: BSD-3-Clause
*/
/*
-Copyright (C) 2016-2017, Dirk Krause
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above opyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-* Neither the name of the author nor the names of contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ WARNING: This file was generated by the dkct program (see
+ http://dktools.sourceforge.net/ for details).
+ Changes you make here will be lost if dkct is run again!
+ You should modify the original source and run dkct on it.
+ Original source: dk4serf.ctr
*/
/** @file dk4serf.c The dk4serf module.
*/
-#line 147 "dk4serf.ctr"
+#line 159 "dk4serf.ctr"
#include "dk4conf.h"
@@ -65,10 +43,16 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "dk4rec12.h"
#include "dk4rec18.h"
+#if DK4_HAVE_ASSERT_H
+#ifndef ASSERT_H_INCLUDED
+#include <assert.h>
+#define ASSERT_H_INCLUDED 1
+#endif
+#endif
-#line 176 "dk4serf.ctr"
+#line 194 "dk4serf.ctr"
@@ -77,7 +61,11 @@ dk4serialize_file_uint16_t(FILE *fipo, uint16_t u, dk4_er_t *erp)
{
unsigned char uc[4];
int back = 0;
- if ((NULL != fipo) && (DK4_U16_MAX >= u)) {
+
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+#endif
+ if (NULL != fipo) {
uc[0] = (unsigned char)((u >> 8) & 0x00FFU);
uc[1] = (unsigned char)(u & 0x00FFU);
errno = 0;
@@ -99,7 +87,11 @@ dk4serialize_file_int16_t(FILE *fipo, int16_t i, dk4_er_t *erp)
{
unsigned char uc[4];
int back = 0;
- if ((NULL != fipo) && (DK4_I16_MAX >= i) && (DK4_I16_MIN <= i)) {
+
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+#endif
+ if (NULL != fipo) {
uc[0] = (unsigned char)((((uint16_t)i) >> 8) & 0x00FFU);
uc[1] = (unsigned char)(((uint16_t)i) & 0x00FFU);
errno = 0;
@@ -121,6 +113,10 @@ dk4serialize_file_uint32_t(FILE *fipo, uint32_t u, dk4_er_t *erp)
{
unsigned char uc[4];
int back = 0;
+
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+#endif
if ((NULL != fipo) && (DK4_U32_MAX >= u)) {
uc[0] = (unsigned char)((u >> 24) & 0x000000FFUL);
uc[1] = (unsigned char)((u >> 16) & 0x000000FFUL);
@@ -145,6 +141,10 @@ dk4serialize_file_int32_t(FILE *fipo, int32_t i, dk4_er_t *erp)
{
unsigned char uc[4];
int back = 0;
+
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+#endif
if ((NULL != fipo) && (DK4_I32_MAX >= i) && (DK4_I32_MIN <= i)) {
uc[0] = (unsigned char)((((uint32_t)i) >> 24) & 0x000000FFUL);
uc[1] = (unsigned char)((((uint32_t)i) >> 16) & 0x000000FFUL);
@@ -172,6 +172,10 @@ dk4serialize_file_utf8_string(FILE *fipo, const char *str, dk4_er_t *erp)
int back = 0;
uint16_t usz;
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+ assert(NULL != str);
+#endif
if ((NULL != fipo) && (NULL != str)) {
sz = strlen(str);
dk4error_init(&er);
@@ -210,6 +214,9 @@ dk4serialize_file_double(FILE *fipo, double d, dk4_er_t *erp)
char buffer[2 * DK4_DBL_DIGITS];
#endif
int back = 0;
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+#endif
if (NULL != fipo) {
if (0 != dk4ma_write_c8_double(buffer, sizeof(buffer), d, 1, 1, erp)) {
back = dk4serialize_file_utf8_string(fipo, buffer, erp);
@@ -228,6 +235,10 @@ dk4serialize_file_dk_string(FILE *fipo,const dkChar *str,int de,dk4_er_t *erp)
char *tmpbuf = NULL;
size_t szbuf = 0;
int back = 0;
+#if DK4_USE_ASSERT
+ assert(NULL != str);
+ assert(NULL != fipo);
+#endif
if ((NULL != fipo) && (NULL != str)) {
switch (de) {
#if DK4_CHAR_SIZE > 1
@@ -259,7 +270,7 @@ dk4serialize_file_dk_string(FILE *fipo,const dkChar *str,int de,dk4_er_t *erp)
} break;
#endif
#else
- case DK4_ENCODING_ASCII : {
+ case DK4_ENCODING_PLAIN : {
szbuf = dk4recode_size_ascii_to_utf8(str, erp);
if (0 < szbuf) {
tmpbuf = dk4mem_new(char,szbuf,erp);
@@ -271,7 +282,7 @@ dk4serialize_file_dk_string(FILE *fipo,const dkChar *str,int de,dk4_er_t *erp)
}
}
} break;
- case DK4_ENCODING_ANSI : {
+ case DK4_ENCODING_WIN1252 : {
szbuf = dk4recode_size_ansi_to_utf8(str, erp);
if (0 < szbuf) {
tmpbuf = dk4mem_new(char,szbuf,erp);