commit 06011c29aef19d8ed90ebf48095e1ff2a846ba23 parent 1f8f72ced6a4d7043e5b47d22960cde96fbb1a71 Author: Laurent Bercot <ska-skaware@skarnet.org> Date: Tue, 29 Nov 2022 02:24:47 +0000 Prepare for 2.13.0.0, revamp strerr Signed-off-by: Laurent Bercot <ska@appnovation.com> Diffstat:
84 files changed, 1116 insertions(+), 546 deletions(-)
diff --git a/NEWS b/NEWS @@ -1,10 +1,11 @@ Changelog for skalibs. -In 2.12.1.0 +In 2.13.0.0 ----------- - Bugfixes. - New functions: buffer_timed_put(), buffer_timed_puts(). + - strerr.h revamped. strerr_die, strerr_warn, strerr_diesys, strerr_warnsys removed. In 2.12.0.1 diff --git a/doc/libskarnet.html b/doc/libskarnet.html @@ -96,6 +96,7 @@ containing a logical unit of code implementing independent functions. <li><a href="libposixplz/">libposixplz</a>: workarounds for some POSIX deficiencies and for systems that don't quite implement POSIX </li> <li><a href="libstddjb/">libstddjb</a>: basic C API for system programming </li> +<li><a href="libstrerr/">libstrerr</a>: error message printing </li> <li><a href="libdatastruct/">libdatastruct</a>: efficient C implementation of basic data structures like sets or trees</li> <li><a href="libstdcrypto/">libstdcrypto</a>: a few crypto primitives </li> diff --git a/doc/libstddjb/index.html b/doc/libstddjb/index.html @@ -84,8 +84,6 @@ structure </li> <li> <a href="skamisc.html">skalibs/skamisc.h</a>: general string quoting and parsing; miscellaneous, unclassifiable functions </li> <li> <a href="socket.html">skalibs/socket.h</a>: UNIX, INET and INET6 domain sockets </li> <li> <a href="stralloc.html">skalibs/stralloc.h</a>: advanced management of dynamically allocated strings </li> - <li> <a href="strerr.html">skalibs/strerr.h</a>: basic error messages </li> - <li> <a href="strerr2.html">skalibs/strerr2.h</a>: advanced error messages </li> <li> <a href="tai.html">skalibs/tai.h</a>: time, timers and system clock </li> </ul> diff --git a/doc/libstddjb/strerr.html b/doc/libstddjb/strerr.html @@ -1,28 +0,0 @@ -<html> - <head> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <meta http-equiv="Content-Language" content="en" /> - <title>skalibs: the strerr header</title> - <meta name="Description" content="skalibs: the strerr header" /> - <meta name="Keywords" content="skalibs header strerr string error messages" /> - <!-- <link rel="stylesheet" type="text/css" href="//skarnet.org/default.css" /> --> - </head> -<body> - -<p> -<a href="index.html">libstddjb</a><br /> -<a href="../libskarnet.html">libskarnet</a><br /> -<a href="../index.html">skalibs</a><br /> -<a href="//skarnet.org/software/">Software</a><br /> -<a href="//skarnet.org/">skarnet.org</a> -</p> - -<h1> The <tt>skalibs/strerr.h</tt> header </h1> - -<p> - TODO: write this documentation page. (Sorry!) -</p> - -</body> -</html> diff --git a/doc/libstddjb/strerr2.html b/doc/libstddjb/strerr2.html @@ -1,28 +0,0 @@ -<html> - <head> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <meta http-equiv="Content-Language" content="en" /> - <title>skalibs: the strerr2 header</title> - <meta name="Description" content="skalibs: the strerr2 header" /> - <meta name="Keywords" content="skalibs header strerr2 string error messages" /> - <!-- <link rel="stylesheet" type="text/css" href="//skarnet.org/default.css" /> --> - </head> -<body> - -<p> -<a href="index.html">libstddjb</a><br /> -<a href="../libskarnet.html">libskarnet</a><br /> -<a href="../index.html">skalibs</a><br /> -<a href="//skarnet.org/software/">Software</a><br /> -<a href="//skarnet.org/">skarnet.org</a> -</p> - -<h1> The <tt>skalibs/strerr2.h</tt> header </h1> - -<p> - TODO: write this documentation page. (Sorry!) -</p> - -</body> -</html> diff --git a/doc/libstrerr/index.html b/doc/libstrerr/index.html @@ -0,0 +1,27 @@ +<html> + <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="Content-Language" content="en" /> + <title>skalibs: the strerr header</title> + <meta name="Description" content="skalibs: the strerr header" /> + <meta name="Keywords" content="skalibs header strerr string error messages" /> + <!-- <link rel="stylesheet" type="text/css" href="//skarnet.org/default.css" /> --> + </head> +<body> + +<p> +<a href="../libskarnet.html">libskarnet</a><br /> +<a href="../index.html">skalibs</a><br /> +<a href="//skarnet.org/software/">Software</a><br /> +<a href="//skarnet.org/">skarnet.org</a> +</p> + +<h1> The <tt>skalibs/strerr.h</tt> header </h1> + +<p> + TODO: write this documentation page. (Sorry!) +</p> + +</body> +</html> diff --git a/package/deps.mak b/package/deps.mak @@ -30,7 +30,7 @@ src/include/skalibs/genset.h: src/include/skalibs/functypes.h src/include/skalibs/gensetdyn.h: src/include/skalibs/functypes.h src/include/skalibs/genalloc.h src/include/skalibs/stralloc.h src/include/skalibs/iopause.h: src/include/skalibs/tai.h src/include/skalibs/kolbak.h: src/include/skalibs/unixmessage.h -src/include/skalibs/lolstdio.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/strerr2.h +src/include/skalibs/lolstdio.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/strerr.h src/include/skalibs/netstring.h: src/include/skalibs/buffer.h src/include/skalibs/stralloc.h src/include/skalibs/posixishard.h: src/include/skalibs/gccattributes.h src/include/skalibs/posixplz.h: src/include/skalibs/functypes.h src/include/skalibs/gccattributes.h @@ -40,11 +40,11 @@ src/include/skalibs/sha512.h: src/include/skalibs/uint64.h src/include/skalibs/sig.h: src/include/skalibs/gccattributes.h src/include/skalibs/siovec.h: src/include/skalibs/gccattributes.h src/include/skalibs/skaclient.h: src/include/skalibs/kolbak.h src/include/skalibs/tai.h src/include/skalibs/unixmessage.h -src/include/skalibs/skalibs.h: src/include/skalibs/datastruct.h src/include/skalibs/posixplz.h src/include/skalibs/random.h src/include/skalibs/stdcrypto.h src/include/skalibs/stddjb.h src/include/skalibs/unixonacid.h +src/include/skalibs/skalibs.h: src/include/skalibs/datastruct.h src/include/skalibs/posixplz.h src/include/skalibs/random.h src/include/skalibs/stdcrypto.h src/include/skalibs/stddjb.h src/include/skalibs/strerr.h src/include/skalibs/unixonacid.h src/include/skalibs/skamisc.h: src/include/skalibs/buffer.h src/include/skalibs/stralloc.h src/include/skalibs/socket.h: src/include/skalibs/gccattributes.h src/include/skalibs/posixplz.h src/include/skalibs/tai.h src/include/skalibs/stdcrypto.h: src/include/skalibs/blake2s.h src/include/skalibs/sha1.h src/include/skalibs/sha256.h src/include/skalibs/sha512.h -src/include/skalibs/stddjb.h: src/include/skalibs/alarm.h src/include/skalibs/alloc.h src/include/skalibs/allreadwrite.h src/include/skalibs/bitarray.h src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/bytestr.h src/include/skalibs/cbuffer.h src/include/skalibs/cdb.h src/include/skalibs/cdbmake.h src/include/skalibs/direntry.h src/include/skalibs/disize.h src/include/skalibs/diuint.h src/include/skalibs/diuint32.h src/include/skalibs/djbtime.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/envalloc.h src/include/skalibs/error.h src/include/skalibs/exec.h src/include/skalibs/fmtscan.h src/include/skalibs/functypes.h src/include/skalibs/gccattributes.h src/include/skalibs/genalloc.h src/include/skalibs/genwrite.h src/include/skalibs/iopause.h src/include/skalibs/ip46.h src/include/skalibs/lolstdio.h src/include/skalibs/netstring.h src/include/skalibs/segfault.h src/include/skalibs/selfpipe.h src/include/skalibs/setgroups.h src/include/skalibs/sgetopt.h src/include/skalibs/sig.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/socket.h src/include/skalibs/stralloc.h src/include/skalibs/strerr.h src/include/skalibs/strerr2.h src/include/skalibs/tai.h src/include/skalibs/types.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h +src/include/skalibs/stddjb.h: src/include/skalibs/alarm.h src/include/skalibs/alloc.h src/include/skalibs/allreadwrite.h src/include/skalibs/bitarray.h src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/bytestr.h src/include/skalibs/cbuffer.h src/include/skalibs/cdb.h src/include/skalibs/cdbmake.h src/include/skalibs/direntry.h src/include/skalibs/disize.h src/include/skalibs/diuint.h src/include/skalibs/diuint32.h src/include/skalibs/djbtime.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/envalloc.h src/include/skalibs/error.h src/include/skalibs/exec.h src/include/skalibs/fmtscan.h src/include/skalibs/functypes.h src/include/skalibs/gccattributes.h src/include/skalibs/genalloc.h src/include/skalibs/genwrite.h src/include/skalibs/iopause.h src/include/skalibs/ip46.h src/include/skalibs/lolstdio.h src/include/skalibs/netstring.h src/include/skalibs/segfault.h src/include/skalibs/selfpipe.h src/include/skalibs/setgroups.h src/include/skalibs/sgetopt.h src/include/skalibs/sig.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/socket.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h src/include/skalibs/types.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h src/include/skalibs/strerr.h: src/include/skalibs/gccattributes.h src/include/skalibs/strerr2.h: src/include/skalibs/strerr.h src/include/skalibs/tai.h: src/include/skalibs/gccattributes.h src/include/skalibs/uint64.h @@ -140,15 +140,15 @@ src/libenvexec/mexec_af.o src/libenvexec/mexec_af.lo: src/libenvexec/mexec_af.c src/libenvexec/mexec_afm.o src/libenvexec/mexec_afm.lo: src/libenvexec/mexec_afm.c src/include/skalibs/bytestr.h src/include/skalibs/exec.h src/libenvexec/mexec_afn.o src/libenvexec/mexec_afn.lo: src/libenvexec/mexec_afn.c src/include/skalibs/env.h src/include/skalibs/exec.h src/libenvexec/xexec0_ae.o src/libenvexec/xexec0_ae.lo: src/libenvexec/xexec0_ae.c src/include/skalibs/exec.h -src/libenvexec/xexec_ae.o src/libenvexec/xexec_ae.lo: src/libenvexec/xexec_ae.c src/include/skalibs/exec.h src/include/skalibs/strerr2.h -src/libenvexec/xexecvep.o src/libenvexec/xexecvep.lo: src/libenvexec/xexecvep.c src/include/skalibs/exec.h src/include/skalibs/posixplz.h src/include/skalibs/strerr2.h -src/libenvexec/xexecvep_loose.o src/libenvexec/xexecvep_loose.lo: src/libenvexec/xexecvep_loose.c src/include/skalibs/exec.h src/include/skalibs/posixplz.h src/include/skalibs/strerr2.h -src/libenvexec/xmexec0_af.o src/libenvexec/xmexec0_af.lo: src/libenvexec/xmexec0_af.c src/include/skalibs/exec.h src/include/skalibs/strerr2.h -src/libenvexec/xmexec0_afm.o src/libenvexec/xmexec0_afm.lo: src/libenvexec/xmexec0_afm.c src/include/skalibs/exec.h src/include/skalibs/strerr2.h -src/libenvexec/xmexec0_afn.o src/libenvexec/xmexec0_afn.lo: src/libenvexec/xmexec0_afn.c src/include/skalibs/exec.h src/include/skalibs/strerr2.h -src/libenvexec/xmexec_af.o src/libenvexec/xmexec_af.lo: src/libenvexec/xmexec_af.c src/include/skalibs/exec.h src/include/skalibs/strerr2.h -src/libenvexec/xmexec_afm.o src/libenvexec/xmexec_afm.lo: src/libenvexec/xmexec_afm.c src/include/skalibs/exec.h src/include/skalibs/strerr2.h -src/libenvexec/xmexec_afn.o src/libenvexec/xmexec_afn.lo: src/libenvexec/xmexec_afn.c src/include/skalibs/exec.h src/include/skalibs/strerr2.h +src/libenvexec/xexec_ae.o src/libenvexec/xexec_ae.lo: src/libenvexec/xexec_ae.c src/include/skalibs/exec.h src/include/skalibs/strerr.h +src/libenvexec/xexecvep.o src/libenvexec/xexecvep.lo: src/libenvexec/xexecvep.c src/include/skalibs/exec.h src/include/skalibs/posixplz.h src/include/skalibs/strerr.h +src/libenvexec/xexecvep_loose.o src/libenvexec/xexecvep_loose.lo: src/libenvexec/xexecvep_loose.c src/include/skalibs/exec.h src/include/skalibs/posixplz.h src/include/skalibs/strerr.h +src/libenvexec/xmexec0_af.o src/libenvexec/xmexec0_af.lo: src/libenvexec/xmexec0_af.c src/include/skalibs/exec.h src/include/skalibs/strerr.h +src/libenvexec/xmexec0_afm.o src/libenvexec/xmexec0_afm.lo: src/libenvexec/xmexec0_afm.c src/include/skalibs/exec.h src/include/skalibs/strerr.h +src/libenvexec/xmexec0_afn.o src/libenvexec/xmexec0_afn.lo: src/libenvexec/xmexec0_afn.c src/include/skalibs/exec.h src/include/skalibs/strerr.h +src/libenvexec/xmexec_af.o src/libenvexec/xmexec_af.lo: src/libenvexec/xmexec_af.c src/include/skalibs/exec.h src/include/skalibs/strerr.h +src/libenvexec/xmexec_afm.o src/libenvexec/xmexec_afm.lo: src/libenvexec/xmexec_afm.c src/include/skalibs/exec.h src/include/skalibs/strerr.h +src/libenvexec/xmexec_afn.o src/libenvexec/xmexec_afn.lo: src/libenvexec/xmexec_afn.c src/include/skalibs/exec.h src/include/skalibs/strerr.h src/libposixplz/doublefork.o src/libposixplz/doublefork.lo: src/libposixplz/doublefork.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/posixplz.h src/include/skalibs/uint64.h src/libposixplz/execvep.o src/libposixplz/execvep.lo: src/libposixplz/execvep.c src/libposixplz/posixplz-internal.h src/include/skalibs/posixplz.h src/libposixplz/execvep_internal.o src/libposixplz/execvep_internal.lo: src/libposixplz/execvep_internal.c src/include/skalibs/bytestr.h src/include/skalibs/posixplz.h @@ -171,7 +171,7 @@ src/libposixplz/unlink_void.o src/libposixplz/unlink_void.lo: src/libposixplz/un src/librandom/autosurf.o src/librandom/autosurf.lo: src/librandom/autosurf.c src/include/skalibs/random.h src/include/skalibs/sha1.h src/include/skalibs/surf.h src/include/skalibs/tai.h src/include/skalibs/uint32.h src/librandom/random_buf.o src/librandom/random_buf.lo: src/librandom/random_buf.c src/include/skalibs/nonposix.h src/include/skalibs/random.h src/include/skalibs/surf.h src/include/skalibs/sysdeps.h src/librandom/random_buf_early.o src/librandom/random_buf_early.lo: src/librandom/random_buf_early.c src/include/skalibs/nonposix.h src/include/skalibs/random.h src/include/skalibs/surf.h src/include/skalibs/sysdeps.h -src/librandom/random_devurandom.o src/librandom/random_devurandom.lo: src/librandom/random_devurandom.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/random.h src/include/skalibs/strerr2.h +src/librandom/random_devurandom.o src/librandom/random_devurandom.lo: src/librandom/random_devurandom.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/random.h src/include/skalibs/strerr.h src/librandom/random_name_from.o src/librandom/random_name_from.lo: src/librandom/random_name_from.c src/include/skalibs/functypes.h src/include/skalibs/random.h src/librandom/random_sauniquename_from.o src/librandom/random_sauniquename_from.lo: src/librandom/random_sauniquename_from.c src/include/skalibs/random.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h src/librandom/random_uint32_from.o src/librandom/random_uint32_from.lo: src/librandom/random_uint32_from.c src/include/skalibs/functypes.h src/include/skalibs/random.h src/include/skalibs/uint32.h @@ -294,13 +294,13 @@ src/libstddjb/cdb_p.o src/libstddjb/cdb_p.lo: src/libstddjb/cdb_p.c src/libstddj src/libstddjb/cdb_traverse_next.o src/libstddjb/cdb_traverse_next.lo: src/libstddjb/cdb_traverse_next.c src/libstddjb/cdb-internal.h src/include/skalibs/cdb.h src/include/skalibs/uint32.h src/libstddjb/cdb_zero.o src/libstddjb/cdb_zero.lo: src/libstddjb/cdb_zero.c src/include/skalibs/cdb.h src/libstddjb/cdbmake.o src/libstddjb/cdbmake.lo: src/libstddjb/cdbmake.c src/include/skalibs/buffer.h src/libstddjb/cdb-internal.h src/include/skalibs/cdbmake.h src/include/skalibs/diuint32.h src/include/skalibs/genalloc.h src/include/skalibs/uint32.h -src/libstddjb/child_spawn.o src/libstddjb/child_spawn.lo: src/libstddjb/child_spawn.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h src/include/skalibs/types.h -src/libstddjb/child_spawn0.o src/libstddjb/child_spawn0.lo: src/libstddjb/child_spawn0.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h -src/libstddjb/child_spawn1_internal.o src/libstddjb/child_spawn1_internal.lo: src/libstddjb/child_spawn1_internal.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h +src/libstddjb/child_spawn.o src/libstddjb/child_spawn.lo: src/libstddjb/child_spawn.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr.h src/include/skalibs/sysdeps.h src/include/skalibs/types.h +src/libstddjb/child_spawn0.o src/libstddjb/child_spawn0.lo: src/libstddjb/child_spawn0.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr.h src/include/skalibs/sysdeps.h +src/libstddjb/child_spawn1_internal.o src/libstddjb/child_spawn1_internal.lo: src/libstddjb/child_spawn1_internal.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr.h src/include/skalibs/sysdeps.h src/libstddjb/child_spawn1_pipe.o src/libstddjb/child_spawn1_pipe.lo: src/libstddjb/child_spawn1_pipe.c src/libstddjb/djbunix-internal.h src/include/skalibs/djbunix.h src/libstddjb/child_spawn1_socket.o src/libstddjb/child_spawn1_socket.lo: src/libstddjb/child_spawn1_socket.c src/libstddjb/djbunix-internal.h src/include/skalibs/djbunix.h src/include/skalibs/socket.h -src/libstddjb/child_spawn2.o src/libstddjb/child_spawn2.lo: src/libstddjb/child_spawn2.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h -src/libstddjb/child_spawn3.o src/libstddjb/child_spawn3.lo: src/libstddjb/child_spawn3.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h src/include/skalibs/types.h +src/libstddjb/child_spawn2.o src/libstddjb/child_spawn2.lo: src/libstddjb/child_spawn2.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr.h src/include/skalibs/sysdeps.h +src/libstddjb/child_spawn3.o src/libstddjb/child_spawn3.lo: src/libstddjb/child_spawn3.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/exec.h src/include/skalibs/sig.h src/include/skalibs/strerr.h src/include/skalibs/sysdeps.h src/include/skalibs/types.h src/libstddjb/coe.o src/libstddjb/coe.lo: src/libstddjb/coe.c src/include/skalibs/djbunix.h src/libstddjb/deepsleepuntil.o src/libstddjb/deepsleepuntil.lo: src/libstddjb/deepsleepuntil.c src/include/skalibs/iopause.h src/include/skalibs/tai.h src/libstddjb/dir_close.o src/libstddjb/dir_close.lo: src/libstddjb/dir_close.c src/include/skalibs/direntry.h @@ -345,7 +345,7 @@ src/libstddjb/genwrite_stdout.o src/libstddjb/genwrite_stdout.lo: src/libstddjb/ src/libstddjb/getlnmax.o src/libstddjb/getlnmax.lo: src/libstddjb/getlnmax.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/libstddjb/getlnmaxsep.o src/libstddjb/getlnmaxsep.lo: src/libstddjb/getlnmaxsep.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/libstddjb/hiercopy.o src/libstddjb/hiercopy.lo: src/libstddjb/hiercopy.c src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h -src/libstddjb/hiercopy_tmp.o src/libstddjb/hiercopy_tmp.lo: src/libstddjb/hiercopy_tmp.c src/include/skalibs/direntry.h src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h src/include/skalibs/strerr2.h +src/libstddjb/hiercopy_tmp.o src/libstddjb/hiercopy_tmp.lo: src/libstddjb/hiercopy_tmp.c src/include/skalibs/direntry.h src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h src/libstddjb/int160_scan.o src/libstddjb/int160_scan.lo: src/libstddjb/int160_scan.c src/libstddjb/fmtscan-internal.h src/include/skalibs/uint16.h src/libstddjb/int16_fmtlist.o src/libstddjb/int16_fmtlist.lo: src/libstddjb/int16_fmtlist.c src/libstddjb/fmtscan-internal.h src/include/skalibs/uint16.h src/libstddjb/int16_scan.o src/libstddjb/int16_scan.lo: src/libstddjb/int16_scan.c src/libstddjb/fmtscan-internal.h src/include/skalibs/uint16.h src/include/skalibs/uint64.h @@ -448,7 +448,7 @@ src/libstddjb/openwritevnclose_suffix.o src/libstddjb/openwritevnclose_suffix.lo src/libstddjb/openwritevnclose_unsafe.o src/libstddjb/openwritevnclose_unsafe.lo: src/libstddjb/openwritevnclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/libstddjb/path_canonicalize.o src/libstddjb/path_canonicalize.lo: src/libstddjb/path_canonicalize.c src/include/skalibs/djbunix.h src/libstddjb/pipe_internal.o src/libstddjb/pipe_internal.lo: src/libstddjb/pipe_internal.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h -src/libstddjb/prog.o src/libstddjb/prog.lo: src/libstddjb/prog.c src/include/skalibs/strerr2.h +src/libstddjb/prog.o src/libstddjb/prog.lo: src/libstddjb/prog.c src/include/skalibs/strerr.h src/libstddjb/readnclose.o src/libstddjb/readnclose.lo: src/libstddjb/readnclose.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/libstddjb/rm_rf.o src/libstddjb/rm_rf.lo: src/libstddjb/rm_rf.c src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/libstddjb/rm_rf_in_tmp.o src/libstddjb/rm_rf_in_tmp.lo: src/libstddjb/rm_rf_in_tmp.c src/include/skalibs/direntry.h src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h @@ -555,8 +555,6 @@ src/libstddjb/stralloc_reverse.o src/libstddjb/stralloc_reverse.lo: src/libstddj src/libstddjb/stralloc_reverse_blocks.o src/libstddjb/stralloc_reverse_blocks.lo: src/libstddjb/stralloc_reverse_blocks.c src/include/skalibs/stralloc.h src/libstddjb/stralloc_shrink.o src/libstddjb/stralloc_shrink.lo: src/libstddjb/stralloc_shrink.c src/include/skalibs/alloc.h src/include/skalibs/stralloc.h src/libstddjb/stralloc_zero.o src/libstddjb/stralloc_zero.lo: src/libstddjb/stralloc_zero.c src/include/skalibs/stralloc.h -src/libstddjb/strerr.o src/libstddjb/strerr.lo: src/libstddjb/strerr.c src/include/skalibs/buffer.h src/include/skalibs/strerr.h -src/libstddjb/strerr_sys.o src/libstddjb/strerr_sys.lo: src/libstddjb/strerr_sys.c src/include/skalibs/strerr.h src/libstddjb/string_format.o src/libstddjb/string_format.lo: src/libstddjb/string_format.c src/include/skalibs/bytestr.h src/include/skalibs/stralloc.h src/libstddjb/string_quote.o src/libstddjb/string_quote.lo: src/libstddjb/string_quote.c src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h src/libstddjb/string_quote_nodelim.o src/libstddjb/string_quote_nodelim.lo: src/libstddjb/string_quote_nodelim.c src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h @@ -698,6 +696,58 @@ src/libstddjb/waitn_reap_posix.o src/libstddjb/waitn_reap_posix.lo: src/libstddj src/libstddjb/waitpid_nointr.o src/libstddjb/waitpid_nointr.lo: src/libstddjb/waitpid_nointr.c src/include/skalibs/djbunix.h src/libstddjb/writenclose_unsafe.o src/libstddjb/writenclose_unsafe.lo: src/libstddjb/writenclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/libstddjb/writevnclose_unsafe.o src/libstddjb/writevnclose_unsafe.lo: src/libstddjb/writevnclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h +src/libstrerr/strerr_die10sys.o src/libstrerr/strerr_die10sys.lo: src/libstrerr/strerr_die10sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die10x.o src/libstrerr/strerr_die10x.lo: src/libstrerr/strerr_die10x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die11sys.o src/libstrerr/strerr_die11sys.lo: src/libstrerr/strerr_die11sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die11x.o src/libstrerr/strerr_die11x.lo: src/libstrerr/strerr_die11x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die1sys.o src/libstrerr/strerr_die1sys.lo: src/libstrerr/strerr_die1sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die1x.o src/libstrerr/strerr_die1x.lo: src/libstrerr/strerr_die1x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die2sys.o src/libstrerr/strerr_die2sys.lo: src/libstrerr/strerr_die2sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die2x.o src/libstrerr/strerr_die2x.lo: src/libstrerr/strerr_die2x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die3sys.o src/libstrerr/strerr_die3sys.lo: src/libstrerr/strerr_die3sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die3x.o src/libstrerr/strerr_die3x.lo: src/libstrerr/strerr_die3x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die4sys.o src/libstrerr/strerr_die4sys.lo: src/libstrerr/strerr_die4sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die4x.o src/libstrerr/strerr_die4x.lo: src/libstrerr/strerr_die4x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die5sys.o src/libstrerr/strerr_die5sys.lo: src/libstrerr/strerr_die5sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die5x.o src/libstrerr/strerr_die5x.lo: src/libstrerr/strerr_die5x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die6sys.o src/libstrerr/strerr_die6sys.lo: src/libstrerr/strerr_die6sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die6x.o src/libstrerr/strerr_die6x.lo: src/libstrerr/strerr_die6x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die7sys.o src/libstrerr/strerr_die7sys.lo: src/libstrerr/strerr_die7sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die7x.o src/libstrerr/strerr_die7x.lo: src/libstrerr/strerr_die7x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die8sys.o src/libstrerr/strerr_die8sys.lo: src/libstrerr/strerr_die8sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die8x.o src/libstrerr/strerr_die8x.lo: src/libstrerr/strerr_die8x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die9sys.o src/libstrerr/strerr_die9sys.lo: src/libstrerr/strerr_die9sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_die9x.o src/libstrerr/strerr_die9x.lo: src/libstrerr/strerr_die9x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_diel.o src/libstrerr/strerr_diel.lo: src/libstrerr/strerr_diel.c src/include/skalibs/strerr.h +src/libstrerr/strerr_dielsys.o src/libstrerr/strerr_dielsys.lo: src/libstrerr/strerr_dielsys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_diev.o src/libstrerr/strerr_diev.lo: src/libstrerr/strerr_diev.c src/include/skalibs/strerr.h +src/libstrerr/strerr_dievsys.o src/libstrerr/strerr_dievsys.lo: src/libstrerr/strerr_dievsys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn10sys.o src/libstrerr/strerr_warn10sys.lo: src/libstrerr/strerr_warn10sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn10x.o src/libstrerr/strerr_warn10x.lo: src/libstrerr/strerr_warn10x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn11sys.o src/libstrerr/strerr_warn11sys.lo: src/libstrerr/strerr_warn11sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn11x.o src/libstrerr/strerr_warn11x.lo: src/libstrerr/strerr_warn11x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn1sys.o src/libstrerr/strerr_warn1sys.lo: src/libstrerr/strerr_warn1sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn1x.o src/libstrerr/strerr_warn1x.lo: src/libstrerr/strerr_warn1x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn2sys.o src/libstrerr/strerr_warn2sys.lo: src/libstrerr/strerr_warn2sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn2x.o src/libstrerr/strerr_warn2x.lo: src/libstrerr/strerr_warn2x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn3sys.o src/libstrerr/strerr_warn3sys.lo: src/libstrerr/strerr_warn3sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn3x.o src/libstrerr/strerr_warn3x.lo: src/libstrerr/strerr_warn3x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn4sys.o src/libstrerr/strerr_warn4sys.lo: src/libstrerr/strerr_warn4sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn4x.o src/libstrerr/strerr_warn4x.lo: src/libstrerr/strerr_warn4x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn5sys.o src/libstrerr/strerr_warn5sys.lo: src/libstrerr/strerr_warn5sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn5x.o src/libstrerr/strerr_warn5x.lo: src/libstrerr/strerr_warn5x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn6sys.o src/libstrerr/strerr_warn6sys.lo: src/libstrerr/strerr_warn6sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn6x.o src/libstrerr/strerr_warn6x.lo: src/libstrerr/strerr_warn6x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn7sys.o src/libstrerr/strerr_warn7sys.lo: src/libstrerr/strerr_warn7sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn7x.o src/libstrerr/strerr_warn7x.lo: src/libstrerr/strerr_warn7x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn8sys.o src/libstrerr/strerr_warn8sys.lo: src/libstrerr/strerr_warn8sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn8x.o src/libstrerr/strerr_warn8x.lo: src/libstrerr/strerr_warn8x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn9sys.o src/libstrerr/strerr_warn9sys.lo: src/libstrerr/strerr_warn9sys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warn9x.o src/libstrerr/strerr_warn9x.lo: src/libstrerr/strerr_warn9x.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warnl.o src/libstrerr/strerr_warnl.lo: src/libstrerr/strerr_warnl.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warnlsys.o src/libstrerr/strerr_warnlsys.lo: src/libstrerr/strerr_warnlsys.c src/include/skalibs/strerr.h +src/libstrerr/strerr_warnv.o src/libstrerr/strerr_warnv.lo: src/libstrerr/strerr_warnv.c src/include/skalibs/buffer.h src/include/skalibs/strerr.h +src/libstrerr/strerr_warnvsys.o src/libstrerr/strerr_warnvsys.lo: src/libstrerr/strerr_warnvsys.c src/include/skalibs/buffer.h src/include/skalibs/strerr.h src/libunixonacid/access_at.o src/libunixonacid/access_at.lo: src/libunixonacid/access_at.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h src/libunixonacid/ancil_recv_fd.o src/libunixonacid/ancil_recv_fd.lo: src/libunixonacid/ancil_recv_fd.c src/include/skalibs/allreadwrite.h src/include/skalibs/ancil.h src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h src/include/skalibs/sysdeps.h src/libunixonacid/ancil_send_fd.o src/libunixonacid/ancil_send_fd.lo: src/libunixonacid/ancil_send_fd.c src/include/skalibs/ancil.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h diff --git a/package/info b/package/info @@ -1,4 +1,4 @@ package=skalibs -version=2.12.1.0 +version=2.13.0.0 category=prog package_macro_name=SKALIBS diff --git a/src/include/skalibs/lolstdio.h b/src/include/skalibs/lolstdio.h @@ -7,7 +7,7 @@ #include <skalibs/buffer.h> #include <skalibs/bufalloc.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #ifdef DEBUG # define LOLDEBUG(...) do \ diff --git a/src/include/skalibs/skalibs.h b/src/include/skalibs/skalibs.h @@ -15,6 +15,7 @@ #include <skalibs/posixplz.h> #include <skalibs/stddjb.h> +#include <skalibs/strerr.h> #include <skalibs/stdcrypto.h> #include <skalibs/random.h> #include <skalibs/datastruct.h> diff --git a/src/include/skalibs/stddjb.h b/src/include/skalibs/stddjb.h @@ -46,8 +46,6 @@ #include <skalibs/skamisc.h> #include <skalibs/socket.h> #include <skalibs/stralloc.h> -#include <skalibs/strerr.h> -#include <skalibs/strerr2.h> #include <skalibs/tai.h> #endif diff --git a/src/include/skalibs/strerr.h b/src/include/skalibs/strerr.h @@ -5,135 +5,364 @@ #include <skalibs/gccattributes.h> -extern void strerr_warn (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; -extern void strerr_die (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; -extern void strerr_warnsys (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; -extern void strerr_diesys (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; - -#define strerr_warn10(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, se) \ -strerr_warn(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, se) -#define strerr_warn9(x1, x2, x3, x4, x5, x6, x7, x8, x9, se) \ -strerr_warn(x1, x2, x3, x4, x5, x6, x7, x8, x9, 0, se) -#define strerr_warn8(x1, x2, x3, x4, x5, x6, x7, x8, se) \ -strerr_warn(x1, x2, x3, x4, x5, x6, x7, x8, 0, 0, se) -#define strerr_warn7(x1, x2, x3, x4, x5, x6, x7, se) \ -strerr_warn(x1, x2, x3, x4, x5, x6, x7, 0, 0, 0, se) -#define strerr_warn6(x1, x2, x3, x4, x5, x6, se) \ -strerr_warn(x1, x2, x3, x4, x5, x6, 0, 0, 0, 0, se) -#define strerr_warn5(x1, x2, x3, x4, x5, se) \ -strerr_warn(x1, x2, x3, x4, x5, 0, 0, 0, 0, 0, se) -#define strerr_warn4(x1, x2, x3, x4, se) \ -strerr_warn(x1, x2, x3, x4, 0, 0, 0, 0, 0, 0, se) -#define strerr_warn3(x1, x2, x3, se) \ -strerr_warn(x1, x2, x3, 0, 0, 0, 0, 0, 0, 0, se) -#define strerr_warn2(x1, x2, se) \ -strerr_warn(x1, x2, 0, 0, 0, 0, 0, 0, 0, 0, se) -#define strerr_warn1(x1, se) \ -strerr_warn(x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, se) - -#define strerr_warn10sys(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) \ -strerr_warnsys(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) -#define strerr_warn9sys(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ -strerr_warnsys(x1, x2, x3, x4, x5, x6, x7, x8, (x9), 0) -#define strerr_warn8sys(x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_warnsys(x1, x2, x3, x4, x5, x6, x7, (x8), 0, 0) -#define strerr_warn7sys(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warnsys(x1, x2, x3, x4, x5, x6, (x7), 0, 0, 0) -#define strerr_warn6sys(x1, x2, x3, x4, x5, x6) \ -strerr_warnsys(x1, x2, x3, x4, x5, (x6), 0, 0, 0, 0) -#define strerr_warn5sys(x1, x2, x3, x4, x5) \ -strerr_warnsys(x1, x2, x3, x4, (x5), 0, 0, 0, 0, 0) -#define strerr_warn4sys(x1, x2, x3, x4) \ -strerr_warnsys(x1, x2, x3, (x4), 0, 0, 0, 0, 0, 0) -#define strerr_warn3sys(x1, x2, x3) \ -strerr_warnsys(x1, x2, (x3), 0, 0, 0, 0, 0, 0, 0) -#define strerr_warn2sys(x1, x2) \ -strerr_warnsys(x1, (x2), 0, 0, 0, 0, 0, 0, 0, 0) -#define strerr_warn1sys(x1) \ -strerr_warnsys((x1), 0, 0, 0, 0, 0, 0, 0, 0, 0) - -#define strerr_warn10x(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) \ -strerr_warn(x1, x2, x3, x4, x5, x6, x7, x8, x9, (x10), 0) -#define strerr_warn9x(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ -strerr_warn(x1, x2, x3, x4, x5, x6, x7, x8, (x9), 0, 0) -#define strerr_warn8x(x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_warn(x1, x2, x3, x4, x5, x6, x7, (x8), 0, 0, 0) -#define strerr_warn7x(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn(x1, x2, x3, x4, x5, x6, (x7), 0, 0, 0, 0) -#define strerr_warn6x(x1, x2, x3, x4, x5, x6) \ -strerr_warn(x1, x2, x3, x4, x5, (x6), 0, 0, 0, 0, 0) -#define strerr_warn5x(x1, x2, x3, x4, x5) \ -strerr_warn(x1, x2, x3, x4, (x5), 0, 0, 0, 0, 0, 0) -#define strerr_warn4x(x1, x2, x3, x4) \ -strerr_warn(x1, x2, x3, (x4), 0, 0, 0, 0, 0, 0, 0) -#define strerr_warn3x(x1, x2, x3) \ -strerr_warn(x1, x2, (x3), 0, 0, 0, 0, 0, 0, 0, 0) -#define strerr_warn2x(x1, x2) \ -strerr_warn(x1, (x2), 0, 0, 0, 0, 0, 0, 0, 0, 0) -#define strerr_warn1x(x1) \ -strerr_warn((x1), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) - -#define strerr_die10(e, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, se) \ -strerr_die(e, x1, x2, x3, x4, x5 , x6, x7, x8, x9, x10, se) -#define strerr_die9(e, x1, x2, x3, x4, x5, x6, x7, x8, x9, se) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, x7, x8, x9, 0, se) -#define strerr_die8(e, x1, x2, x3, x4, x5, x6, x7, x8, se) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, x7, x8, 0, 0, se) -#define strerr_die7(e, x1, x2, x3, x4, x5, x6, x7, se) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, x7, 0, 0, 0, se) -#define strerr_die6(e, x1, x2, x3, x4, x5, x6, se) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, 0, 0, 0, 0, se) -#define strerr_die5(e, x1, x2, x3, x4, x5, se) \ -strerr_die(e, x1, x2, x3, x4, x5, 0, 0, 0, 0, 0, se) -#define strerr_die4(e, x1, x2, x3, x4, se) \ -strerr_die(e, x1, x2, x3, x4, 0, 0, 0, 0, 0, 0, se) -#define strerr_die3(e, x1, x2, x3, se) \ -strerr_die(e, x1, x2, x3, 0, 0, 0, 0, 0, 0, 0, se) -#define strerr_die2(e, x1, x2, se) \ -strerr_die(e, x1, x2, 0, 0, 0, 0, 0, 0, 0, 0, se) -#define strerr_die1(e, x1, se) \ -strerr_die(e, x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, se) - -#define strerr_die10sys(e, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) \ -strerr_diesys(e, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) -#define strerr_die9sys(e, x1, x2, x3, x4, x5, x6, x7, x8, x9) \ -strerr_diesys(e, x1, x2, x3, x4, x5, x6, x7, x8, (x9), 0) -#define strerr_die8sys(e, x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_diesys(e, x1, x2, x3, x4, x5, x6, x7, (x8), 0, 0) -#define strerr_die7sys(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_diesys(e, x1, x2, x3, x4, x5, x6, (x7), 0, 0, 0) -#define strerr_die6sys(e, x1, x2, x3, x4, x5, x6) \ -strerr_diesys(e, x1, x2, x3, x4, x5, (x6), 0, 0, 0, 0) -#define strerr_die5sys(e, x1, x2, x3, x4, x5) \ -strerr_diesys(e, x1, x2, x3, x4, (x5), 0, 0, 0, 0, 0) -#define strerr_die4sys(e, x1, x2, x3, x4) \ -strerr_diesys(e, x1, x2, x3, (x4), 0, 0, 0, 0, 0, 0) -#define strerr_die3sys(e, x1, x2, x3) \ -strerr_diesys(e, x1, x2, (x3), 0, 0, 0, 0, 0, 0, 0) -#define strerr_die2sys(e, x1, x2) \ -strerr_diesys(e, x1, (x2), 0, 0, 0, 0, 0, 0, 0, 0) -#define strerr_die1sys(e, x1) \ -strerr_diesys(e, (x1), 0, 0, 0, 0, 0, 0, 0, 0, 0) - -#define strerr_die10x(e, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, x7, x8, x9, (x10), 0) -#define strerr_die9x(e, x1, x2, x3, x4, x5, x6, x7, x8, x9) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, x7, x8, (x9), 0, 0) -#define strerr_die8x(e, x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, x7, (x8), 0, 0, 0) -#define strerr_die7x(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_die(e, x1, x2, x3, x4, x5, x6, (x7), 0, 0, 0, 0) -#define strerr_die6x(e, x1, x2, x3, x4, x5, x6) \ -strerr_die(e, x1, x2, x3, x4, x5, (x6), 0, 0, 0, 0, 0) -#define strerr_die5x(e, x1, x2, x3, x4, x5) \ -strerr_die(e, x1, x2, x3, x4, (x5), 0, 0, 0, 0, 0, 0) -#define strerr_die4x(e, x1, x2, x3, x4) \ -strerr_die(e, x1, x2, x3, (x4), 0, 0, 0, 0, 0, 0, 0) -#define strerr_die3x(e, x1, x2, x3) \ -strerr_die(e, x1, x2, (x3), 0, 0, 0, 0, 0, 0, 0, 0) -#define strerr_die2x(e, x1, x2) \ -strerr_die(e, x1, (x2), 0, 0, 0, 0, 0, 0, 0, 0, 0) -#define strerr_die1x(e, x1) \ -strerr_die(e, (x1), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) +extern void strerr_warnv (char const *const *, unsigned int) ; +extern void strerr_warnvsys (char const *const *, unsigned int) ; +extern void strerr_diev (int, char const *const *, unsigned int) gccattr_noreturn ; +extern void strerr_dievsys(int, char const *const *, unsigned int) gccattr_noreturn ; + +extern void strerr_warnl (unsigned int, ...) ; +extern void strerr_warnlsys (unsigned int, ...) ; +extern void strerr_diel (int, unsigned int, ...) gccattr_noreturn ; +extern void strerr_dielsys (int, unsigned int, ...) gccattr_noreturn ; + +extern void strerr_warn1x (char const *) ; +extern void strerr_warn2x (char const *, char const *) ; +extern void strerr_warn3x (char const *, char const *, char const *) ; +extern void strerr_warn4x (char const *, char const *, char const *, char const *) ; +extern void strerr_warn5x (char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn6x (char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn7x (char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn8x (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn9x (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn10x (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn11x (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; + +extern void strerr_warn1sys (char const *) ; +extern void strerr_warn2sys (char const *, char const *) ; +extern void strerr_warn3sys (char const *, char const *, char const *) ; +extern void strerr_warn4sys (char const *, char const *, char const *, char const *) ; +extern void strerr_warn5sys (char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn6sys (char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn7sys (char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn8sys (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn9sys (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn10sys (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; +extern void strerr_warn11sys (char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) ; + +extern void strerr_die1x (int, char const *) gccattr_noreturn ; +extern void strerr_die2x (int, char const *, char const *) gccattr_noreturn ; +extern void strerr_die3x (int, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die4x (int, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die5x (int, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die6x (int, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die7x (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die8x (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die9x (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die10x (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die11x (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; + +extern void strerr_die1sys (int, char const *) gccattr_noreturn ; +extern void strerr_die2sys (int, char const *, char const *) gccattr_noreturn ; +extern void strerr_die3sys (int, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die4sys (int, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die5sys (int, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die6sys (int, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die7sys (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die8sys (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die9sys (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die10sys (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; +extern void strerr_die11sys (int, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *, char const *) gccattr_noreturn ; + +extern char const *PROG ; + +#define strerr_warnw1x(x1) \ +strerr_warn3x(PROG, ": warning: ", (x1)) +#define strerr_warnw2x(x1, x2) \ +strerr_warn4x(PROG, ": warning: ", (x1), x2) +#define strerr_warnw3x(x1, x2, x3) \ +strerr_warn5x(PROG, ": warning: ", (x1), x2, x3) +#define strerr_warnw4x(x1, x2, x3, x4) \ +strerr_warn6x(PROG, ": warning: ", (x1), x2, x3, x4) +#define strerr_warnw5x(x1, x2, x3, x4, x5) \ +strerr_warn7x(PROG, ": warning: ", (x1), x2, x3, x4, x5) +#define strerr_warnw6x(x1, x2, x3, x4, x5, x6) \ +strerr_warn8x(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6) +#define strerr_warnw7x(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn9x(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7) +#define strerr_warnw8x(x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_warn10x(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7, x8) +#define strerr_warnw9x(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_warn11x(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_warnw1sys(x1) \ +strerr_warn3sys(PROG, ": warning: ", (x1)) +#define strerr_warnw2sys(x1, x2) \ +strerr_warn4sys(PROG, ": warning: ", (x1), x2) +#define strerr_warnw3sys(x1, x2, x3) \ +strerr_warn5sys(PROG, ": warning: ", (x1), x2, x3) +#define strerr_warnw4sys(x1, x2, x3, x4) \ +strerr_warn6sys(PROG, ": warning: ", (x1), x2, x3, x4) +#define strerr_warnw5sys(x1, x2, x3, x4, x5) \ +strerr_warn7sys(PROG, ": warning: ", (x1), x2, x3, x4, x5) +#define strerr_warnw6sys(x1, x2, x3, x4, x5, x6) \ +strerr_warn8sys(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6) +#define strerr_warnw7sys(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn9sys(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7) +#define strerr_warnw8sys(x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_warn10sys(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7, x8) +#define strerr_warnw9sys(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_warn11sys(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_diew1x(e, x1) \ +strerr_die3x(e, PROG, ": warning: ", x1) +#define strerr_diew2x(e, x1, x2) \ +strerr_die4x(e, PROG, ": warning: ", x1, x2) +#define strerr_diew3x(e, x1, x2, x3) \ +strerr_die5x(e, PROG, ": warning: ", x1, x2, x3) +#define strerr_diew4x(e, x1, x2, x3, x4) \ +strerr_die6x(e, PROG, ": warning: ", x1, x2, x3, x4) +#define strerr_diew5x(e, x1, x2, x3, x4, x5) \ +strerr_die7x(e, PROG, ": warning: ", x1, x2, x3, x4, x5) +#define strerr_diew6x(e, x1, x2, x3, x4, x5, x6) \ +strerr_die8x(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6) +#define strerr_diew7x(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die9x(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_diew8x(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die10x(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7, x8) +#define strerr_diew9x(e, x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_die11x(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_diew1sys(e, x1) \ +strerr_die3sys(e, PROG, ": warning: ", (x1)) +#define strerr_diew2sys(e, x1, x2) \ +strerr_die4sys(e, PROG, ": warning: ", x1, x2) +#define strerr_diew3sys(e, x1, x2, x3) \ +strerr_die5sys(e, PROG, ": warning: ", x1, x2, x3) +#define strerr_diew4sys(e, x1, x2, x3, x4) \ +strerr_die6sys(e, PROG, ": warning: ", x1, x2, x3, x4) +#define strerr_diew5sys(e, x1, x2, x3, x4, x5) \ +strerr_die7sys(e, PROG, ": warning: ", x1, x2, x3, x4, x5) +#define strerr_diew6sys(e, x1, x2, x3, x4, x5, x6) \ +strerr_die8sys(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6) +#define strerr_diew7sys(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die9sys(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_diew8sys(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die10sys(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7, x8) +#define strerr_diew9sys(e, x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_die11sys(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_dief1x(e, x1) \ +strerr_die3x(e, PROG, ": fatal: ", x1) +#define strerr_dief2x(e, x1, x2) \ +strerr_die4x(e, PROG, ": fatal: ", x1, x2) +#define strerr_dief3x(e, x1, x2, x3) \ +strerr_die5x(e, PROG, ": fatal: ", x1, x2, x3) +#define strerr_dief4x(e, x1, x2, x3, x4) \ +strerr_die6x(e, PROG, ": fatal: ", x1, x2, x3, x4) +#define strerr_dief5x(e, x1, x2, x3, x4, x5) \ +strerr_die7x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5) +#define strerr_dief6x(e, x1, x2, x3, x4, x5, x6) \ +strerr_die8x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6) +#define strerr_dief7x(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die9x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_dief8x(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die10x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, x7, x8) + +#define strerr_dief1sys(e, x1) \ +strerr_die3sys(e, PROG, ": fatal: ", x1) +#define strerr_dief2sys(e, x1, x2) \ +strerr_die4sys(e, PROG, ": fatal: ", x1, x2) +#define strerr_dief3sys(e, x1, x2, x3) \ +strerr_die5sys(e, PROG, ": fatal: ", x1, x2, x3) +#define strerr_dief4sys(e, x1, x2, x3, x4) \ +strerr_die6sys(e, PROG, ": fatal: ", x1, x2, x3, x4) +#define strerr_dief5sys(e, x1, x2, x3, x4, x5) \ +strerr_die7sys(e, PROG, ": fatal: ", x1, x2, x3, x4, x5) +#define strerr_dief6sys(e, x1, x2, x3, x4, x5, x6) \ +strerr_die8sys(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6) +#define strerr_dief7sys(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die9sys(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_dief8sys(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die10sys(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, x7, x8) +#define strerr_dief9sys(e, x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_die11sys(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_diefu1x(e, x1) \ +strerr_die4x(e, PROG, ": fatal: ", "unable to ", x1) +#define strerr_diefu2x(e, x1, x2) \ +strerr_die5x(e, PROG, ": fatal: ", "unable to ", x1, x2) +#define strerr_diefu3x(e, x1, x2, x3) \ +strerr_die6x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3) +#define strerr_diefu4x(e, x1, x2, x3, x4) \ +strerr_die7x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4) +#define strerr_diefu5x(e, x1, x2, x3, x4, x5) \ +strerr_die8x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5) +#define strerr_diefu6x(e, x1, x2, x3, x4, x5, x6) \ +strerr_die9x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6) +#define strerr_diefu7x(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die10x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_diefu8x(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die11x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6, x7, x8) + +#define strerr_diefu1sys(e, x1) \ +strerr_die4sys(e, PROG, ": fatal: ", "unable to ", x1) +#define strerr_diefu2sys(e, x1, x2) \ +strerr_die5sys(e, PROG, ": fatal: ", "unable to ", x1, x2) +#define strerr_diefu3sys(e, x1, x2, x3) \ +strerr_die6sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3) +#define strerr_diefu4sys(e, x1, x2, x3, x4) \ +strerr_die7sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4) +#define strerr_diefu5sys(e, x1, x2, x3, x4, x5) \ +strerr_die8sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5) +#define strerr_diefu6sys(e, x1, x2, x3, x4, x5, x6) \ +strerr_die9sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6) +#define strerr_diefu7sys(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die10sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_diefu8sys(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die11sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6, x7, x8) + +#define strerr_warnwu1x(x1) \ +strerr_warn4x(PROG, ": warning: ", "unable to ", (x1)) +#define strerr_warnwu2x(x1, x2) \ +strerr_warn5x(PROG, ": warning: ", "unable to ", (x1), x2) +#define strerr_warnwu3x(x1, x2, x3) \ +strerr_warn6x(PROG, ": warning: ", "unable to ", (x1), x2, x3) +#define strerr_warnwu4x(x1, x2, x3, x4) \ +strerr_warn7x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4) +#define strerr_warnwu5x(x1, x2, x3, x4, x5) \ +strerr_warn8x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5) +#define strerr_warnwu6x(x1, x2, x3, x4, x5, x6) \ +strerr_warn9x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, x6) +#define strerr_warnwu7x(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn10x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, x6, x7) + +#define strerr_warnwu1sys(x1) \ +strerr_warn4sys(PROG, ": warning: ", "unable to ", (x1)) +#define strerr_warnwu2sys(x1, x2) \ +strerr_warn5sys(PROG, ": warning: ", "unable to ", (x1), x2) +#define strerr_warnwu3sys(x1, x2, x3) \ +strerr_warn6sys(PROG, ": warning: ", "unable to ", (x1), x2, x3) +#define strerr_warnwu4sys(x1, x2, x3, x4) \ +strerr_warn7sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4) +#define strerr_warnwu5sys(x1, x2, x3, x4, x5) \ +strerr_warn8sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5) +#define strerr_warnwu6sys(x1, x2, x3, x4, x5, x6) \ +strerr_warn9sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, x6) +#define strerr_warnwu7sys(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn10sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, x6, x7) +#define strerr_warnwu8sys(x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_warn11sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, x6, x7, x8) + +#define strerr_diewu1x(e, x1) \ +strerr_die4x(e, PROG, ": warning: ", "unable to ", x1) +#define strerr_diewu2x(e, x1, x2) \ +strerr_die5x(e, PROG, ": warning: ", "unable to ", x1, x2) +#define strerr_diewu3x(e, x1, x2, x3) \ +strerr_die6x(e, PROG, ": warning: ", "unable to ", x1, x2, x3) +#define strerr_diewu4x(e, x1, x2, x3, x4) \ +strerr_die7x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4) +#define strerr_diewu5x(e, x1, x2, x3, x4, x5) \ +strerr_die8x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5) +#define strerr_diewu6x(e, x1, x2, x3, x4, x5, x6) \ +strerr_die9x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6) +#define strerr_diewu7x(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die10x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_diewu8x(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die11x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6, x7, x8) + +#define strerr_diewu1sys(e, x1) \ +strerr_die4sys(e, PROG, ": warning: ", "unable to ", (x1)) +#define strerr_diewu2sys(e, x1, x2) \ +strerr_die5sys(e, PROG, ": warning: ", "unable to ", x1, x2) +#define strerr_diewu3sys(e, x1, x2, x3) \ +strerr_die6sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3) +#define strerr_diewu4sys(e, x1, x2, x3, x4) \ +strerr_die7sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4) +#define strerr_diewu5sys(e, x1, x2, x3, x4, x5) \ +strerr_die8sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5) +#define strerr_diewu6sys(e, x1, x2, x3, x4, x5, x6) \ +strerr_die9sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6) +#define strerr_diewu7sys(e, x1, x2, x3, x4, x5, x6, x7) \ +strerr_die10sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6, x7) +#define strerr_diewu8sys(e, x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_die11sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6, x7, x8) + +#define strerr_dieusage(e, u) \ +strerr_die3x(e, PROG, ": usage: ", u) + +#define strerr_dienotset(e, x) \ +strerr_dief2x(e, (x), " not set") + +#define strerr_dieinvalid(e, x) \ +strerr_dief2x(e, "invalid $", x) + +#define strerr_dieexec(e, x) \ +strerr_diefu2sys(e, "exec ", x) + +#define strerr_warni1x(x1) \ +strerr_warn3x(PROG, ": info: ", (x1)) +#define strerr_warni2x(x1, x2) \ +strerr_warn4x(PROG, ": info: ", (x1), x2) +#define strerr_warni3x(x1, x2, x3) \ +strerr_warn5x(PROG, ": info: ", (x1), x2, x3) +#define strerr_warni4x(x1, x2, x3, x4) \ +strerr_warn6x(PROG, ": info: ", (x1), x2, x3, x4) +#define strerr_warni5x(x1, x2, x3, x4, x5) \ +strerr_warn7x(PROG, ": info: ", (x1), x2, x3, x4, x5) +#define strerr_warni6x(x1, x2, x3, x4, x5, x6) \ +strerr_warn8x(PROG, ": info: ", (x1), x2, x3, x4, x5, x6) +#define strerr_warni7x(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn9x(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7) +#define strerr_warni8x(x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_warn10x(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7, x8) +#define strerr_warni9x(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_warn11x(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_warni1sys(x1) \ +strerr_warn3sys(PROG, ": info: ", (x1)) +#define strerr_warni2sys(x1, x2) \ +strerr_warn4sys(PROG, ": info: ", (x1), x2) +#define strerr_warni3sys(x1, x2, x3) \ +strerr_warn5sys(PROG, ": info: ", (x1), x2, x3) +#define strerr_warni4sys(x1, x2, x3, x4) \ +strerr_warn6sys(PROG, ": info: ", (x1), x2, x3, x4) +#define strerr_warni5sys(x1, x2, x3, x4, x5) \ +strerr_warn7sys(PROG, ": info: ", (x1), x2, x3, x4, x5) +#define strerr_warni6sys(x1, x2, x3, x4, x5, x6) \ +strerr_warn8sys(PROG, ": info: ", (x1), x2, x3, x4, x5, x6) +#define strerr_warni7sys(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn9sys(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7) +#define strerr_warni8sys(x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_warn10sys(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7, x8) +#define strerr_warni9sys(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_warn11sys(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_warnt1x(x1) \ +strerr_warn3x(PROG, ": tracing: ", (x1)) +#define strerr_warnt2x(x1, x2) \ +strerr_warn4x(PROG, ": tracing: ", (x1), x2) +#define strerr_warnt3x(x1, x2, x3) \ +strerr_warn5x(PROG, ": tracing: ", (x1), x2, x3) +#define strerr_warnt4x(x1, x2, x3, x4) \ +strerr_warn6x(PROG, ": tracing: ", (x1), x2, x3, x4) +#define strerr_warnt5x(x1, x2, x3, x4, x5) \ +strerr_warn7x(PROG, ": tracing: ", (x1), x2, x3, x4, x5) +#define strerr_warnt6x(x1, x2, x3, x4, x5, x6) \ +strerr_warn8x(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6) +#define strerr_warnt7x(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn9x(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7) +#define strerr_warnt8x(x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_warn10x(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7, x8) +#define strerr_warnt9x(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_warn11x(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7, x8, x9) + +#define strerr_warnt1sys(x1) \ +strerr_warn3sys(PROG, ": tracing: ", (x1)) +#define strerr_warnt2sys(x1, x2) \ +strerr_warn4sys(PROG, ": tracing: ", (x1), x2) +#define strerr_warnt3sys(x1, x2, x3) \ +strerr_warn5sys(PROG, ": tracing: ", (x1), x2, x3) +#define strerr_warnt4sys(x1, x2, x3, x4) \ +strerr_warn6sys(PROG, ": tracing: ", (x1), x2, x3, x4) +#define strerr_warnt5sys(x1, x2, x3, x4, x5) \ +strerr_warn7sys(PROG, ": tracing: ", (x1), x2, x3, x4, x5) +#define strerr_warnt6sys(x1, x2, x3, x4, x5, x6) \ +strerr_warn8sys(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6) +#define strerr_warnt7sys(x1, x2, x3, x4, x5, x6, x7) \ +strerr_warn9sys(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7) +#define strerr_warnt8sys(x1, x2, x3, x4, x5, x6, x7, x8) \ +strerr_warn10sys(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7, x8) +#define strerr_warnt9sys(x1, x2, x3, x4, x5, x6, x7, x8, x9) \ +strerr_warn11sys(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7, x8, x9) #endif diff --git a/src/include/skalibs/strerr2.h b/src/include/skalibs/strerr2.h @@ -5,262 +5,6 @@ #include <skalibs/strerr.h> -extern char const *PROG ; - -#define strerr_warnw1x(x1) \ -strerr_warn3x(PROG, ": warning: ", (x1)) -#define strerr_warnw2x(x1, x2) \ -strerr_warn4x(PROG, ": warning: ", (x1), x2) -#define strerr_warnw3x(x1, x2, x3) \ -strerr_warn5x(PROG, ": warning: ", (x1), x2, x3) -#define strerr_warnw4x(x1, x2, x3, x4) \ -strerr_warn6x(PROG, ": warning: ", (x1), x2, x3, x4) -#define strerr_warnw5x(x1, x2, x3, x4, x5) \ -strerr_warn7x(PROG, ": warning: ", (x1), x2, x3, x4, x5) -#define strerr_warnw6x(x1, x2, x3, x4, x5, x6) \ -strerr_warn8x(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6) -#define strerr_warnw7x(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn9x(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7) -#define strerr_warnw8x(x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_warn10x(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, x7, x8) - -#define strerr_warnw1sys(x1) \ -strerr_warn4sys(PROG, ": warning: ", (x1), ": ") -#define strerr_warnw2sys(x1, x2) \ -strerr_warn5sys(PROG, ": warning: ", (x1), (x2), ": ") -#define strerr_warnw3sys(x1, x2, x3) \ -strerr_warn6sys(PROG, ": warning: ", (x1), x2, (x3), ": ") -#define strerr_warnw4sys(x1, x2, x3, x4) \ -strerr_warn7sys(PROG, ": warning: ", (x1), x2, x3, (x4), ": ") -#define strerr_warnw5sys(x1, x2, x3, x4, x5) \ -strerr_warn8sys(PROG, ": warning: ", (x1), x2, x3, x4, (x5), ": ") -#define strerr_warnw6sys(x1, x2, x3, x4, x5, x6) \ -strerr_warn9sys(PROG, ": warning: ", (x1), x2, x3, x4, x5, (x6), ": ") -#define strerr_warnw7sys(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn10sys(PROG, ": warning: ", (x1), x2, x3, x4, x5, x6, (x7), ": ") - -#define strerr_diew1x(e, x1) \ -strerr_die3x(e, PROG, ": warning: ", x1) -#define strerr_diew2x(e, x1, x2) \ -strerr_die4x(e, PROG, ": warning: ", x1, x2) -#define strerr_diew3x(e, x1, x2, x3) \ -strerr_die5x(e, PROG, ": warning: ", x1, x2, x3) -#define strerr_diew4x(e, x1, x2, x3, x4) \ -strerr_die6x(e, PROG, ": warning: ", x1, x2, x3, x4) -#define strerr_diew5x(e, x1, x2, x3, x4, x5) \ -strerr_die7x(e, PROG, ": warning: ", x1, x2, x3, x4, x5) -#define strerr_diew6x(e, x1, x2, x3, x4, x5, x6) \ -strerr_die8x(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6) -#define strerr_diew7x(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_die9x(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7) -#define strerr_diew8x(e, x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_die10x(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, x7, x8) - -#define strerr_diew1sys(e, x1) \ -strerr_die4sys(e, PROG, ": warning: ", (x1), ": ") -#define strerr_diew2sys(e, x1, x2) \ -strerr_die5sys(e, PROG, ": warning: ", x1, (x2), ": ") -#define strerr_diew3sys(e, x1, x2, x3) \ -strerr_die6sys(e, PROG, ": warning: ", x1, x2, (x3), ": ") -#define strerr_diew4sys(e, x1, x2, x3, x4) \ -strerr_die7sys(e, PROG, ": warning: ", x1, x2, x3, (x4), ": ") -#define strerr_diew5sys(e, x1, x2, x3, x4, x5) \ -strerr_die8sys(e, PROG, ": warning: ", x1, x2, x3, x4, (x5), ": ") -#define strerr_diew6sys(e, x1, x2, x3, x4, x5, x6) \ -strerr_die9sys(e, PROG, ": warning: ", x1, x2, x3, x4, x5, (x6), ": ") -#define strerr_diew7sys(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_die10sys(e, PROG, ": warning: ", x1, x2, x3, x4, x5, x6, (x7), ": ") - -#define strerr_dief1x(e, x1) \ -strerr_die3x(e, PROG, ": fatal: ", x1) -#define strerr_dief2x(e, x1, x2) \ -strerr_die4x(e, PROG, ": fatal: ", x1, x2) -#define strerr_dief3x(e, x1, x2, x3) \ -strerr_die5x(e, PROG, ": fatal: ", x1, x2, x3) -#define strerr_dief4x(e, x1, x2, x3, x4) \ -strerr_die6x(e, PROG, ": fatal: ", x1, x2, x3, x4) -#define strerr_dief5x(e, x1, x2, x3, x4, x5) \ -strerr_die7x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5) -#define strerr_dief6x(e, x1, x2, x3, x4, x5, x6) \ -strerr_die8x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6) -#define strerr_dief7x(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_die9x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, x7) -#define strerr_dief8x(e, x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_die10x(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, x7, x8) - -#define strerr_dief1sys(e, x1) \ -strerr_die4sys(e, PROG, ": fatal: ", (x1), ": ") -#define strerr_dief2sys(e, x1, x2) \ -strerr_die5sys(e, PROG, ": fatal: ", x1, (x2), ": ") -#define strerr_dief3sys(e, x1, x2, x3) \ -strerr_die6sys(e, PROG, ": fatal: ", x1, x2, (x3), ": ") -#define strerr_dief4sys(e, x1, x2, x3, x4) \ -strerr_die7sys(e, PROG, ": fatal: ", x1, x2, x3, (x4), ": ") -#define strerr_dief5sys(e, x1, x2, x3, x4, x5) \ -strerr_die8sys(e, PROG, ": fatal: ", x1, x2, x3, x4, (x5), ": ") -#define strerr_dief6sys(e, x1, x2, x3, x4, x5, x6) \ -strerr_die9sys(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, (x6), ": ") -#define strerr_dief7sys(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_die10sys(e, PROG, ": fatal: ", x1, x2, x3, x4, x5, x6, (x7), ": ") - -#define strerr_diefu1x(e, x1) \ -strerr_die4x(e, PROG, ": fatal: ", "unable to ", x1) -#define strerr_diefu2x(e, x1, x2) \ -strerr_die5x(e, PROG, ": fatal: ", "unable to ", x1, x2) -#define strerr_diefu3x(e, x1, x2, x3) \ -strerr_die6x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3) -#define strerr_diefu4x(e, x1, x2, x3, x4) \ -strerr_die7x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4) -#define strerr_diefu5x(e, x1, x2, x3, x4, x5) \ -strerr_die8x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5) -#define strerr_diefu6x(e, x1, x2, x3, x4, x5, x6) \ -strerr_die9x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6) -#define strerr_diefu7x(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_die10x(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, x6, x7) - -#define strerr_diefu1sys(e, x1) \ -strerr_die5sys(e, PROG, ": fatal: ", "unable to ", (x1), ": ") -#define strerr_diefu2sys(e, x1, x2) \ -strerr_die6sys(e, PROG, ": fatal: ", "unable to ", x1, (x2), ": ") -#define strerr_diefu3sys(e, x1, x2, x3) \ -strerr_die7sys(e, PROG, ": fatal: ", "unable to ", x1, x2, (x3), ": ") -#define strerr_diefu4sys(e, x1, x2, x3, x4) \ -strerr_die8sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, (x4), ": ") -#define strerr_diefu5sys(e, x1, x2, x3, x4, x5) \ -strerr_die9sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, (x5), ": ") -#define strerr_diefu6sys(e, x1, x2, x3, x4, x5, x6) \ -strerr_die10sys(e, PROG, ": fatal: ", "unable to ", x1, x2, x3, x4, x5, (x6), ": ") - -#define strerr_warnwu1x(x1) \ -strerr_warn4x(PROG, ": warning: ", "unable to ", (x1)) -#define strerr_warnwu2x(x1, x2) \ -strerr_warn5x(PROG, ": warning: ", "unable to ", (x1), x2) -#define strerr_warnwu3x(x1, x2, x3) \ -strerr_warn6x(PROG, ": warning: ", "unable to ", (x1), x2, x3) -#define strerr_warnwu4x(x1, x2, x3, x4) \ -strerr_warn7x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4) -#define strerr_warnwu5x(x1, x2, x3, x4, x5) \ -strerr_warn8x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5) -#define strerr_warnwu6x(x1, x2, x3, x4, x5, x6) \ -strerr_warn9x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, x6) -#define strerr_warnwu7x(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn10x(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, x6, x7) - -#define strerr_warnwu1sys(x1) \ -strerr_warn5sys(PROG, ": warning: ", "unable to ", (x1), ": ") -#define strerr_warnwu2sys(x1, x2) \ -strerr_warn6sys(PROG, ": warning: ", "unable to ", (x1), (x2), ": ") -#define strerr_warnwu3sys(x1, x2, x3) \ -strerr_warn7sys(PROG, ": warning: ", "unable to ", (x1), x2, (x3), ": ") -#define strerr_warnwu4sys(x1, x2, x3, x4) \ -strerr_warn8sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, (x4), ": ") -#define strerr_warnwu5sys(x1, x2, x3, x4, x5) \ -strerr_warn9sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, (x5), ": ") -#define strerr_warnwu6sys(x1, x2, x3, x4, x5, x6) \ -strerr_warn10sys(PROG, ": warning: ", "unable to ", (x1), x2, x3, x4, x5, (x6), ": ") - -#define strerr_diewu1x(e, x1) \ -strerr_die4x(e, PROG, ": warning: ", "unable to ", x1) -#define strerr_diewu2x(e, x1, x2) \ -strerr_die5x(e, PROG, ": warning: ", "unable to ", x1, x2) -#define strerr_diewu3x(e, x1, x2, x3) \ -strerr_die6x(e, PROG, ": warning: ", "unable to ", x1, x2, x3) -#define strerr_diewu4x(e, x1, x2, x3, x4) \ -strerr_die7x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4) -#define strerr_diewu5x(e, x1, x2, x3, x4, x5) \ -strerr_die8x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5) -#define strerr_diewu6x(e, x1, x2, x3, x4, x5, x6) \ -strerr_die9x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6) -#define strerr_diewu7x(e, x1, x2, x3, x4, x5, x6, x7) \ -strerr_die10x(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, x6, x7) - -#define strerr_diewu1sys(e, x1) \ -strerr_die5sys(e, PROG, ": warning: ", "unable to ", (x1), ": ") -#define strerr_diewu2sys(e, x1, x2) \ -strerr_die6sys(e, PROG, ": warning: ", "unable to ", x1, (x2), ": ") -#define strerr_diewu3sys(e, x1, x2, x3) \ -strerr_die7sys(e, PROG, ": warning: ", "unable to ", x1, x2, (x3), ": ") -#define strerr_diewu4sys(e, x1, x2, x3, x4) \ -strerr_die8sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, (x4), ": ") -#define strerr_diewu5sys(e, x1, x2, x3, x4, x5) \ -strerr_die9sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, (x5), ": ") -#define strerr_diewu6sys(e, x1, x2, x3, x4, x5, x6) \ -strerr_die10sys(e, PROG, ": warning: ", "unable to ", x1, x2, x3, x4, x5, (x6), ": ") - -#define strerr_dieusage(e, u) \ -strerr_die3x(e, PROG, ": usage: ", u) - -#define strerr_dienotset(e, x) \ -strerr_dief2x(e, (x), " not set") - -#define strerr_dieinvalid(e, x) \ -strerr_dief2x(e, "invalid $", x) - -#define strerr_dieexec(e, x) \ -strerr_diefu2sys(e, "exec ", x) - -#define strerr_warni1x(x1) \ -strerr_warn3x(PROG, ": info: ", (x1)) -#define strerr_warni2x(x1, x2) \ -strerr_warn4x(PROG, ": info: ", (x1), x2) -#define strerr_warni3x(x1, x2, x3) \ -strerr_warn5x(PROG, ": info: ", (x1), x2, x3) -#define strerr_warni4x(x1, x2, x3, x4) \ -strerr_warn6x(PROG, ": info: ", (x1), x2, x3, x4) -#define strerr_warni5x(x1, x2, x3, x4, x5) \ -strerr_warn7x(PROG, ": info: ", (x1), x2, x3, x4, x5) -#define strerr_warni6x(x1, x2, x3, x4, x5, x6) \ -strerr_warn8x(PROG, ": info: ", (x1), x2, x3, x4, x5, x6) -#define strerr_warni7x(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn9x(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7) -#define strerr_warni8x(x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_warn10x(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, x7, x8) - -#define strerr_warni1sys(x1) \ -strerr_warn4sys(PROG, ": info: ", (x1), ": ") -#define strerr_warni2sys(x1, x2) \ -strerr_warn5sys(PROG, ": info: ", (x1), (x2), ": ") -#define strerr_warni3sys(x1, x2, x3) \ -strerr_warn6sys(PROG, ": info: ", (x1), x2, (x3), ": ") -#define strerr_warni4sys(x1, x2, x3, x4) \ -strerr_warn7sys(PROG, ": info: ", (x1), x2, x3, (x4), ": ") -#define strerr_warni5sys(x1, x2, x3, x4, x5) \ -strerr_warn8sys(PROG, ": info: ", (x1), x2, x3, x4, (x5), ": ") -#define strerr_warni6sys(x1, x2, x3, x4, x5, x6) \ -strerr_warn9sys(PROG, ": info: ", (x1), x2, x3, x4, x5, (x6), ": ") -#define strerr_warni7sys(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn10sys(PROG, ": info: ", (x1), x2, x3, x4, x5, x6, (x7), ": ") - -#define strerr_warnt1x(x1) \ -strerr_warn3x(PROG, ": tracing: ", (x1)) -#define strerr_warnt2x(x1, x2) \ -strerr_warn4x(PROG, ": tracing: ", (x1), x2) -#define strerr_warnt3x(x1, x2, x3) \ -strerr_warn5x(PROG, ": tracing: ", (x1), x2, x3) -#define strerr_warnt4x(x1, x2, x3, x4) \ -strerr_warn6x(PROG, ": tracing: ", (x1), x2, x3, x4) -#define strerr_warnt5x(x1, x2, x3, x4, x5) \ -strerr_warn7x(PROG, ": tracing: ", (x1), x2, x3, x4, x5) -#define strerr_warnt6x(x1, x2, x3, x4, x5, x6) \ -strerr_warn8x(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6) -#define strerr_warnt7x(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn9x(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7) -#define strerr_warnt8x(x1, x2, x3, x4, x5, x6, x7, x8) \ -strerr_warn10x(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, x7, x8) - -#define strerr_warnt1sys(x1) \ -strerr_warn4sys(PROG, ": tracing: ", (x1), ": ") -#define strerr_warnt2sys(x1, x2) \ -strerr_warn5sys(PROG, ": tracing: ", (x1), (x2), ": ") -#define strerr_warnt3sys(x1, x2, x3) \ -strerr_warn6sys(PROG, ": tracing: ", (x1), x2, (x3), ": ") -#define strerr_warnt4sys(x1, x2, x3, x4) \ -strerr_warn7sys(PROG, ": tracing: ", (x1), x2, x3, (x4), ": ") -#define strerr_warnt5sys(x1, x2, x3, x4, x5) \ -strerr_warn8sys(PROG, ": tracing: ", (x1), x2, x3, x4, (x5), ": ") -#define strerr_warnt6sys(x1, x2, x3, x4, x5, x6) \ -strerr_warn9sys(PROG, ": tracing: ", (x1), x2, x3, x4, x5, (x6), ": ") -#define strerr_warnt7sys(x1, x2, x3, x4, x5, x6, x7) \ -strerr_warn10sys(PROG, ": tracing: ", (x1), x2, x3, x4, x5, x6, (x7), ": ") +#warning strerr2.h is now deprecated, use #include <skalibs/strerr.h> instead. #endif diff --git a/src/libenvexec/xexec_ae.c b/src/libenvexec/xexec_ae.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/exec.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> void xexec_ae (char const *file, char const *const *argv, char const *const *envp) { diff --git a/src/libenvexec/xexecvep.c b/src/libenvexec/xexecvep.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/posixplz.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> void xexecvep (char const *file, char const *const *argv, char const *const *envp, char const *path) diff --git a/src/libenvexec/xexecvep_loose.c b/src/libenvexec/xexecvep_loose.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/posixplz.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> void xexecvep_loose (char const *file, char const *const *argv, char const *const *envp, char const *path) diff --git a/src/libenvexec/xmexec0_af.c b/src/libenvexec/xmexec0_af.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/exec.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> void xmexec0_af (char const *file, char const *const *argv, char const *const *envp, size_t envlen) { diff --git a/src/libenvexec/xmexec0_afm.c b/src/libenvexec/xmexec0_afm.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/exec.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> void xmexec0_afm (char const *file, char const *const *argv, char const *const *envp, size_t envlen, char const *modif, size_t modiflen) { diff --git a/src/libenvexec/xmexec0_afn.c b/src/libenvexec/xmexec0_afn.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/exec.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> void xmexec0_afn (char const *file, char const *const *argv, char const *const *envp, size_t envlen, char const *modif, size_t modiflen, size_t modifn) { diff --git a/src/libenvexec/xmexec_af.c b/src/libenvexec/xmexec_af.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/exec.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> void xmexec_af (char const *file, char const *const *argv, char const *const *envp, size_t envlen) { diff --git a/src/libenvexec/xmexec_afm.c b/src/libenvexec/xmexec_afm.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/exec.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> void xmexec_afm (char const *file, char const *const *argv, char const *const *envp, size_t envlen, char const *modif, size_t modiflen) { diff --git a/src/libenvexec/xmexec_afn.c b/src/libenvexec/xmexec_afn.c @@ -3,7 +3,7 @@ #include <errno.h> #include <skalibs/exec.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> void xmexec_afn (char const *file, char const *const *argv, char const *const *envp, size_t envlen, char const *modif, size_t modiflen, size_t modifn) { diff --git a/src/librandom/random_devurandom.c b/src/librandom/random_devurandom.c @@ -4,7 +4,7 @@ #include <errno.h> #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/random.h> diff --git a/src/libstddjb/child_spawn.c b/src/libstddjb/child_spawn.c @@ -20,7 +20,7 @@ #else #include <skalibs/sig.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #endif diff --git a/src/libstddjb/child_spawn0.c b/src/libstddjb/child_spawn0.c @@ -47,7 +47,7 @@ pid_t child_spawn0 (char const *prog, char const *const *argv, char const *const #include <string.h> #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sig.h> #include <skalibs/djbunix.h> #include <skalibs/exec.h> diff --git a/src/libstddjb/child_spawn1_internal.c b/src/libstddjb/child_spawn1_internal.c @@ -71,7 +71,7 @@ pid_t child_spawn1_internal (char const *prog, char const *const *argv, char con #include <string.h> #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sig.h> #include <skalibs/djbunix.h> #include <skalibs/exec.h> diff --git a/src/libstddjb/child_spawn2.c b/src/libstddjb/child_spawn2.c @@ -21,7 +21,7 @@ #include <string.h> #include <skalibs/allreadwrite.h> #include <skalibs/sig.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #endif diff --git a/src/libstddjb/child_spawn3.c b/src/libstddjb/child_spawn3.c @@ -20,7 +20,7 @@ #include <string.h> #include <skalibs/sig.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #endif diff --git a/src/libstddjb/hiercopy_tmp.c b/src/libstddjb/hiercopy_tmp.c @@ -5,7 +5,7 @@ #include <sys/stat.h> #include <errno.h> #include <fcntl.h> -#include <skalibs/strerr2.h> + #include <skalibs/stralloc.h> #include <skalibs/direntry.h> #include <skalibs/djbunix.h> diff --git a/src/libstddjb/prog.c b/src/libstddjb/prog.c @@ -2,6 +2,6 @@ /* MT-unsafe */ -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> char const *PROG = "(none)" ; diff --git a/src/libstddjb/strerr.c b/src/libstddjb/strerr.c @@ -1,35 +0,0 @@ -/* ISC license. */ - -/* MT-unsafe */ - -#include <unistd.h> -#include <errno.h> -#include <skalibs/buffer.h> -#include <skalibs/strerr.h> - -void strerr_warn (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10, char const *se) -{ - int e = errno ; - if (x1) buffer_puts(buffer_2, x1) ; - if (x2) buffer_puts(buffer_2, x2) ; - if (x3) buffer_puts(buffer_2, x3) ; - if (x4) buffer_puts(buffer_2, x4) ; - if (x5) buffer_puts(buffer_2, x5) ; - if (x6) buffer_puts(buffer_2, x6) ; - if (x7) buffer_puts(buffer_2, x7) ; - if (x8) buffer_puts(buffer_2, x8) ; - if (x9) buffer_puts(buffer_2, x9) ; - if (x10) buffer_puts(buffer_2, x10) ; - if (se) buffer_puts(buffer_2, se) ; - buffer_putflush(buffer_2, "\n", 1) ; - errno = e ; -} - -void strerr_die (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10, char const *se) -{ - strerr_warn(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, se) ; - _exit(e) ; - - /* No, OpenBSD, this noreturn function does NOT return. - Please learn what _exit() does. */ -} diff --git a/src/libstddjb/strerr_sys.c b/src/libstddjb/strerr_sys.c @@ -1,22 +0,0 @@ -/* ISC license. */ - -/* MT-unsafe */ - -#include <unistd.h> -#include <string.h> -#include <errno.h> -#include <skalibs/strerr.h> - -void strerr_warnsys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10) -{ - strerr_warn(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, strerror(errno)) ; -} - -void strerr_diesys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10) -{ - strerr_warnsys(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) ; - _exit(e) ; - - /* No, OpenBSD, this noreturn function does NOT return. - Please learn what _exit() does. */ -} diff --git a/src/libstrerr/strerr_die10sys.c b/src/libstrerr/strerr_die10sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die10sys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10) +{ + char const *v[10] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10 } ; + strerr_dievsys(e, v, 10) ; +} diff --git a/src/libstrerr/strerr_die10x.c b/src/libstrerr/strerr_die10x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die10x (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10) +{ + char const *v[10] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10 } ; + strerr_diev(e, v, 10) ; +} diff --git a/src/libstrerr/strerr_die11sys.c b/src/libstrerr/strerr_die11sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die11sys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10, char const *x11) +{ + char const *v[11] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11 } ; + strerr_dievsys(e, v, 11) ; +} diff --git a/src/libstrerr/strerr_die11x.c b/src/libstrerr/strerr_die11x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die11x (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10, char const *x11) +{ + char const *v[11] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11 } ; + strerr_diev(e, v, 11) ; +} diff --git a/src/libstrerr/strerr_die1sys.c b/src/libstrerr/strerr_die1sys.c @@ -0,0 +1,10 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die1sys (int e, char const *x1) +{ + strerr_dievsys(e, &x1, 1) ; +} diff --git a/src/libstrerr/strerr_die1x.c b/src/libstrerr/strerr_die1x.c @@ -0,0 +1,10 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die1x (int e, char const *x1) +{ + strerr_diev(e, &x1, 1) ; +} diff --git a/src/libstrerr/strerr_die2sys.c b/src/libstrerr/strerr_die2sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die2sys (int e, char const *x1, char const *x2) +{ + char const *v[2] = { x1, x2 } ; + strerr_dievsys(e, v, 2) ; +} diff --git a/src/libstrerr/strerr_die2x.c b/src/libstrerr/strerr_die2x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die2x (int e, char const *x1, char const *x2) +{ + char const *v[2] = { x1, x2 } ; + strerr_diev(e, v, 2) ; +} diff --git a/src/libstrerr/strerr_die3sys.c b/src/libstrerr/strerr_die3sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die3sys (int e, char const *x1, char const *x2, char const *x3) +{ + char const *v[3] = { x1, x2, x3 } ; + strerr_dievsys(e, v, 3) ; +} diff --git a/src/libstrerr/strerr_die3x.c b/src/libstrerr/strerr_die3x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die3x (int e, char const *x1, char const *x2, char const *x3) +{ + char const *v[3] = { x1, x2, x3 } ; + strerr_diev(e, v, 3) ; +} diff --git a/src/libstrerr/strerr_die4sys.c b/src/libstrerr/strerr_die4sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die4sys (int e, char const *x1, char const *x2, char const *x3, char const *x4) +{ + char const *v[4] = { x1, x2, x3, x4 } ; + strerr_dievsys(e, v, 4) ; +} diff --git a/src/libstrerr/strerr_die4x.c b/src/libstrerr/strerr_die4x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die4x (int e, char const *x1, char const *x2, char const *x3, char const *x4) +{ + char const *v[4] = { x1, x2, x3, x4 } ; + strerr_diev(e, v, 4) ; +} diff --git a/src/libstrerr/strerr_die5sys.c b/src/libstrerr/strerr_die5sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die5sys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5) +{ + char const *v[5] = { x1, x2, x3, x4, x5 } ; + strerr_dievsys(e, v, 5) ; +} diff --git a/src/libstrerr/strerr_die5x.c b/src/libstrerr/strerr_die5x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die5x (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5) +{ + char const *v[5] = { x1, x2, x3, x4, x5 } ; + strerr_diev(e, v, 5) ; +} diff --git a/src/libstrerr/strerr_die6sys.c b/src/libstrerr/strerr_die6sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die6sys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6) +{ + char const *v[6] = { x1, x2, x3, x4, x5, x6 } ; + strerr_dievsys(e, v, 6) ; +} diff --git a/src/libstrerr/strerr_die6x.c b/src/libstrerr/strerr_die6x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die6x (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6) +{ + char const *v[6] = { x1, x2, x3, x4, x5, x6 } ; + strerr_diev(e, v, 6) ; +} diff --git a/src/libstrerr/strerr_die7sys.c b/src/libstrerr/strerr_die7sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die7sys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7) +{ + char const *v[7] = { x1, x2, x3, x4, x5, x6, x7 } ; + strerr_dievsys(e, v, 7) ; +} diff --git a/src/libstrerr/strerr_die7x.c b/src/libstrerr/strerr_die7x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die7x (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7) +{ + char const *v[7] = { x1, x2, x3, x4, x5, x6, x7 } ; + strerr_diev(e, v, 7) ; +} diff --git a/src/libstrerr/strerr_die8sys.c b/src/libstrerr/strerr_die8sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die8sys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8) +{ + char const *v[8] = { x1, x2, x3, x4, x5, x6, x7, x8 } ; + strerr_dievsys(e, v, 8) ; +} diff --git a/src/libstrerr/strerr_die8x.c b/src/libstrerr/strerr_die8x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die8x (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8) +{ + char const *v[8] = { x1, x2, x3, x4, x5, x6, x7, x8 } ; + strerr_diev(e, v, 8) ; +} diff --git a/src/libstrerr/strerr_die9sys.c b/src/libstrerr/strerr_die9sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die9sys (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9) +{ + char const *v[9] = { x1, x2, x3, x4, x5, x6, x7, x8, x9 } ; + strerr_dievsys(e, v, 9) ; +} diff --git a/src/libstrerr/strerr_die9x.c b/src/libstrerr/strerr_die9x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_die9x (int e, char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9) +{ + char const *v[9] = { x1, x2, x3, x4, x5, x6, x7, x8, x9 } ; + strerr_diev(e, v, 9) ; +} diff --git a/src/libstrerr/strerr_diel.c b/src/libstrerr/strerr_diel.c @@ -0,0 +1,24 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <stdarg.h> +#include <unistd.h> + +#include <skalibs/strerr.h> + +void strerr_diel (int e, unsigned int n, ...) +{ + if (n) + { + va_list ap ; + char const *v[n] ; + va_start(ap, n) ; + va_arg(ap, unsigned int) ; + for (unsigned int i = 0 ; i < n ; i++) + v[i++] = va_arg(ap, char const *) ; + va_end(ap) ; + strerr_warnv(v, n) ; + } + _exit(e) ; +} diff --git a/src/libstrerr/strerr_dielsys.c b/src/libstrerr/strerr_dielsys.c @@ -0,0 +1,23 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <stdarg.h> +#include <string.h> +#include <unistd.h> +#include <errno.h> + +#include <skalibs/strerr.h> + +void strerr_dielsys (int e, unsigned int n, ...) +{ + va_list ap ; + char const *v[n+1] ; + va_start(ap, n) ; + va_arg(ap, unsigned int) ; + for (unsigned int i = 0 ; i < n ; i++) + v[i++] = va_arg(ap, char const *) ; + va_end(ap) ; + v[n] = strerror(errno) ; + strerr_diev(e, v, n+1) ; +} diff --git a/src/libstrerr/strerr_diev.c b/src/libstrerr/strerr_diev.c @@ -0,0 +1,13 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <unistd.h> + +#include <skalibs/strerr.h> + +void strerr_diev (int e, char const *const *v, unsigned int n) +{ + strerr_warnv(v, n) ; + _exit(e) ; +} diff --git a/src/libstrerr/strerr_dievsys.c b/src/libstrerr/strerr_dievsys.c @@ -0,0 +1,13 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <unistd.h> + +#include <skalibs/strerr.h> + +void strerr_dievsys (int e, char const *const *v, unsigned int n) +{ + strerr_warnvsys(v, n) ; + _exit(e) ; +} diff --git a/src/libstrerr/strerr_warn10sys.c b/src/libstrerr/strerr_warn10sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn10sys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10) +{ + char const *v[10] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10 } ; + strerr_warnvsys(v, 10) ; +} diff --git a/src/libstrerr/strerr_warn10x.c b/src/libstrerr/strerr_warn10x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn10x (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10) +{ + char const *v[10] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10 } ; + strerr_warnv(v, 10) ; +} diff --git a/src/libstrerr/strerr_warn11sys.c b/src/libstrerr/strerr_warn11sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn11sys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10, char const *x11) +{ + char const *v[11] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11 } ; + strerr_warnvsys(v, 11) ; +} diff --git a/src/libstrerr/strerr_warn11x.c b/src/libstrerr/strerr_warn11x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn11x (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9, char const *x10, char const *x11) +{ + char const *v[11] = { x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11 } ; + strerr_warnv(v, 11) ; +} diff --git a/src/libstrerr/strerr_warn1sys.c b/src/libstrerr/strerr_warn1sys.c @@ -0,0 +1,10 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn1sys (char const *x1) +{ + strerr_warnvsys(&x1, 1) ; +} diff --git a/src/libstrerr/strerr_warn1x.c b/src/libstrerr/strerr_warn1x.c @@ -0,0 +1,10 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn1x (char const *x1) +{ + strerr_warnv(&x1, 1) ; +} diff --git a/src/libstrerr/strerr_warn2sys.c b/src/libstrerr/strerr_warn2sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn2sys (char const *x1, char const *x2) +{ + char const *v[2] = { x1, x2 } ; + strerr_warnvsys(v, 2) ; +} diff --git a/src/libstrerr/strerr_warn2x.c b/src/libstrerr/strerr_warn2x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn2x (char const *x1, char const *x2) +{ + char const *v[2] = { x1, x2 } ; + strerr_warnv(v, 2) ; +} diff --git a/src/libstrerr/strerr_warn3sys.c b/src/libstrerr/strerr_warn3sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn3sys (char const *x1, char const *x2, char const *x3) +{ + char const *v[3] = { x1, x2, x3 } ; + strerr_warnvsys(v, 3) ; +} diff --git a/src/libstrerr/strerr_warn3x.c b/src/libstrerr/strerr_warn3x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn3x (char const *x1, char const *x2, char const *x3) +{ + char const *v[3] = { x1, x2, x3 } ; + strerr_warnv(v, 3) ; +} diff --git a/src/libstrerr/strerr_warn4sys.c b/src/libstrerr/strerr_warn4sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn4sys (char const *x1, char const *x2, char const *x3, char const *x4) +{ + char const *v[4] = { x1, x2, x3, x4 } ; + strerr_warnvsys(v, 4) ; +} diff --git a/src/libstrerr/strerr_warn4x.c b/src/libstrerr/strerr_warn4x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn4x (char const *x1, char const *x2, char const *x3, char const *x4) +{ + char const *v[4] = { x1, x2, x3, x4 } ; + strerr_warnv(v, 4) ; +} diff --git a/src/libstrerr/strerr_warn5sys.c b/src/libstrerr/strerr_warn5sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn5sys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5) +{ + char const *v[5] = { x1, x2, x3, x4, x5 } ; + strerr_warnvsys(v, 5) ; +} diff --git a/src/libstrerr/strerr_warn5x.c b/src/libstrerr/strerr_warn5x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn5x (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5) +{ + char const *v[5] = { x1, x2, x3, x4, x5 } ; + strerr_warnv(v, 5) ; +} diff --git a/src/libstrerr/strerr_warn6sys.c b/src/libstrerr/strerr_warn6sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn6sys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6) +{ + char const *v[6] = { x1, x2, x3, x4, x5, x6 } ; + strerr_warnvsys(v, 6) ; +} diff --git a/src/libstrerr/strerr_warn6x.c b/src/libstrerr/strerr_warn6x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn6x (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6) +{ + char const *v[6] = { x1, x2, x3, x4, x5, x6 } ; + strerr_warnv(v, 6) ; +} diff --git a/src/libstrerr/strerr_warn7sys.c b/src/libstrerr/strerr_warn7sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn7sys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7) +{ + char const *v[7] = { x1, x2, x3, x4, x5, x6, x7 } ; + strerr_warnvsys(v, 7) ; +} diff --git a/src/libstrerr/strerr_warn7x.c b/src/libstrerr/strerr_warn7x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warnv2 (char const *x1, char const *x2) +{ + char const *v[2] = { x1, x2 } ; + strerr_warnv(v, 2) ; +} diff --git a/src/libstrerr/strerr_warn8sys.c b/src/libstrerr/strerr_warn8sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn8sys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8) +{ + char const *v[8] = { x1, x2, x3, x4, x5, x6, x7, x8 } ; + strerr_warnvsys(v, 8) ; +} diff --git a/src/libstrerr/strerr_warn8x.c b/src/libstrerr/strerr_warn8x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn8x (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8) +{ + char const *v[8] = { x1, x2, x3, x4, x5, x6, x7, x8 } ; + strerr_warnv(v, 8) ; +} diff --git a/src/libstrerr/strerr_warn9sys.c b/src/libstrerr/strerr_warn9sys.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn9sys (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9) +{ + char const *v[9] = { x1, x2, x3, x4, x5, x6, x7, x8, x9 } ; + strerr_warnvsys(v, 9) ; +} diff --git a/src/libstrerr/strerr_warn9x.c b/src/libstrerr/strerr_warn9x.c @@ -0,0 +1,11 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <skalibs/strerr.h> + +void strerr_warn9x (char const *x1, char const *x2, char const *x3, char const *x4, char const *x5, char const *x6, char const *x7, char const *x8, char const *x9) +{ + char const *v[9] = { x1, x2, x3, x4, x5, x6, x7, x8, x9 } ; + strerr_warnv(v, 9) ; +} diff --git a/src/libstrerr/strerr_warnl.c b/src/libstrerr/strerr_warnl.c @@ -0,0 +1,22 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <stdarg.h> + +#include <skalibs/strerr.h> + +void strerr_warnl (unsigned int n, ...) +{ + if (n) + { + va_list ap ; + char const *v[n] ; + va_start(ap, n) ; + va_arg(ap, unsigned int) ; + for (unsigned int i = 0 ; i < n ; i++) + v[i++] = va_arg(ap, char const *) ; + va_end(ap) ; + strerr_warnv(v, n) ; + } +} diff --git a/src/libstrerr/strerr_warnlsys.c b/src/libstrerr/strerr_warnlsys.c @@ -0,0 +1,22 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <stdarg.h> +#include <string.h> +#include <errno.h> + +#include <skalibs/strerr.h> + +void strerr_warnlsys (unsigned int n, ...) +{ + va_list ap ; + char const *v[n+1] ; + va_start(ap, n) ; + va_arg(ap, unsigned int) ; + for (unsigned int i = 0 ; i < n ; i++) + v[i++] = va_arg(ap, char const *) ; + va_end(ap) ; + v[n] = strerror(errno) ; + strerr_warnv(v, n+1) ; +} diff --git a/src/libstrerr/strerr_warnv.c b/src/libstrerr/strerr_warnv.c @@ -0,0 +1,17 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <errno.h> + +#include <skalibs/buffer.h> +#include <skalibs/strerr.h> + +void strerr_warnv (char const *const *v, unsigned int n) +{ + int e = errno ; + for (unsigned int i = 0 ; i < n ; i++) + if (v[i]) buffer_puts(buffer_2, v[i]) ; + buffer_putflush(buffer_2, "\n", 1) ; + errno = e ; +} diff --git a/src/libstrerr/strerr_warnvsys.c b/src/libstrerr/strerr_warnvsys.c @@ -0,0 +1,20 @@ +/* ISC license. */ + +/* MT-unsafe */ + +#include <string.h> +#include <errno.h> + +#include <skalibs/buffer.h> +#include <skalibs/strerr.h> + +void strerr_warnvsys (char const *const *v, unsigned int n) +{ + int e = errno ; + for (unsigned int i = 0 ; i < n ; i++) + if (v[i]) buffer_puts(buffer_2, v[i]) ; + buffer_put(buffer_2, ": ", 2) ; + buffer_puts(buffer_2, strerror(e)) ; + buffer_putflush(buffer_2, "\n", 1) ; + errno = e ; +}