From 23fb3821d5caa6b8b0c7e782c60f8fb35b2f9862 Mon Sep 17 00:00:00 2001
From: jakcron <jakcron.dev@gmail.com>
Date: Sun, 17 Apr 2022 09:58:44 +0800
Subject: [PATCH] Add missing return.

---
 makerom/src/ncch.c | 52 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/makerom/src/ncch.c b/makerom/src/ncch.c
index 9aa9037..8207e97 100644
--- a/makerom/src/ncch.c
+++ b/makerom/src/ncch.c
@@ -75,6 +75,8 @@ int SignCXI(ncch_hdr *hdr, keys_struct *keys)
 		memset(GetNcchHdrSig(hdr), 0xFF, 0x100);
 		return 0;
 	}
+
+	return 0;
 }
 
 int CheckCXISignature(ncch_hdr *hdr, u8 *pubk)
@@ -97,49 +99,79 @@ int build_NCCH(user_settings *usrset)
 
 	// Get Settings
 	result = GetNcchSettings(ncchset,usrset);
-	if(result) goto finish;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to initialize context.\n");
+		goto finish;
+	}
 
 	// Import Data
 	result = ImportNonCodeExeFsSections(ncchset);
-	if(result) return result;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to import non-code ExeFs sections\n");
+		goto finish;
+	}
 	
 	result = ImportLogo(ncchset);
-	if(result) return result;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to import Logo\n");
+		goto finish;
+	}
 
 	if(!ncchset->options.IsCfa){ // CXI Specific Sections
 		// Build ExeFs Code Section\n");
 		result = BuildExeFsCode(ncchset);
-		if(result) goto finish;
+		if(result) {
+			fprintf(stderr,"[NCCH ERROR] Failed to build ExeFs code\n");
+			goto finish;
+		}
 	
 		// Build ExHeader\n");
 		result = BuildExHeader(ncchset);
-		if(result) goto finish;
+		if(result) {
+			fprintf(stderr,"[NCCH ERROR] Failed to build ExHeader\n");
+			goto finish;
+		}
 	}	
 
 	
 	// Build ExeFs\n");
 	result = BuildExeFs(ncchset);
-	if(result) goto finish;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to build ExeFs\n");
+		goto finish;
+	}
 
 	
 	// Prepare for RomFs\n");
 	romfs_buildctx romfs;
 	memset(&romfs,0,sizeof(romfs_buildctx));
 	result = SetupRomFs(ncchset,&romfs);
-	if(result) goto finish;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to setup RomFs\n");
+		goto finish;
+	}
 
 	
 	// Setup NCCH including final memory allocation\n");
 	result = SetupNcch(ncchset,&romfs);
-	if(result) goto finish;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to setup NCCH\n");
+		goto finish;
+	}
 
 	// Build RomFs\n");
 	result = BuildRomFs(&romfs);
-	if(result) goto finish;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to build RomFs\n");
+		goto finish;
+	}
 	
 	// Finalise NCCH (Hashes/Signatures and crypto)\n");
 	result = FinaliseNcch(ncchset);
-	if(result) goto finish;
+	if(result) {
+		fprintf(stderr,"[NCCH ERROR] Failed to finalize NCCH\n");
+		goto finish;
+	}
 
 finish:
 	if(result)