summaryrefslogtreecommitdiff
path: root/support/dktools/dk4strmb.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/dk4strmb.c
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4strmb.c')
-rw-r--r--support/dktools/dk4strmb.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/support/dktools/dk4strmb.c b/support/dktools/dk4strmb.c
index 141f1aef2b..0ab4981c15 100644
--- a/support/dktools/dk4strmb.c
+++ b/support/dktools/dk4strmb.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: dk4strmb.ctr
+Copyright (C) 2015-2020, Dirk Krause
+SPDX-License-Identifier: BSD-3-Clause
*/
/*
-Copyright (C) 2015-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: dk4strmb.ctr
*/
/** @file dk4strmb.c The dk4strmb module.
*/
-#line 94 "dk4strmb.ctr"
+#line 102 "dk4strmb.ctr"
#include "dk4conf.h"
@@ -46,6 +24,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "dk4strm.h"
#include "dk4strmb.h"
+#if DK4_HAVE_ASSERT_H
+#ifndef ASSERT_H_INCLUDED
+#include <assert.h>
+#define ASSERT_H_INCLUDED 1
+#endif
+#endif
void
@@ -53,6 +37,9 @@ dk4stream_bzfile_with_close_function(dk4_stream_api_t *api)
{
BZFILE *fipo;
int res;
+#if DK4_USE_ASSERT
+ assert(NULL != api);
+#endif
if (NULL != api) {
api->res = 0;
api->sz_out = 0;
@@ -67,12 +54,16 @@ dk4stream_bzfile_with_close_function(dk4_stream_api_t *api)
}
} break;
case DK4_STREAM_API_WRITE: {
- res = BZ2_bzwrite(fipo, api->b, (int)(api->sz_in));
- if (0 < res) {
- if (res == (int)(api->sz_in)) {
- api->res = 1;
+ if (0 < api->sz_in) {
+ res = BZ2_bzwrite(fipo, api->b, (int)(api->sz_in));
+ if (0 < res) {
+ if (res == (int)(api->sz_in)) {
+ api->res = 1;
+ }
+ api->sz_out = (size_t)res;
}
- api->sz_out = (size_t)res;
+ } else {
+ api->res = 1;
}
} break;
case DK4_STREAM_API_FLUSH: {
@@ -98,6 +89,9 @@ dk4stream_bzfile_with_close_function(dk4_stream_api_t *api)
void
dk4stream_bzfile_function(dk4_stream_api_t *api)
{
+#if DK4_USE_ASSERT
+ assert(NULL != api);
+#endif
if (NULL != api) {
switch (api->cmd) {
case DK4_STREAM_API_CLOSE: {
@@ -122,6 +116,9 @@ dk4stream_open_for_bzfile(
dk4_er_t *erp
)
{
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+#endif
return (
dk4stream_open( (void *)fipo, dk4stream_bzfile_function, fl, ibs, obs, erp)
);
@@ -138,6 +135,9 @@ dk4stream_open_for_bzfile_with_close(
dk4_er_t *erp
)
{
+#if DK4_USE_ASSERT
+ assert(NULL != fipo);
+#endif
return (
dk4stream_open(
(void *)fipo, dk4stream_bzfile_with_close_function, fl, ibs, obs, erp