diff --git a/desmume/src/cp15.cpp b/desmume/src/cp15.cpp index 127547e..b0d57ab 100755 --- a/desmume/src/cp15.cpp +++ b/desmume/src/cp15.cpp @@ -377,7 +377,7 @@ BOOL armcp15_t::moveCP2ARM(u32 * R, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2) } return FALSE; case 9: - if((opcode1==0)) + if(opcode1==0) { switch(CRm) { @@ -556,7 +556,7 @@ BOOL armcp15_t::moveARM2CP(u32 val, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2) } return FALSE; case 9: - if((opcode1==0)) + if(opcode1==0) { switch(CRm) { diff --git a/desmume/src/utils/vfat.cpp b/desmume/src/utils/vfat.cpp index a1d54b0..16c46c6 100755 --- a/desmume/src/utils/vfat.cpp +++ b/desmume/src/utils/vfat.cpp @@ -171,7 +171,7 @@ bool VFAT::build(const char* path, int extra_MB) if(dataSectors>=(0x80000000>>9)) { - printf("error allocating memory for fat (%d KBytes)\n",(dataSectors*512)/1024); + printf("error allocating memory for fat (%llu KBytes)\n",(dataSectors*512)/1024); printf("total fat sizes > 2GB are never going to work\n"); } @@ -181,7 +181,7 @@ bool VFAT::build(const char* path, int extra_MB) if(file == NULL) { - printf("error allocating memory for fat (%d KBytes)\n",(dataSectors*512)/1024); + printf("error allocating memory for fat (%llu KBytes)\n",(dataSectors*512)/1024); printf("(out of memory)\n"); return false; } diff --git a/iNDS/7zMain.c b/iNDS/7zMain.c index 5680588..c0ed340 100755 --- a/iNDS/7zMain.c +++ b/iNDS/7zMain.c @@ -774,17 +774,17 @@ int do7z_extract_entry(char *archivePath, char *archiveCachePath, char *entryNam return 0; } if (res == SZ_ERROR_UNSUPPORTED) { - return 3; - PrintError("decoder doesn't support this archive"); + PrintError("decoder doesn't support this archive"); + return 3; } else if (res == SZ_ERROR_MEM) { - return 4; - PrintError("can not allocate memory"); + PrintError("can not allocate memory"); + return 4; } else if (res == SZ_ERROR_CRC) { - return 5; - PrintError("CRC error"); + PrintError("CRC error"); + return 5; } else { - return 6; - printf("\nERROR #%d\n", res); + printf("\nERROR #%d\n", res); + return 6; } return 7; } diff --git a/iNDS/AppDelegate.m b/iNDS/AppDelegate.m index c22bcb7..6ddfaff 100644 --- a/iNDS/AppDelegate.m +++ b/iNDS/AppDelegate.m @@ -83,8 +83,7 @@ - (void)startBackgroundProcesses } else { NSString *plistPath = [[NSBundle mainBundle] pathForResource:@"Info" ofType:@"plist"]; NSData *plistData = [NSData dataWithContentsOfFile:plistPath]; - NSDictionary *loadedPlist = - [NSPropertyListSerialization propertyListFromData:plistData mutabilityOption:0 format:NULL errorDescription:NULL]; + NSDictionary *loadedPlist = [NSPropertyListSerialization propertyListWithData:plistData options:0 format:NULL error:NULL]; NSString *scheme = [[[[loadedPlist objectForKey:@"CFBundleURLTypes"] objectAtIndex:0] objectForKey:@"CFBundleURLSchemes"] objectAtIndex:0]; if ([scheme isEqual:@"db-APP_KEY"]) { errorMsg = @"You must set the URL Scheme correctly in iNDS-Info.plist for Dropbox to work!"; diff --git a/iNDS/Base.lproj/MainStoryboard.storyboard b/iNDS/Base.lproj/MainStoryboard.storyboard index 196cf0d..78d6507 100755 --- a/iNDS/Base.lproj/MainStoryboard.storyboard +++ b/iNDS/Base.lproj/MainStoryboard.storyboard @@ -1,5 +1,5 @@ - + @@ -18,10 +18,10 @@ - + - + @@ -45,10 +45,10 @@ - + - + @@ -72,10 +72,10 @@ - + - + - + - + - + - + @@ -153,10 +153,10 @@ - + - +