The-Homebrew-Cloud/Any-Region-Changer-ModMii-Edition
2
0
Fork 0
mirror of https://github.com/modmii/Any-Region-Changer-ModMii-Edition.git synced 2024-11-25 01:26:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove wrong long formatting in (s)printf calls

Browse Source
This commit is contained in:
TheShadowEevee 2022-04-20 20:59:56 -05:00
parent 08c9eb7710
commit aa742c3f0c
No known key found for this signature in database
GPG Key ID: 7A8AA92B3BAFAB75
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/detect_settings.c
View File

@ -54,12 +54,12 @@ u16 get_installed_title_version(u64 title)
// printf("Error! ES_GetStoredTMDSize: %d\n", ret); // printf("Error! ES_GetStoredTMDSize: %d\n", ret);
sprintf(filepath, "/title/%08lx/%08lx/content/title.tmd", TITLE_UPPER(title), TITLE_LOWER(title)); sprintf(filepath, "/title/%08x/%08x/content/title.tmd", TITLE_UPPER(title), TITLE_LOWER(title));
ret = ISFS_Open(filepath, ISFS_OPEN_READ); ret = ISFS_Open(filepath, ISFS_OPEN_READ);
if (ret <= 0) if (ret <= 0)
{ {
printf("Error! ISFS_Open (ret = %ld)\n", ret); printf("Error! ISFS_Open (ret = %d)\n", ret);
return 0; return 0;
} }
@ -68,21 +68,21 @@ u16 get_installed_title_version(u64 title)
ret = ISFS_Seek(fd, 0x1dc, 0); ret = ISFS_Seek(fd, 0x1dc, 0);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Seek (ret = %ld)\n", ret); printf("Error! ISFS_Seek (ret = %d)\n", ret);
return 0; return 0;
} }
ret = ISFS_Read(fd, tmd_buf, 2); ret = ISFS_Read(fd, tmd_buf, 2);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Read (ret = %ld)\n", ret); printf("Error! ISFS_Read (ret = %d)\n", ret);
return 0; return 0;
} }
ret = ISFS_Close(fd); ret = ISFS_Close(fd);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Close (ret = %ld)\n", ret); printf("Error! ISFS_Close (ret = %d)\n", ret);
return 0; return 0;
} }
@ -97,7 +97,7 @@ u16 get_installed_title_version(u64 title)
ret = ES_GetStoredTMD(title, s_tmd, tmd_size); ret = ES_GetStoredTMD(title, s_tmd, tmd_size);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ES_GetStoredTMD: %ld\n", ret); printf("Error! ES_GetStoredTMD: %d\n", ret);
return -1; return -1;
} }
tmd *t = SIGNATURE_PAYLOAD(s_tmd); tmd *t = SIGNATURE_PAYLOAD(s_tmd);
@ -127,12 +127,12 @@ u64 get_title_ios(u64 title)
// printf("Error! ES_GetStoredTMDSize: %d\n", ret); // printf("Error! ES_GetStoredTMDSize: %d\n", ret);
sprintf(filepath, "/title/%08lx/%08lx/content/title.tmd", TITLE_UPPER(title), TITLE_LOWER(title)); sprintf(filepath, "/title/%08x/%08x/content/title.tmd", TITLE_UPPER(title), TITLE_LOWER(title));
ret = ISFS_Open(filepath, ISFS_OPEN_READ); ret = ISFS_Open(filepath, ISFS_OPEN_READ);
if (ret <= 0) if (ret <= 0)
{ {
printf("Error! ISFS_Open (ret = %ld)\n", ret); printf("Error! ISFS_Open (ret = %d)\n", ret);
return 0; return 0;
} }
@ -141,21 +141,21 @@ u64 get_title_ios(u64 title)
ret = ISFS_Seek(fd, 0x184, 0); ret = ISFS_Seek(fd, 0x184, 0);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Seek (ret = %ld)\n", ret); printf("Error! ISFS_Seek (ret = %d)\n", ret);
return 0; return 0;
} }
ret = ISFS_Read(fd, tmd_buf, 8); ret = ISFS_Read(fd, tmd_buf, 8);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Read (ret = %ld)\n", ret); printf("Error! ISFS_Read (ret = %d)\n", ret);
return 0; return 0;
} }
ret = ISFS_Close(fd); ret = ISFS_Close(fd);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Close (ret = %ld)\n", ret); printf("Error! ISFS_Close (ret = %d)\n", ret);
return 0; return 0;
} }
@ -170,7 +170,7 @@ u64 get_title_ios(u64 title)
ret = ES_GetStoredTMD(title, s_tmd, tmd_size); ret = ES_GetStoredTMD(title, s_tmd, tmd_size);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ES_GetStoredTMD: %ld\n", ret); printf("Error! ES_GetStoredTMD: %d\n", ret);
return -1; return -1;
} }
tmd *t = SIGNATURE_PAYLOAD(s_tmd); tmd *t = SIGNATURE_PAYLOAD(s_tmd);
@ -220,7 +220,7 @@ char get_sysmenu_region(void)
ret = ES_GetNumTicketViews(tid, &views); ret = ES_GetNumTicketViews(tid, &views);
if (ret < 0) if (ret < 0)
{ {
printf(" Error! ES_GetNumTickets (ret = %ld)\n", ret); printf(" Error! ES_GetNumTickets (ret = %d)\n", ret);
wait_anyKey(); wait_anyKey();
return ret; return ret;
} }
@ -233,7 +233,7 @@ char get_sysmenu_region(void)
} }
else if (views > 16) else if (views > 16)
{ {
printf(" Too many ticket views! (views = %ld)\n", views); printf(" Too many ticket views! (views = %d)\n", views);
wait_anyKey(); wait_anyKey();
return 0; return 0;
} }
@ -241,7 +241,7 @@ char get_sysmenu_region(void)
ret = ES_GetTicketViews(tid, viewdata, 1); ret = ES_GetTicketViews(tid, viewdata, 1);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ES_OpenTitleContent (ret = %ld)\n", ret); printf("Error! ES_OpenTitleContent (ret = %d)\n", ret);
wait_anyKey(); wait_anyKey();
return 0; return 0;
} }
@ -249,7 +249,7 @@ char get_sysmenu_region(void)
ret = ES_OpenTitleContent(tid, viewdata, 1); ret = ES_OpenTitleContent(tid, viewdata, 1);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ES_OpenTitleContent (ret = %ld)\n", ret); printf("Error! ES_OpenTitleContent (ret = %d)\n", ret);
wait_anyKey(); wait_anyKey();
return 0; return 0;
} }
@ -262,7 +262,7 @@ char get_sysmenu_region(void)
ret = ES_ReadContent(cfd, fbuffer, 0x500); ret = ES_ReadContent(cfd, fbuffer, 0x500);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ES_ReadContent (ret = %ld)\n", ret); printf("Error! ES_ReadContent (ret = %d)\n", ret);
wait_anyKey(); wait_anyKey();
return 0; return 0;
} }
@ -282,7 +282,7 @@ char get_sysmenu_region(void)
ret = ES_CloseContent(cfd); ret = ES_CloseContent(cfd);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ES_CloseContent (ret = %ld)\n", ret); printf("Error! ES_CloseContent (ret = %d)\n", ret);
wait_anyKey(); wait_anyKey();
return 0; return 0;
} }

