chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
test
/
test-pty.c
diff --git
a/src/test/test-pty.c
b/src/test/test-pty.c
index 73c5c853303bb76b9af502360c58be403da16da1..eadecb99a06d6b6aef4ab2664ff80667ec872ed9 100644
(file)
--- a/
src/test/test-pty.c
+++ b/
src/test/test-pty.c
@@
-20,13
+20,11
@@
***/
#include <errno.h>
***/
#include <errno.h>
-#include <fcntl.h>
#include <locale.h>
#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
#include <locale.h>
#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
-#include "def.h"
#include "pty.h"
#include "util.h"
#include "pty.h"
#include "util.h"
@@
-37,11
+35,11
@@
static size_t rcvsiz = 0;
static sd_event *event;
static void run_child(Pty *pty) {
static sd_event *event;
static void run_child(Pty *pty) {
-
in
t r, l;
+
ssize_
t r, l;
char buf[512];
r = read(0, buf, sizeof(buf));
char buf[512];
r = read(0, buf, sizeof(buf));
- assert_se(r == strlen(sndmsg));
+ assert_se(
(size_t)
r == strlen(sndmsg));
assert_se(!strncmp(buf, sndmsg, r));
l = write(1, buf, r);
assert_se(!strncmp(buf, sndmsg, r));
l = write(1, buf, r);
@@
-100,7
+98,7
@@
static void test_pty(void) {
Pty *pty;
rcvsiz = 0;
Pty *pty;
rcvsiz = 0;
-
memset(rcvbuf, 0, sizeof(rcvbuf)
);
+
zero(rcvbuf
);
assert_se(sd_event_default(&event) >= 0);
assert_se(sd_event_default(&event) >= 0);