Skip to content

Commit c12cb4a

Browse files
committed
src/: sync daemontools library fork with runit source
1 parent 338bee1 commit c12cb4a

File tree

15 files changed

+19
-40
lines changed

15 files changed

+19
-40
lines changed

package/CHANGES

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* alloc.c, alloc_re.c, buffer_0.c, byte_chr.c, byte_copy.c, byte_cr.c,
2+
byte_diff.c, byte_rchr.c, byte_zero.c, error.h, select.h2, wait.h,
3+
wait_nohang.c, wait_pid.c: sync daemontools library fork with runit
4+
source.
15
* doc/*.html: !DOCTYPE.
26
* socklog.c, tryto.c, uncat.c: use parameter name "unused" in sighandler
37
functions.

src/alloc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ static aligned realspace[SPACE / ALIGNMENT];
1212
#define space ((char *) realspace)
1313
static unsigned int avail = SPACE; /* multiple of ALIGNMENT; 0<=avail<=SPACE */
1414

15-
/*@null@*//*@out@*/char *alloc(n)
16-
unsigned int n;
15+
/*@null@*//*@out@*/char *alloc(unsigned int n)
1716
{
1817
char *x;
1918
n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */
@@ -23,8 +22,7 @@ unsigned int n;
2322
return x;
2423
}
2524

26-
void alloc_free(x)
27-
char *x;
25+
void alloc_free(char *x)
2826
{
2927
if (x >= space)
3028
if (x < space + SPACE)

src/alloc_re.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
#include "alloc.h"
44
#include "byte.h"
55

6-
int alloc_re(x,m,n)
7-
char **x;
8-
unsigned int m;
9-
unsigned int n;
6+
int alloc_re(char **x,unsigned int m,unsigned int n)
107
{
118
char *y;
129

src/buffer_0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "buffer.h"
44

5-
int buffer_0_read(fd,buf,len) int fd; char *buf; int len;
5+
int buffer_0_read(int fd, char *buf, unsigned int len)
66
{
77
if (buffer_flush(buffer_1) == -1) return -1;
88
return buffer_unixread(fd,buf,len);

src/byte_chr.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
#include "byte.h"
44

5-
unsigned int byte_chr(s,n,c)
6-
char *s;
7-
register unsigned int n;
8-
int c;
5+
unsigned int byte_chr(char *s, register unsigned int n, int c)
96
{
107
register char ch;
118
register char *t;

src/byte_copy.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
#include "byte.h"
44

5-
void byte_copy(to,n,from)
6-
register char *to;
7-
register unsigned int n;
8-
register char *from;
5+
void byte_copy(register char *to,register unsigned int n,register char *from)
96
{
107
for (;;) {
118
if (!n) return; *to++ = *from++; --n;

src/byte_cr.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
#include "byte.h"
44

5-
void byte_copyr(to,n,from)
6-
register char *to;
7-
register unsigned int n;
8-
register char *from;
5+
void byte_copyr(register char *to,register unsigned int n,register char *from)
96
{
107
to += n;
118
from += n;

src/byte_diff.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
#include "byte.h"
44

5-
int byte_diff(s,n,t)
6-
register char *s;
7-
register unsigned int n;
8-
register char *t;
5+
int byte_diff(register char *s,register unsigned int n,register char *t)
96
{
107
for (;;) {
118
if (!n) return 0; if (*s != *t) break; ++s; ++t; --n;

src/byte_rchr.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
#include "byte.h"
44

5-
unsigned int byte_rchr(s,n,c)
6-
char *s;
7-
register unsigned int n;
8-
int c;
5+
unsigned int byte_rchr(char *s,register unsigned int n,int c)
96
{
107
register char ch;
118
register char *t;

src/byte_zero.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "byte.h"
22

3-
void byte_zero(s,n)
4-
char *s;
5-
register unsigned int n;
3+
void byte_zero(char *s,register unsigned int n)
64
{
75
for (;;) {
86
if (!n) break; *s++ = 0; --n;

0 commit comments

Comments
 (0)