(s)size_t type cleanup

diff --git a/ChangeLog b/ChangeLog
index 6db1f1c7f3b8bed74f2aa6c9ad6f6d0ac1773b44..3d8b89ac65ae666deae2b0d5e6276112b482aba3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 19 09:14:56 CET 2009 Guido Günther <agx@sigxcpu.org>
+
+       * src/qemu_driver.c (qemudReadMonitorOutput, qemudReadLogOutput):
+       (s)size_t type cleanup
+
 Tue Feb 17 20:40:51 EST 2009 Cole Robinson <crobinso@redhat.com>
 
        * src/qemu_driver.c: Remove the _actually_ incorrect

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 20d3c0caa52670941a2eb10641b5bba431fe059b..a8a2ae723cd9825fdcac49c19ed3428c8c0fedbf 100644 (file)
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -594,18 +594,18 @@ qemudReadMonitorOutput(virConnectPtr conn,
                        virDomainObjPtr vm,
                        int fd,
                        char *buf,
-                       int buflen,
+                       size_t buflen,
                        qemudHandlerMonitorOutput func,
                        const char *what,
                        int timeout)
 {
-    int got = 0;
+    size_t got = 0;
     buf[0] = '\0';
     timeout *= 1000; /* poll wants milli seconds */
 
     /* Consume & discard the initial greeting */
     while (got < (buflen-1)) {
-        int ret;
+        ssize_t ret;
 
         ret = read(fd, buf+got, buflen-got-1);
 
@@ -672,17 +672,18 @@ qemudReadLogOutput(virConnectPtr conn,
                    virDomainObjPtr vm,
                    int fd,
                    char *buf,
-                   int buflen,
+                   size_t buflen,
                    qemudHandlerMonitorOutput func,
                    const char *what,
                    int timeout)
 {
-    int got = 0;
-    int ret;
     int retries = timeout*10;
     buf[0] = '\0';
 
     while (retries) {
+        ssize_t ret;
+        size_t got = 0;
+
         while((ret = read(fd, buf+got, buflen-got-1)) > 0) {
             got += ret;
             buf[got] = '\0';