diff --git a/app/AppGroup.m b/app/AppGroup.m index 8d055e9e..53541f46 100644 --- a/app/AppGroup.m +++ b/app/AppGroup.m @@ -33,7 +33,7 @@ struct cs_entitlements { char entitlements[]; }; -static NSDictionary *AppEntitlements() { +static NSDictionary *AppEntitlements(void) { static NSDictionary *entitlements; if (entitlements != nil) return entitlements; @@ -101,7 +101,7 @@ NSArray *CurrentAppGroups(void) { return AppEntitlements()[@"com.apple.security.application-groups"]; } -NSURL *ContainerURL() { +NSURL *ContainerURL(void) { NSString *appGroup = CurrentAppGroups()[0]; return [NSFileManager.defaultManager containerURLForSecurityApplicationGroupIdentifier:appGroup]; } diff --git a/app/CurrentRoot.m b/app/CurrentRoot.m index 5d399740..51beb517 100644 --- a/app/CurrentRoot.m +++ b/app/CurrentRoot.m @@ -45,7 +45,7 @@ static int remove_directory(const char *path) { #define remove_directory linux_remove_directory #endif -void FsInitialize() { +void FsInitialize(void) { // /ish/version is the last ish version that opened this root. Used to migrate the filesystem. char buf[1000]; ssize_t n = read_file("/ish/version", buf, sizeof(buf)); @@ -76,15 +76,15 @@ void FsInitialize() { } } -bool FsIsManaged() { +bool FsIsManaged(void) { return fs_ish_version != 0; } -bool FsNeedsRepositoryUpdate() { +bool FsNeedsRepositoryUpdate(void) { return FsIsManaged() && fs_ish_apk_version < COMPATIBLE_APK_VERSION; } -void FsUpdateOnlyRepositoriesFile() { +void FsUpdateOnlyRepositoriesFile(void) { NSURL *repositories = [NSBundle.mainBundle URLForResource:@"repositories" withExtension:@"txt"]; if (repositories != nil) { NSMutableData *repositoriesData = [@"# This file contains pinned repositories managed by iSH. If the /ish directory\n" @@ -95,7 +95,7 @@ void FsUpdateOnlyRepositoriesFile() { } } -void FsUpdateRepositories() { +void FsUpdateRepositories(void) { NSString *currentVersion = NSBundle.mainBundle.infoDictionary[(__bridge NSString *) kCFBundleVersionKey]; NSString *currentVersionFile = [NSString stringWithFormat:@"%@\n", currentVersion]; FsUpdateOnlyRepositoriesFile(); diff --git a/app/Roots.m b/app/Roots.m index 51a6e1d0..bb77b40a 100644 --- a/app/Roots.m +++ b/app/Roots.m @@ -11,7 +11,7 @@ #import "NSObject+SaneKVO.h" #include "tools/fakefs.h" -static NSURL *RootsDir() { +static NSURL *RootsDir(void) { static NSURL *rootsDir; static dispatch_once_t token; dispatch_once(&token, ^{ diff --git a/app/hook.c b/app/hook.c index a488116d..903b054a 100644 --- a/app/hook.c +++ b/app/hook.c @@ -89,7 +89,7 @@ void *exception_handler(void *unused) { abort(); } -static bool initialize_if_needed() { +static bool initialize_if_needed(void) { if (initialized) { return true; } diff --git a/app/iOSFS.m b/app/iOSFS.m index 90414d06..de6923f7 100644 --- a/app/iOSFS.m +++ b/app/iOSFS.m @@ -102,10 +102,10 @@ static NSString *const kMountBookmarks = @"iOS Mount Bookmarks"; // To avoid locking issues, only access from the main thread static NSMutableDictionary *ios_mount_bookmarks; static bool mount_from_bookmarks = false; // This is a hack because I am bad at parameter passing -static void sync_bookmarks() { +static void sync_bookmarks(void) { [NSUserDefaults.standardUserDefaults setObject:ios_mount_bookmarks forKey:kMountBookmarks]; } -void iosfs_init() { +void iosfs_init(void) { ios_mount_bookmarks = [NSUserDefaults.standardUserDefaults dictionaryForKey:kMountBookmarks].mutableCopy; if (ios_mount_bookmarks == nil) ios_mount_bookmarks = [NSMutableDictionary new]; diff --git a/deps/linux b/deps/linux index 5cf14a7b..b5c2eb8b 160000 --- a/deps/linux +++ b/deps/linux @@ -1 +1 @@ -Subproject commit 5cf14a7b3ebd2995e084551e537e0c9c0053cec3 +Subproject commit b5c2eb8b25563cd223a04943b2ed2ba031232476