提交 af860067 编写于 作者: C Cole Robinson

Update POTFILES, and s/write/safewrite/ to appease 'make syntax-check'

上级 be9e5185
Tue May 12 16:39:06 EDT 2009 Cole Robinson <crobinso@redhat.com>
* tests/eventtest.c: Use safewrite instead of write
* po/POTFILES.in: Add src/vbox/vbox_driver.c
Tue May 12 16:25:59 EDT 2009 Cole Robinson <crobinso@redhat.com> Tue May 12 16:25:59 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/storage_backend_fs.c: Break out FS volume build routines to * src/storage_backend_fs.c: Break out FS volume build routines to
......
...@@ -38,6 +38,7 @@ src/uml_conf.c ...@@ -38,6 +38,7 @@ src/uml_conf.c
src/uml_driver.c src/uml_driver.c
src/util.c src/util.c
src/uuid.c src/uuid.c
src/vbox/vbox_driver.c
src/vbox/vbox_tmpl.c src/vbox/vbox_tmpl.c
src/virsh.c src/virsh.c
src/virterror.c src/virterror.c
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "internal.h" #include "internal.h"
#include "threads.h" #include "threads.h"
#include "logging.h" #include "logging.h"
#include "util.h"
#include "../qemud/event.h" #include "../qemud/event.h"
#define NUM_FDS 5 #define NUM_FDS 5
...@@ -309,7 +310,7 @@ mymain(int argc, char **argv) ...@@ -309,7 +310,7 @@ mymain(int argc, char **argv)
/* First time, is easy - just try triggering one of our /* First time, is easy - just try triggering one of our
* registered handles */ * registered handles */
startJob("Simple write", &test); startJob("Simple write", &test);
ret = write(handles[1].pipeFD[1], &one, 1); ret = safewrite(handles[1].pipeFD[1], &one, 1);
if (finishJob(1, -1) != EXIT_SUCCESS) if (finishJob(1, -1) != EXIT_SUCCESS)
return EXIT_FAILURE; return EXIT_FAILURE;
...@@ -319,7 +320,7 @@ mymain(int argc, char **argv) ...@@ -319,7 +320,7 @@ mymain(int argc, char **argv)
* try triggering another handle */ * try triggering another handle */
virEventRemoveHandleImpl(handles[0].watch); virEventRemoveHandleImpl(handles[0].watch);
startJob("Deleted before poll", &test); startJob("Deleted before poll", &test);
ret = write(handles[1].pipeFD[1], &one, 1); ret = safewrite(handles[1].pipeFD[1], &one, 1);
if (finishJob(1, -1) != EXIT_SUCCESS) if (finishJob(1, -1) != EXIT_SUCCESS)
return EXIT_FAILURE; return EXIT_FAILURE;
...@@ -346,13 +347,13 @@ mymain(int argc, char **argv) ...@@ -346,13 +347,13 @@ mymain(int argc, char **argv)
/* NB: this case is subject to a bit of a race condition. /* NB: this case is subject to a bit of a race condition.
* Only 1 time in 3 does the 2nd write get triggered by * Only 1 time in 3 does the 2nd write get triggered by
* before poll() exits for the first write(). We don't * before poll() exits for the first safewrite(). We don't
* see a hard failure in other cases, so nothing to worry * see a hard failure in other cases, so nothing to worry
* about */ * about */
startJob("Deleted during dispatch", &test); startJob("Deleted during dispatch", &test);
handles[2].delete = handles[3].watch; handles[2].delete = handles[3].watch;
ret = write(handles[2].pipeFD[1], &one, 1); ret = safewrite(handles[2].pipeFD[1], &one, 1);
ret = write(handles[3].pipeFD[1], &one, 1); ret = safewrite(handles[3].pipeFD[1], &one, 1);
if (finishJob(2, -1) != EXIT_SUCCESS) if (finishJob(2, -1) != EXIT_SUCCESS)
return EXIT_FAILURE; return EXIT_FAILURE;
...@@ -361,7 +362,7 @@ mymain(int argc, char **argv) ...@@ -361,7 +362,7 @@ mymain(int argc, char **argv)
/* Extreme fun, lets delete ourselves during dispatch */ /* Extreme fun, lets delete ourselves during dispatch */
startJob("Deleted during dispatch", &test); startJob("Deleted during dispatch", &test);
handles[2].delete = handles[2].watch; handles[2].delete = handles[2].watch;
ret = write(handles[2].pipeFD[1], &one, 1); ret = safewrite(handles[2].pipeFD[1], &one, 1);
if (finishJob(2, -1) != EXIT_SUCCESS) if (finishJob(2, -1) != EXIT_SUCCESS)
return EXIT_FAILURE; return EXIT_FAILURE;
...@@ -410,7 +411,7 @@ mymain(int argc, char **argv) ...@@ -410,7 +411,7 @@ mymain(int argc, char **argv)
/* NB: this case is subject to a bit of a race condition. /* NB: this case is subject to a bit of a race condition.
* Only 1 time in 3 does the 2nd write get triggered by * Only 1 time in 3 does the 2nd write get triggered by
* before poll() exits for the first write(). We don't * before poll() exits for the first safewrite(). We don't
* see a hard failure in other cases, so nothing to worry * see a hard failure in other cases, so nothing to worry
* about */ * about */
virEventUpdateTimeoutImpl(timers[2].timer, 100); virEventUpdateTimeoutImpl(timers[2].timer, 100);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册