git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/pkt-line.c b/pkt-line.c
index b4cb7e2756dcc52c17aebf4c0fc6adc7b415ef3c..355546a1ad844492234dc7ee91528c525af5610a 100644 (file)
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -5,7 +5,7 @@
  * Write a packetized stream, where each line is preceded by
  * its length (including the header) as a 4-byte hex number.
  * A length of 'zero' means end of stream (and a length of 1-3
- * would be an error). 
+ * would be an error).
  *
  * This is all pretty stupid, but we use this packetized line
  * format to make a streaming format possible without ever
@@ -65,10 +65,10 @@ void packet_write(int fd, const char *fmt, ...)
 
 static void safe_read(int fd, void *buffer, unsigned size)
 {
-       int n = 0;
+       size_t n = 0;
 
        while (n < size) {
-               int ret = xread(fd, (char *) buffer + n, size - n);
+               ssize_t ret = xread(fd, (char *) buffer + n, size - n);
                if (ret < 0)
                        die("read error (%s)", strerror(errno));
                if (!ret)