--- trunk/mkinitrd-magellan/klibc/usr/kinit/ramdisk_load.c 2010/07/22 07:47:49 1121 +++ trunk/mkinitrd-magellan/klibc/usr/kinit/ramdisk_load.c 2010/08/18 21:11:40 1122 @@ -95,7 +95,7 @@ if (ioctl(rfd, BLKGETSIZE64, &ramdisk_size)) ramdisk_size = ~0ULL; ramdisk_start = 0; - DEBUG(("New size = %llu\n", ramdisk_size)); + dprintf("New size = %llu\n", ramdisk_size); } do { ramdisk_left = ramdisk_size - ramdisk_start; @@ -117,14 +117,14 @@ rv = inflate(&zs, Z_SYNC_FLUSH); } while (rv == Z_OK || rv == Z_BUF_ERROR); - DEBUG(("kinit: inflate returned %d\n", rv)); + dprintf("kinit: inflate returned %d\n", rv); if (rv != Z_STREAM_END) goto err2; /* Write the last */ _fwrite(out_buf, BUF_SZ - zs.avail_out, wfd); - DEBUG(("kinit: writing %d bytes\n", BUF_SZ - zs.avail_out)); + dprintf("kinit: writing %d bytes\n", BUF_SZ - zs.avail_out); inflateEnd(&zs); return 0; @@ -153,8 +153,8 @@ if (ioctl(rfd, BLKGETSIZE64, &ramdisk_size)) ramdisk_size = ~0ULL; - DEBUG(("start: %llu size: %llu fssize: %llu\n", - ramdisk_start, ramdisk_size, fssize)); + dprintf("start: %llu size: %llu fssize: %llu\n", + ramdisk_start, ramdisk_size, fssize); while (fssize) { @@ -189,7 +189,7 @@ return !!fssize; } -int ramdisk_load(int argc, char *argv[], dev_t root_dev) +int ramdisk_load(int argc, char *argv[]) { const char *arg_prompt_ramdisk = get_arg(argc, argv, "prompt_ramdisk="); const char *arg_ramdisk_blocksize = @@ -246,7 +246,7 @@ return 0; } - DEBUG(("kinit: ramdisk is %s, size %llu\n", fstype, fssize)); + dprintf("kinit: ramdisk is %s, size %llu\n", fstype, fssize); fprintf(stderr, "Loading ramdisk (%s) ...", is_gzip ? "gzip" : "raw");