Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1874e655 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

libdiskconfig: 64-bit issues 

Change-Id: Ie5e790c36395ec2f844294b91241a8f8ba3834b8
parent 1a379899

libdiskconfig/diskconfig.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/fs.h>



#include <cutils/config_utils.h>

#include <cutils/log.h>

#include <log/log.h>



#include <diskconfig/diskconfig.h>
@@ -337,7 +337,7 @@ validate(struct disk_info *dinfo) 
    }



#if 1

    ALOGV("Device/file %s: size=%llu bytes, num_lba=%u, sect_size=%d",

    ALOGV("Device/file %s: size=%" PRIu64 " bytes, num_lba=%u, sect_size=%d",

         dinfo->device, disk_size, dinfo->num_lba, dinfo->sect_size);

#endif

libdiskconfig/diskutils.c

+5 −4
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ 


#include <errno.h>

#include <fcntl.h>

#include <inttypes.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

#include <sys/stat.h>



#include <cutils/log.h>

#include <log/log.h>



#include <diskconfig/diskconfig.h>
@@ -35,8 +36,8 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) 
    int dst_fd = -1;

    int src_fd = -1;

    uint8_t buffer[2048];

    int nr_bytes;

    int tmp;

    ssize_t nr_bytes;

    ssize_t tmp;

    int done = 0;

    uint64_t total = 0;
@@ -101,7 +102,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) 
    if (dst_fd >= 0)

        fsync(dst_fd);



    ALOGI("Wrote %llu bytes to %s @ %lld", total, dst, offset);

    ALOGI("Wrote %" PRIu64 " bytes to %s @ %lld", total, dst, offset);



    close(src_fd);

    if (dst_fd >= 0)