From 3e992e7fbf16c7f4249223bb807e13b56f078022 Mon Sep 17 00:00:00 2001 From: Manuel Mausz Date: Thu, 25 Jun 2026 14:19:33 +0200 Subject: add signatures for substdi/substdo --- substdo.c | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) (limited to 'substdo.c') diff --git a/substdo.c b/substdo.c index fb616f7..5eb6d5d 100644 --- a/substdo.c +++ b/substdo.c @@ -3,13 +3,9 @@ #include "byte.h" #include "error.h" -static int allwrite(op,fd,buf,len) -register int (*op)(); -register int fd; -register char *buf; -register int len; +static int allwrite(ssize_t (*op)(int, const void*, size_t), int fd, char *buf, int len) { - register int w; + int w; while (len) { w = op(fd,buf,len); @@ -17,17 +13,16 @@ register int len; if (errno == error_intr) continue; return -1; /* note that some data may have been written */ } - if (w == 0) ; /* luser's fault */ + /* if (w == 0) ; luser's fault */ buf += w; len -= w; } return 0; } -int substdio_flush(s) -register substdio *s; +int substdio_flush(substdio *s) { - register int p; + int p; p = s->p; if (!p) return 0; @@ -35,12 +30,9 @@ register substdio *s; return allwrite(s->op,s->fd,s->x,p); } -int substdio_bput(s,buf,len) -register substdio *s; -register char *buf; -register int len; +int substdio_bput(substdio *s, char *buf, int len) { - register int n; + int n; while (len > (n = s->n - s->p)) { byte_copy(s->x + s->p,n,buf); s->p += n; buf += n; len -= n; @@ -52,12 +44,9 @@ register int len; return 0; } -int substdio_put(s,buf,len) -register substdio *s; -register char *buf; -register int len; +int substdio_put(substdio *s, char *buf, int len) { - register int n; + int n; n = s->n; if (len > n - s->p) { @@ -77,32 +66,23 @@ register int len; return 0; } -int substdio_putflush(s,buf,len) -register substdio *s; -register char *buf; -register int len; +int substdio_putflush(substdio* s, char *buf, int len) { if (substdio_flush(s) == -1) return -1; return allwrite(s->op,s->fd,buf,len); } -int substdio_bputs(s,buf) -register substdio *s; -register char *buf; +int substdio_bputs(substdio *s, char *buf) { return substdio_bput(s,buf,str_len(buf)); } -int substdio_puts(s,buf) -register substdio *s; -register char *buf; +int substdio_puts(substdio *s, char *buf) { return substdio_put(s,buf,str_len(buf)); } -int substdio_putsflush(s,buf) -register substdio *s; -register char *buf; +int substdio_putsflush(substdio *s, char *buf) { return substdio_putflush(s,buf,str_len(buf)); } -- cgit v1.2.3