fix format sizes again, sorry
This commit is contained in:
committed by
Hector Martin
parent
705d3251f4
commit
c76dae814b
@@ -18,10 +18,10 @@ s32 isfs_get(const char *path, u8 **buf, u32 expected, u32 maxsize, bool use_blo
|
||||
s32 fd;
|
||||
u8 *__buf;
|
||||
|
||||
gprintf("reading %s (expecting %lu bytes)\n", path, expected);
|
||||
gprintf("reading %s (expecting %u bytes)\n", path, expected);
|
||||
ret = ISFS_Open(path, ISFS_OPEN_READ);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_Open failed (%ld)\n", ret);
|
||||
gprintf("ISFS_Open failed (%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ s32 isfs_get(const char *path, u8 **buf, u32 expected, u32 maxsize, bool use_blo
|
||||
|
||||
ret = ISFS_GetFileStats(fd, &__st);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_GetFileStats failed (%ld)\n", ret);
|
||||
gprintf("ISFS_GetFileStats failed (%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
DCInvalidateRange(&__st, sizeof(__st));
|
||||
@@ -37,7 +37,7 @@ s32 isfs_get(const char *path, u8 **buf, u32 expected, u32 maxsize, bool use_blo
|
||||
if ((__st.file_length == 0) ||
|
||||
(maxsize && (__st.file_length > maxsize)) ||
|
||||
(expected && (__st.file_length != expected))) {
|
||||
gprintf("invalid size: %lu\n", __st.file_length);
|
||||
gprintf("invalid size: %u\n", __st.file_length);
|
||||
ISFS_Close(fd);
|
||||
return -1;
|
||||
}
|
||||
@@ -50,10 +50,10 @@ s32 isfs_get(const char *path, u8 **buf, u32 expected, u32 maxsize, bool use_blo
|
||||
__buf = pmemalign(32, ROUNDUP32B(__st.file_length + 1));
|
||||
}
|
||||
|
||||
gprintf("reading %lu bytes\n", __st.file_length);
|
||||
gprintf("reading %u bytes\n", __st.file_length);
|
||||
ret = ISFS_Read(fd, __buf, __st.file_length);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_Read failed (%ld)\n", ret);
|
||||
gprintf("ISFS_Read failed (%d)\n", ret);
|
||||
free(__buf);
|
||||
ISFS_Close(fd);
|
||||
return ret;
|
||||
@@ -62,7 +62,7 @@ s32 isfs_get(const char *path, u8 **buf, u32 expected, u32 maxsize, bool use_blo
|
||||
__buf[__st.file_length] = 0;
|
||||
|
||||
if (ret != __st.file_length) {
|
||||
gprintf("ISFS_Read short read (%ld)\n", ret);
|
||||
gprintf("ISFS_Read short read (%d)\n", ret);
|
||||
free(__buf);
|
||||
ISFS_Close(fd);
|
||||
return -1;
|
||||
@@ -70,7 +70,7 @@ s32 isfs_get(const char *path, u8 **buf, u32 expected, u32 maxsize, bool use_blo
|
||||
|
||||
ret = ISFS_Close(fd);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_Close failed (%ld)\n", ret);
|
||||
gprintf("ISFS_Close failed (%d)\n", ret);
|
||||
free(__buf);
|
||||
return ret;
|
||||
}
|
||||
@@ -84,16 +84,16 @@ s32 isfs_put(const char *path, const void *buf, u32 len) {
|
||||
|
||||
ISFS_Delete(path);
|
||||
|
||||
gprintf("writing %s (%lu bytes)\n", path, len);
|
||||
gprintf("writing %s (%u bytes)\n", path, len);
|
||||
ret = ISFS_CreateFile(path, 0, 3, 3, 0);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_CreateFile failed (%ld)\n", ret);
|
||||
gprintf("ISFS_CreateFile failed (%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = ISFS_Open(path, 3);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_Open failed (%ld)\n", ret);
|
||||
gprintf("ISFS_Open failed (%d)\n", ret);
|
||||
ISFS_Delete(path);
|
||||
return ret;
|
||||
}
|
||||
@@ -104,14 +104,14 @@ s32 isfs_put(const char *path, const void *buf, u32 len) {
|
||||
|
||||
ret = ISFS_Write(fd, buf, len);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_Write failed (%ld)\n", ret);
|
||||
gprintf("ISFS_Write failed (%d)\n", ret);
|
||||
ISFS_Close(fd);
|
||||
ISFS_Delete(path);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (ret != len) {
|
||||
gprintf("ISFS_Write short write (%ld)\n", ret);
|
||||
gprintf("ISFS_Write short write (%d)\n", ret);
|
||||
ISFS_Close(fd);
|
||||
ISFS_Delete(path);
|
||||
return -1;
|
||||
@@ -119,7 +119,7 @@ s32 isfs_put(const char *path, const void *buf, u32 len) {
|
||||
|
||||
ret = ISFS_Close(fd);
|
||||
if (ret < 0) {
|
||||
gprintf("ISFS_Close failed (%ld)\n", ret);
|
||||
gprintf("ISFS_Close failed (%d)\n", ret);
|
||||
ISFS_Delete(path);
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user