correct fread, fwrite, fopen return value

Reisyukaku · Jul 24, 2018 · 1cefcf53cb1f86881f3552b3b2a8c0169753d5c1 · 1cefcf5
1 parent 6e90d61
commit 1cefcf53cb1f86881f3552b3b2a8c0169753d5c1
Unified Split

Showing with 15 additions and 15 deletions.

+2 −2 src/firmware.c

+6 −6 src/fs.c

+4 −4 src/fs.h

+3 −3 src/package.c
diff --git a/src/firmware.c b/src/firmware.c
@@ -57,7 +57,7 @@ static void SE_lock() {

 void drawSplash() {
    // Draw splashscreen to framebuffer.
-    if(fopen("/ReiNX/splash.bin", "rb") != NULL) {
+    if(fopen("/ReiNX/splash.bin", "rb") != 0) {
        fread((void*)0xC0000000, fsize(), 1);
        fclose();
    }
@@ -94,7 +94,7 @@ void pkg2_parse_kips(link_t *info, pkg2_hdr_t *pkg2) {
 }

 void loadKip(link_t *info, char *path) {
-    if(fopen(path, "rb") == NULL) return;
+    if(fopen(path, "rb") == 0) return;
    pkg2_kip1_t *ckip = malloc(fsize());
    fread(ckip, fsize(), 1);
    fclose();
diff --git a/src/fs.c b/src/fs.c
@@ -40,19 +40,19 @@ u32 sd_mount() {
    return 0;
 }

-u32 *fopen(const char *path, const char *mode) {
+u32 fopen(const char *path, const char *mode) {
    if (f_open(&fp, path, mode[0] == 'w' ? FA_WRITE : FA_READ) != FR_OK) 
-        return NULL;
+        return 0;
    return 1;
 }

-u32 *fread(void *buf, size_t size, size_t ntimes) {
+u32 fread(void *buf, size_t size, size_t ntimes) {
    u8 *ptr = buf;
    while (size > 0) {
        u32 rsize = MIN(ntimes * size, size);
        if (f_read(&fp, ptr, rsize, NULL) != FR_OK) {
            error("Failed read!\n");
-            return NULL;
+            return 0;
        }

        ptr += rsize;
@@ -61,13 +61,13 @@ u32 *fread(void *buf, size_t size, size_t ntimes) {
    return 1;
 }

-u32 *fwrite(void *buf, size_t size, size_t ntimes) {
+u32 fwrite(void *buf, size_t size, size_t ntimes) {
    u8 *ptr = buf;
    while (size > 0) {
        u32 rsize = MIN(ntimes * size, size);
        if (f_write(&fp, ptr, rsize, NULL) != FR_OK) {
            error("Failed write!\n");
-            return NULL;
+            return 0;
        }

        ptr += rsize;
diff --git a/src/fs.h b/src/fs.h
@@ -1,9 +1,9 @@
 #pragma once

 u32 sd_mount();
-u32 *fopen(const char *path, const char *mode);
-u32 *fread(void *buf, size_t size, size_t ntimes);
-u32 *fwrite(void *buf, size_t size, size_t ntimes);
+u32 fopen(const char *path, const char *mode);
+u32 fread(void *buf, size_t size, size_t ntimes);
+u32 fwrite(void *buf, size_t size, size_t ntimes);
 size_t fsize();
 void fclose();
-size_t enumerateDir(char ***output, char *path, char *pattern);
+size_t enumerateDir(char ***output, char *path, char *pattern);
diff --git a/src/package.c b/src/package.c
@@ -59,15 +59,15 @@ u8 pkg1_unpack(pk11_offs *offs, u8 *pkg1) {
    for (u32 i = 0; i < 3; i++) {
        if (offs->sec_map[i] == 0 && offs->warmboot_base) {
            u8 *extWb = NULL;
-            if(fopen("/ReiNX/warmboot.bin", "rb") != NULL) {
+            if(fopen("/ReiNX/warmboot.bin", "rb") != 0) {
                extWb = malloc(fsize());
                fread(extWb, fsize(), 1);
                fclose();
            }
            memcpy((void *)offs->warmboot_base, extWb == NULL ? pdata : extWb, sec_size[offs->sec_map[i]]);
        } else if (offs->sec_map[i] == 2 && offs->secmon_base) {
            u8 *extSec = NULL;
-            if(fopen("/ReiNX/secmon.bin", "rb") != NULL) {
+            if(fopen("/ReiNX/secmon.bin", "rb") != 0) {
                extSec = malloc(fsize());
                fread(extSec, fsize(), 1);
                fclose();
@@ -104,7 +104,7 @@ void buildFirmwarePackage(u8 *kernel, u32 kernel_size, link_t *kips_info) {

    // Kernel.
    u8 *extKern = NULL;
-    if(fopen("/ReiNX/kernel.bin", "rb") != NULL) {
+    if(fopen("/ReiNX/kernel.bin", "rb") != 0) {
        extKern = malloc(fsize());
        fread(extKern, fsize(), 1);
        fclose();