trinity/bonsix
1
0
Fork 0
forked from bonsai/harakit
Code Pull Requests Activity

dj(1): remove Io_bufxfer

Browse Source
This commit is contained in:
dtb 2024-07-03 19:04:01 -06:00
parent 3e1735f778
commit b74160fa4e
Signed by: trinity
GPG Key ID: 34C0543BBB6AF81B
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/dj.c
View File

@ -75,21 +75,6 @@ Io_bufrpad(struct Io *io, int padding){
return io; return io;
} }
/* Copies from the buffer in src to the buffer in dest no more than n units,
* removing the copied units from src and permuting the remaining units in the
* src buffer to the start of the buffer, modifying both the src and dest
* bufuse and returning dest. */
static struct Io*
Io_bufxfer(struct Io *dest, struct Io *src, int n){
assert(dest != NULL && src != NULL);
memcpy(dest->buf, src->buf, (dest->bufuse = n));
memmove(src->buf, src->buf + n, (src->bufuse -= n));
return dest;
}
/* Opens io->fn and saves the file descriptor into io->fd. Returns io->fd, /* Opens io->fn and saves the file descriptor into io->fd. Returns io->fd,
* which will be -1 if an error occured. */ * which will be -1 if an error occured. */
static int static int
@ -318,10 +303,18 @@ int main(int argc, char *argv[]){
do{ do{
int t; int t;
if(io[1].bs > io[0].bs){ if(io[0].bs <= io[1].bs){
int n; int n;
/* copy from ibuf as much as possible to the obuf */ /* saturate obuf */
memcpy(io[1].buf, io[0].buf,
(io[1].bufuse = (n = MIN(io[0].bufuse, io[1].bs))));
/* permute the copied units out of ibuf */
memmove(io[0].buf, io[0].buf + n, (io[0].bufuse -= n));
}else /* if(io[0].bs < io[1].bs) */ {
int n;
/* drain what we can from ibuf */
memcpy(io[1].buf + io[1].bufuse, io[0].buf, memcpy(io[1].buf + io[1].bufuse, io[0].buf,
(n = MIN(io[0].bufuse, io[1].bs - io[1].bufuse))); (n = MIN(io[0].bufuse, io[1].bs - io[1].bufuse)));
io[1].bufuse += n; io[1].bufuse += n;
@ -330,9 +323,8 @@ int main(int argc, char *argv[]){
io[0].bufuse -= n; io[0].bufuse -= n;
if(io[0].bs + io[1].bufuse <= io[1].bs && count != 1) if(io[0].bs + io[1].bufuse <= io[1].bs && count != 1)
continue; /* we could write more */ continue; /* obuf not saturated - we could write more */
}else }
Io_bufxfer(&io[1], &io[0], MIN(io[0].bufuse, io[1].bs));
t = io[1].bufuse; t = io[1].bufuse;
Io_write(&io[1]); Io_write(&io[1]);