diff --git a/sharedmem.c b/sharedmem.c index fb31720..d8b5ecd 100644 --- a/sharedmem.c +++ b/sharedmem.c @@ -348,7 +348,7 @@ static void *rmtfs_mem_ptr(struct rmtfs_mem *rmem, unsigned long phys_address, s if (start < rmem->address || end > rmem->address + rmem->size) return NULL; - return rmem->base + phys_address - rmem->address; + return (char*)rmem->base + phys_address - rmem->address; } ssize_t rmtfs_mem_read(struct rmtfs_mem *rmem, unsigned long phys_address, void *buf, ssize_t len) diff --git a/storage.c b/storage.c index 4c78ab3..c8e69ed 100644 --- a/storage.c +++ b/storage.c @@ -203,13 +203,13 @@ ssize_t storage_pread(const struct rmtfd *rmtfd, void *buf, size_t nbyte, off_t } else { n = MIN(nbyte, rmtfd->shadow_len - offset); if (n > 0) - memcpy(buf, rmtfd->shadow_buf + offset, n); + memcpy(buf, (char*)rmtfd->shadow_buf + offset, n); else n = 0; } if (n < nbyte) - memset(buf + n, 0, nbyte - n); + memset((char*)buf + n, 0, nbyte - n); return nbyte; } @@ -239,7 +239,7 @@ ssize_t storage_pwrite(struct rmtfd *rmtfd, const void *buf, size_t nbyte, off_t rmtfd->shadow_len = new_len; } - memcpy(rmtfd->shadow_buf + offset, buf, nbyte); + memcpy((char*)rmtfd->shadow_buf + offset, buf, nbyte); return nbyte; }