Merge branch 'maint'

diff --git a/builtin-bundle.c b/builtin-bundle.c
index 0a9b73867f86a1ff33f7e2b2f458b02aacdd332d..306ad29597dbf9002a44ba509c2e9d7a737b159d 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -48,7 +48,7 @@ static int read_string(int fd, char *buffer, int size)
 {
        int i;
        for (i = 0; i < size - 1; i++) {
-               int count = xread(fd, buffer + i, 1);
+               ssize_t count = xread(fd, buffer + i, 1);
                if (count < 0)
                        return error("Read error: %s", strerror(errno));
                if (count == 0) {
@@ -87,7 +87,7 @@ static int read_header(const char *path, struct bundle_header *header) {
                if (buffer[len - 1] == '\n')
                        buffer[len - 1] = '\0';
                if (get_sha1_hex(buffer + offset, sha1)) {
-                       warn("unrecognized header: %s", buffer);
+                       warning("unrecognized header: %s", buffer);
                        continue;
                }
                delim = buffer[40 + offset];
@@ -268,7 +268,7 @@ static int create_bundle(struct bundle_header *header, const char *path,
                 * from getting output.
                 */
                if (!(e->item->flags & SHOWN)) {
-                       warn("ref '%s' is excluded by the rev-list options",
+                       warning("ref '%s' is excluded by the rev-list options",
                                e->name);
                        continue;
                }