X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=second%2Fprom.c;h=a9918840b30c899ba1e541955430c2f69a653b84;hb=32b8ef2cc825d09ac26bb5c7aa4d31ab53df8dc3;hp=fbadb2ac664632a9243fbaf4d44c9a6a273c466e;hpb=86a488e2f3078a2a4e9942f1ec9d0fb1a3a632ad;p=yaboot.git diff --git a/second/prom.c b/second/prom.c index fbadb2a..a991884 100644 --- a/second/prom.c +++ b/second/prom.c @@ -196,7 +196,7 @@ prom_get_devtype (char *device) char tmp[64]; if (strstr(device, TOK_ISCSI)) - device = strcpy(tmp, "/vdevice/gscsi/disk"); + return FILE_DEVICE_ISCSI; /* Find OF device phandle */ dev = prom_finddevice(device); @@ -439,7 +439,7 @@ prom_puts (prom_handle file, char *s) } void -prom_vfprintf (prom_handle file, char *fmt, va_list ap) +prom_vfprintf (prom_handle file, const char *fmt, va_list ap) { static char printf_buf[2048]; vsprintf (printf_buf, fmt, ap); @@ -447,7 +447,7 @@ prom_vfprintf (prom_handle file, char *fmt, va_list ap) } void -prom_vprintf (char *fmt, va_list ap) +prom_vprintf (const char *fmt, va_list ap) { static char printf_buf[2048]; vsprintf (printf_buf, fmt, ap); @@ -455,7 +455,7 @@ prom_vprintf (char *fmt, va_list ap) } void -prom_fprintf (prom_handle file, char *fmt, ...) +prom_fprintf (prom_handle file, const char *fmt, ...) { va_list ap; va_start (ap, fmt); @@ -464,7 +464,7 @@ prom_fprintf (prom_handle file, char *fmt, ...) } void -prom_printf (char *fmt, ...) +prom_printf (const char *fmt, ...) { va_list ap; va_start (ap, fmt); @@ -473,7 +473,7 @@ prom_printf (char *fmt, ...) } void -prom_debug (char *fmt, ...) +prom_debug (const char *fmt, ...) { va_list ap; @@ -715,7 +715,7 @@ struct bootp_packet * prom_get_netinfo (void) chosen = prom_finddevice("/chosen"); if (chosen < 0) { - DEBUG_F("chosen=%d\n", chosen); + DEBUG_F("chosen=%lu\n", (unsigned long)chosen); return 0; }