CTAN sync 202009200303

1 files changed, 24 insertions, 32 deletions

diff --git a/support/dktools/dk4sock22.c b/support/dktools/dk4sock22.c
index 12013493cd..05531f1cf9 100644
--- a/support/dktools/dk4sock22.c
+++ b/support/dktools/dk4sock22.c
@@ -1,36 +1,14 @@
 /*
-	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: dk4sock22.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: dk4sock22.ctr
 */
 
 /**	@file dk4sock22.c The dk4sock22 module.
@@ -40,14 +18,21 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #line 10 "dk4sock22.ctr"
 
 
+#include "dk4conf.h"
 #include "dk4sock.h"
 #include "dk4mem.h"
 
+#if DK4_HAVE_ASSERT_H
+#ifndef	ASSERT_H_INCLUDED
+#include <assert.h>
+#define	ASSERT_H_INCLUDED 1
+#endif
+#endif
 
 
 
 
-#line 18 "dk4sock22.ctr"
+#line 25 "dk4sock22.ctr"
 
 
 
@@ -60,7 +45,9 @@ dk4socket_set_new(
   dk4_socket_set_t	*back = NULL;
   dk4_socket_t		*ps;
   size_t		 i;
-
+#if	DK4_USE_ASSERT
+  assert(0 < max);
+#endif
   if (0 < max) {
     if ((SIZE_MAX / sizeof(dk4_socket_t)) >= max) {
       back = dk4mem_new(dk4_socket_set_t,1,erp);
@@ -94,6 +81,9 @@ dk4socket_set_delete(
   dk4_er_t		*erp
 )
 {
+#if	DK4_USE_ASSERT
+  assert(NULL != set);
+#endif
   if (NULL != set) {
     if (NULL != set->pSockets) {
       dk4mem_release(set->pSockets);
@@ -113,7 +103,9 @@ dk4socket_set_close(
 )
 {
   size_t	 i;
-
+#if	DK4_USE_ASSERT
+  assert(NULL != set);
+#endif
   if (NULL != set) {
     if (NULL != set->pSockets) {
       for (i = 0; i < set->szUsed; i++) {