Merge pull request #36 from mmmaisel/dev

Improvements from ext4-browser project

diff --cc src/ext4_mbr.c
index 14fe252f1ac53ab69c29f990a3646ae2df601b8b,4d95d0cada2f41bba00cc34ee63e3026e7115276..0376545e00cc6119870a636684f35eca9dd8afa4
--- 1/src/ext4_mbr.c
--- 2/src/ext4_mbr.c
+++ b/src/ext4_mbr.c
@@@ -126,10 -127,10 +127,10 @@@ int ext4_mbr_scan(struct ext4_blockdev 
        return r;
  }
  
- int ext4_mbr_write(struct ext4_blockdev *parent, struct ext4_mbr_parts *parts)
+ int ext4_mbr_write(struct ext4_blockdev *parent, struct ext4_mbr_parts *parts, uint32_t disk_id)
  {
        int r;
 -      uint64_t disk_size = parent->part_size;
 +      uint64_t disk_size;
        uint32_t division_sum = parts->division[0] + parts->division[1] +
                                parts->division[2] + parts->division[3];
  

diff --cc src/ext4_mkfs.c
Simple merge