X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.c;h=3acd450482a99ade552b2a82c8bd8b88492bd8cf;hb=fad78c609423fe10139b468ec229c3d6792718e2;hp=9de8e070da4957c047bff33cb8dedd1d8c41ea8b;hpb=7b2d9feb821376603bcbc0707e21edce36109f9a;p=libguestfs.git

diff --git a/fish/fish.c b/fish/fish.c
index 9de8e07..3acd450 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -517,7 +517,7 @@ script (int prompt)
   char *cmd;
   char *p, *pend;
   char *argv[64];
-  int i, len;
+  int len;
   int global_exit_on_error = !prompt;
   int tilde_candidate;
 
@@ -581,7 +581,7 @@ script (int prompt)
     if (len == 0) continue;
 
     cmd = buf;
-    i = 0;
+    unsigned int i = 0;
     if (buf[len] == '\0') {
       argv[0] = NULL;
       goto got_command;
@@ -1117,9 +1117,10 @@ add_history_line (const char *line)
 }
 
 int
-xwrite (int fd, const void *buf, size_t len)
+xwrite (int fd, const void *v_buf, size_t len)
 {
   int r;
+  const char *buf = v_buf;
 
   while (len > 0) {
     r = write (fd, buf, len);