Changeset 5cde90f in mainline for uspace/app/mkfat/mkfat.c

Timestamp:

2010-02-19T17:16:46Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Synchronizing with head (which has just been synchronized with this branch).

File:

• uspace/app/mkfat/mkfat.c (modified) (4 diffs)

uspace/app/mkfat/mkfat.c

@@ -44 +44 @@
 #include <devmap.h>
 #include <byteorder.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
+#include <inttypes.h>
 #include <errno.h>
 #include "fat.h"
@@ -95 +98 @@
         size_t block_size;
         char *endptr;
-        bn_t dev_nblocks;
+        aoff64_t dev_nblocks;
 
         cfg.total_sectors = 0;
@@ -157 +160 @@
                 printf(NAME ": Warning, failed to obtain block device size.\n");
         } else {
-                printf(NAME ": Block device has %llu blocks.\n", dev_nblocks);
+                printf(NAME ": Block device has %" PRIuOFF64 " blocks.\n",
+                    dev_nblocks);
                 cfg.total_sectors = dev_nblocks;
         }
@@ -232 +236 @@
 static int fat_blocks_write(struct fat_params const *par, dev_handle_t handle)
 {
-        bn_t addr;
+        aoff64_t addr;
         uint8_t *buffer;
         int i;