From 8e7e029114c59341ec793dc9e96ee410a5f37e2b Mon Sep 17 00:00:00 2001 From: Jannis Hoffmann Date: Sat, 28 Sep 2024 21:20:40 +0200 Subject: update to version 25 --- include/byte.h | 5 ++--- include/constmap.h | 8 ++++---- include/exit.h | 4 ++-- include/fifo.h | 4 ++-- include/fmt.h | 6 +++--- include/getoptb.h | 4 ++++ include/lock.h | 4 ++-- include/ndelay.h | 6 +++--- include/open.h | 4 ++-- include/sig.h | 8 ++++---- include/socket_if.h | 2 +- include/uint_t.h | 12 ++++++------ include/wait.h | 2 +- 13 files changed, 36 insertions(+), 33 deletions(-) (limited to 'include') diff --git a/include/byte.h b/include/byte.h index 836e8ca..96bbefc 100644 --- a/include/byte.h +++ b/include/byte.h @@ -3,9 +3,8 @@ /** @file byte.h - @author djb, feh - @source s/qmail - @comment no declaration of argument types; too many compiler errors + @authors djb, feh, jmh + @ref s/qmail */ extern unsigned int byte_chr(char *, unsigned int, int); diff --git a/include/constmap.h b/include/constmap.h index 4d5e2d3..723cb6f 100644 --- a/include/constmap.h +++ b/include/constmap.h @@ -13,9 +13,9 @@ struct constmap { int *inputlen; }; -extern int constmap_init(struct constmap *, char *, int, int); -extern int constmap_init_char(struct constmap *, char *, int, int, char); -extern void constmap_free(struct constmap *); -extern char *constmap(struct constmap *cm, char *s, int len); +int constmap_init(struct constmap *, char *, int, int); +int constmap_init_char(struct constmap *, char *, int, int, char); +void constmap_free(struct constmap *); +char *constmap(struct constmap *, char *, int); #endif diff --git a/include/exit.h b/include/exit.h index 8e54239..2e1c482 100644 --- a/include/exit.h +++ b/include/exit.h @@ -3,8 +3,8 @@ /** @file exit.h - @author djb, feh - @source qmail + @author djb + @ref qmail @brief convenience header */ diff --git a/include/fifo.h b/include/fifo.h index ad3d15e..c29fc39 100644 --- a/include/fifo.h +++ b/include/fifo.h @@ -3,8 +3,8 @@ /** @file fifo.h - @author djb, feh - @source s/qmail + @author djb + @ref s/qmail */ int fifo_make(char *, int); diff --git a/include/fmt.h b/include/fmt.h index 41acaa1..790a56a 100644 --- a/include/fmt.h +++ b/include/fmt.h @@ -3,8 +3,8 @@ /** @file fmt.h - @author djb, kp, feh - @source qmail + @authors djb, kp, feh + @ref qmail @brief conversion function declarations */ @@ -12,7 +12,7 @@ #define FMT_LEN ((char *)0) /* convenient abbreviation */ extern unsigned int fmt_str(char *, const char *); -extern unsigned int fmt_strn(char *, char *, unsigned int); +extern unsigned int fmt_strn(char *, const char *, unsigned int); extern unsigned int fmt_uint(char *, unsigned int); extern unsigned int fmt_uint0(char *, unsigned int, unsigned int); extern unsigned int fmt_ulong(char *, unsigned long); diff --git a/include/getoptb.h b/include/getoptb.h index 426567d..ad27f17 100644 --- a/include/getoptb.h +++ b/include/getoptb.h @@ -2,6 +2,8 @@ #define BGETOPT_H /* + * Revision 20240731, Erwin Hoffmann + * - added getoptb() prototype * Revision 20160714, Kai Peter * - consolidated 'sgetopt.h' and 'subgetopt.h' into '(b)getopt.h' */ @@ -15,6 +17,8 @@ #define SUBGETOPTDONE -1 +extern int getoptb(int, char **, char *); + extern int subgetopt(int, char **, char *); extern char *subgetoptarg; extern int subgetoptind; diff --git a/include/lock.h b/include/lock.h index 6abecb7..14f5ff8 100644 --- a/include/lock.h +++ b/include/lock.h @@ -3,8 +3,8 @@ /** @file lock.h - @author djb, feh - @source s/qmail + @author djb + @ref s/qmail */ int lock_ex(int); diff --git a/include/ndelay.h b/include/ndelay.h index 6791c5b..85388a3 100644 --- a/include/ndelay.h +++ b/include/ndelay.h @@ -2,9 +2,9 @@ #define NDELAY_H /** - @brief ndelay.h - @author djb, feh - @source s/qmail + @file ndelay.h + @author djb + @ref s/qmail */ int ndelay_on(int); diff --git a/include/open.h b/include/open.h index c2f272b..5b471a2 100644 --- a/include/open.h +++ b/include/open.h @@ -3,8 +3,8 @@ /** @file open.h - @author djb, feh - @source s/qmail + @authors djb, feh + @ref s/qmail */ int open_read(const char *); diff --git a/include/sig.h b/include/sig.h index 2c44e9a..9f0c04a 100644 --- a/include/sig.h +++ b/include/sig.h @@ -2,11 +2,11 @@ #define SIG_H /* - * Revision 20160714, Kai Peter - * - updated some declarations no new(er) one's from ucspi-tcp-0.88 - * Revision 20240714, JMH + * Revision 20240720, Erwin Hoffmann, jmh * - added best effort parameter types - */ + * Revision 20160714, Kai Peter + * - updated some declarations no new(er) one's from ucspi-tcp-0.88 +*/ // new(er) declarations from ucspi-tcp-0.88: extern int sig_alarm; diff --git a/include/socket_if.h b/include/socket_if.h index 82d091e..3681d29 100644 --- a/include/socket_if.h +++ b/include/socket_if.h @@ -28,7 +28,7 @@ extern int socket_bind4(int, const char[4], uint16); extern int socket_bind4_reuse(int, const char[4], uint16); extern int socket_connect4(int, const char[4], uint16); extern int socket_send4(int, const char *, unsigned int, const char[4], uint16); -extern int socket_broadcast4(int, const char *, unsigned int, uint16); +extern int socket_broadcast(int, const char *, unsigned int, uint16); /* Backward compatibility */ #define socket_local4 socket_local diff --git a/include/uint_t.h b/include/uint_t.h index 529e7b5..5471813 100644 --- a/include/uint_t.h +++ b/include/uint_t.h @@ -2,8 +2,8 @@ /** @file uint_t.h - @author djb, kp, feh - @source qmail, djbdns6 + @authors djb, kp, feh + @ref qmail, djbdns6 @brief additional types and pack routines @brief define basic integer types and size through */ @@ -28,10 +28,10 @@ extern void uint8_unpack_big(char *, uint8 *); typedef uint16_t uint16; -extern void uint16_pack(char *, uint16); -extern void uint16_pack_big(char *, uint16); -extern void uint16_unpack(char *, uint16 *); -extern void uint16_unpack_big(char *, uint16 *); +extern void uint16_pack(char[16], uint16); +extern void uint16_pack_big(char[16], uint16); +extern void uint16_unpack(char[16], uint16 *); +extern void uint16_unpack_big(char[16], uint16 *); #endif #ifndef UINT32_H diff --git a/include/wait.h b/include/wait.h index dd059d9..7de9276 100644 --- a/include/wait.h +++ b/include/wait.h @@ -4,7 +4,7 @@ /** @file wait.h @author djb - @source s/qmail + @ref s/qmail */ int wait_pid(int *, int); -- cgit v1.2.3