projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint' into next
[paraslash.git]
/
stdout.c
diff --git
a/stdout.c
b/stdout.c
index ce0d22093486281f4fd489c2fcb07d0bb25ef01c..d64586bccd9cdd12ffe743247680d8686ee1c002 100644
(file)
--- a/
stdout.c
+++ b/
stdout.c
@@
-10,7
+10,6
@@
#include <assert.h>
#include "para.h"
#include <assert.h>
#include "para.h"
-#include "string.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
@@
-68,14
+67,14
@@
static void stdout_post_select(struct sched *s, struct task *t)
}
if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
return;
}
if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
return;
- ret = write(STDOUT_FILENO,
sot->buf
, *sot->loaded);
+ ret = write(STDOUT_FILENO,
*sot->bufp
, *sot->loaded);
if (ret < 0) {
t->error = -ERRNO_TO_PARA_ERROR(errno);
return;
}
*sot->loaded -= ret;
if (*sot->loaded)
if (ret < 0) {
t->error = -ERRNO_TO_PARA_ERROR(errno);
return;
}
*sot->loaded -= ret;
if (*sot->loaded)
- memmove(
sot->buf, sot->buf
+ ret, *sot->loaded);
+ memmove(
*sot->bufp, *sot->bufp
+ ret, *sot->loaded);
}
/**
}
/**