[PATCH] uml: fix 2 harmless cast warnings for 64-bit
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Tue, 11 Apr 2006 05:53:31 +0000 (22:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 11 Apr 2006 13:18:35 +0000 (06:18 -0700)
Fix two harmless warnings in 64-bit compilation (the 2nd doesn't trigger for
now because of a missing __attribute((format)) for cow_printf, but next
patches fix that).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/um/drivers/cow_user.c
arch/um/drivers/mconsole_kern.c

index a9afccf68e384d16ec866885f2dfccc52b9e852d..0ec4052db9c5bbb183714a44012ef07fc388b026 100644 (file)
@@ -210,8 +210,9 @@ int write_cow_header(char *cow_file, int fd, char *backing_file,
 
        err = -EINVAL;
        if(strlen(backing_file) > sizeof(header->backing_file) - 1){
+               /* Below, %zd is for a size_t value */
                cow_printf("Backing file name \"%s\" is too long - names are "
-                          "limited to %d characters\n", backing_file,
+                          "limited to %zd characters\n", backing_file,
                           sizeof(header->backing_file) - 1);
                goto out_free;
        }
index 1646f396056cb618bfa8d288cb6aebb70e0f9380..09f1c140a7690f1913d1c4fe95aeceb19db4e09c 100644 (file)
@@ -615,7 +615,7 @@ static void console_write(struct console *console, const char *string,
                return;
 
        while(1){
-               n = min((size_t)len, ARRAY_SIZE(console_buf) - console_index);
+               n = min((size_t) len, ARRAY_SIZE(console_buf) - console_index);
                strncpy(&console_buf[console_index], string, n);
                console_index += n;
                string += n;