10
source/id.c
View File

@ -171,19 +171,19 @@ s32 Identify(const u8 *certs, u32 certs_size, const u8 *idtmd, u32 idtmd_size, c
switch (ret) switch (ret)
{ {
case ES_EINVAL: case ES_EINVAL:
printf("Error! ES_Identify (ret = %ld;) Data invalid!\n", ret); printf("Error! ES_Identify (ret = %d;) Data invalid!\n", ret);
break; break;
case ES_EALIGN: case ES_EALIGN:
printf("Error! ES_Identify (ret = %ld;) Data not aligned!\n", ret); printf("Error! ES_Identify (ret = %d;) Data not aligned!\n", ret);
break; break;
case ES_ENOTINIT: case ES_ENOTINIT:
printf("Error! ES_Identify (ret = %ld;) ES not initialized!\n", ret); printf("Error! ES_Identify (ret = %d;) ES not initialized!\n", ret);
break; break;
case ES_ENOMEM: case ES_ENOMEM:
printf("Error! ES_Identify (ret = %ld;) No memory!\n", ret); printf("Error! ES_Identify (ret = %d;) No memory!\n", ret);
break; break;
default: default:
printf("Error! ES_Identify (ret = %ld)\n", ret); printf("Error! ES_Identify (ret = %d)\n", ret);
break; break;
} }
#ifdef DEBUG_IDENT #ifdef DEBUG_IDENT

40
source/wiibasics.c
View File

@ -306,11 +306,11 @@ void hex_print_array16(const u8 *array, u32 size)
char line[17]; char line[17];
line[16] = 0; line[16] = 0;
if (size > page_size) if (size > page_size)
printf("Page 1 of %lu", (size / page_size) + 1); printf("Page 1 of %u", (size / page_size) + 1);
while (offset < size) while (offset < size)
{ {
if (!(offset % 16)) if (!(offset % 16))
printf("\n0x%08lX: ", offset); printf("\n0x%08X: ", offset);
printf("%02X", array[offset]); printf("%02X", array[offset]);
@ -362,7 +362,7 @@ s32 ISFS_ReadFileToArray(const char *filepath, u8 *filearray, u32 max_size, u32
ret = ISFS_Open(filepath, ISFS_OPEN_READ); ret = ISFS_Open(filepath, ISFS_OPEN_READ);
if (ret <= 0) if (ret <= 0)
{ {
printf("Error! ISFS_Open (ret = %ld)\n", ret); printf("Error! ISFS_Open (ret = %d)\n", ret);
return -1; return -1;
} }
@ -371,7 +371,7 @@ s32 ISFS_ReadFileToArray(const char *filepath, u8 *filearray, u32 max_size, u32
ret = ISFS_GetFileStats(fd, &filestats); ret = ISFS_GetFileStats(fd, &filestats);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_GetFileStats (ret = %ld)\n", ret); printf("Error! ISFS_GetFileStats (ret = %d)\n", ret);
return -1; return -1;
} }
@ -379,7 +379,7 @@ s32 ISFS_ReadFileToArray(const char *filepath, u8 *filearray, u32 max_size, u32
if (*file_size > max_size) if (*file_size > max_size)
{ {
printf("File is too large! Size: %lu Max: %lu", *file_size, max_size); printf("File is too large! Size: %u Max: %u", *file_size, max_size);
return -1; return -1;
} }
@ -387,19 +387,19 @@ s32 ISFS_ReadFileToArray(const char *filepath, u8 *filearray, u32 max_size, u32
*file_size = ret; *file_size = ret;
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Read (ret = %ld)\n", ret); printf("Error! ISFS_Read (ret = %d)\n", ret);
return -1; return -1;
} }
else if (ret != filestats.file_length) else if (ret != filestats.file_length)
{ {
printf("Error! ISFS_Read Only read: %ld\n", ret); printf("Error! ISFS_Read Only read: %d\n", ret);
return -1; return -1;
} }
ret = ISFS_Close(fd); ret = ISFS_Close(fd);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Close (ret = %ld)\n", ret); printf("Error! ISFS_Close (ret = %d)\n", ret);
return -1; return -1;
} }
return 0; return 0;
@ -425,7 +425,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ISFS_SetAttr(filepath, ownerID, groupID, attr, 3, 3, 3); ret = ISFS_SetAttr(filepath, ownerID, groupID, attr, 3, 3, 3);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_SetAttr (ret = %ld)\n", ret); printf("Error! ISFS_SetAttr (ret = %d)\n", ret);
out = -1; out = -1;
goto cleanup; goto cleanup;
} }
@ -439,7 +439,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ISFS_CreateFile(filepath, attr, 3, 3, 3); ret = ISFS_CreateFile(filepath, attr, 3, 3, 3);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_CreateFile (ret = %ld)\n", ret); printf("Error! ISFS_CreateFile (ret = %d)\n", ret);
out = -1; out = -1;
goto cleanup; goto cleanup;
} }
@ -448,7 +448,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
} }
else if (ret <= 0) else if (ret <= 0)
{ {
printf("Error! ISFS_Open WRITE (ret = %ld)\n", ret); printf("Error! ISFS_Open WRITE (ret = %d)\n", ret);
out = -1; out = -1;
goto cleanup; goto cleanup;
} }
@ -458,7 +458,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ISFS_Seek(fd, 0, 0); ret = ISFS_Seek(fd, 0, 0);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Seek (ret = %ld)\n", ret); printf("Error! ISFS_Seek (ret = %d)\n", ret);
out = -1; out = -1;
goto cleanup; goto cleanup;
} }
@ -466,21 +466,21 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ISFS_Write(fd, filearray, array_size); ret = ISFS_Write(fd, filearray, array_size);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Write (ret = %ld)\n", ret); printf("Error! ISFS_Write (ret = %d)\n", ret);
out = -1; out = -1;
goto cleanup; goto cleanup;
} }
if (ret != array_size) if (ret != array_size)
{ {
printf("Filesize is wrong! Wrote:%lu Expect:%lu", filestats.file_length, array_size); printf("Filesize is wrong! Wrote:%u Expect:%u", filestats.file_length, array_size);
out = -1; out = -1;
} }
ret = ISFS_Close(fd); ret = ISFS_Close(fd);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Close (ret = %ld)\n", ret); printf("Error! ISFS_Close (ret = %d)\n", ret);
return -1; return -1;
} }
fd = 0; fd = 0;
@ -513,7 +513,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ISFS_GetAttr(filepath, &realownid, &realgroupid, &realattr, &realownperm, &realgroupperm, &realotherperm); ret = ISFS_GetAttr(filepath, &realownid, &realgroupid, &realattr, &realownperm, &realgroupperm, &realotherperm);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_GetAttr (ret = %ld)\n", ret); printf("Error! ISFS_GetAttr (ret = %d)\n", ret);
out = -1; out = -1;
} }
@ -522,7 +522,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ES_GetTitleID(&currentTid); ret = ES_GetTitleID(&currentTid);
if (ret) if (ret)
{ {
printf("Fail GetTitleID %ld", ret); printf("Fail GetTitleID %d", ret);
if (wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B) if (wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
goto cleanup; goto cleanup;
} }
@ -539,7 +539,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ISFS_SetAttr(filepath, ownerID, groupID, attr, own_perm, group_perm, other_perm); ret = ISFS_SetAttr(filepath, ownerID, groupID, attr, own_perm, group_perm, other_perm);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_SetAttr (ret = %ld)\n", ret); printf("Error! ISFS_SetAttr (ret = %d)\n", ret);
out = -1; out = -1;
goto cleanup; goto cleanup;
} }
@ -549,7 +549,7 @@ s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array
ret = ES_SetUID(currentTid); ret = ES_SetUID(currentTid);
if (ret) if (ret)
{ {
printf("Fail SetUID %ld", ret); printf("Fail SetUID %d", ret);
if (wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B) if (wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
goto cleanup; goto cleanup;
} }
@ -561,7 +561,7 @@ cleanup:
ret = ISFS_Close(fd); ret = ISFS_Close(fd);
if (ret < 0) if (ret < 0)
{ {
printf("Error! ISFS_Close (ret = %ld)\n", ret); printf("Error! ISFS_Close (ret = %d)\n", ret);
return -1; return -1;
} }
} }