From d24dda0bc02a816887e2f34c3790d7a401f8bd98 Mon Sep 17 00:00:00 2001 From: jakcron Date: Sat, 9 Jul 2016 16:38:05 +0800 Subject: [PATCH] Fixes issue #39 --- ctrtool/main.c | 2 +- ctrtool/settings.c | 26 +++++++++++++------------- ctrtool/settings.h | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ctrtool/main.c b/ctrtool/main.c index 8282c9b..dd8ef88 100644 --- a/ctrtool/main.c +++ b/ctrtool/main.c @@ -224,7 +224,7 @@ int main(int argc, char* argv[]) case 4: settings_set_tik_path(&ctx.usersettings, optarg); break; case 5: settings_set_tmd_path(&ctx.usersettings, optarg); break; case 6: settings_set_content_path(&ctx.usersettings, optarg); break; - case 7: settings_set_content_path(&ctx.usersettings, optarg); break; + case 7: settings_set_meta_path(&ctx.usersettings, optarg); break; case 8: settings_set_exefs_dir_path(&ctx.usersettings, optarg); break; case 9: settings_set_mediaunit_size(&ctx.usersettings, strtoul(optarg, 0, 0)); break; case 10: ctx.actions |= ShowKeysFlag; break; diff --git a/ctrtool/settings.c b/ctrtool/settings.c index 7888d54..ddbf51b 100644 --- a/ctrtool/settings.c +++ b/ctrtool/settings.c @@ -104,14 +104,6 @@ filepath* settings_get_tmd_path(settings* usersettings) return 0; } -filepath* settings_get_meta_path(settings* usersettings) -{ - if (usersettings) - return &usersettings->metapath; - else - return 0; -} - filepath* settings_get_content_path(settings* usersettings) { if (usersettings) @@ -120,6 +112,14 @@ filepath* settings_get_content_path(settings* usersettings) return 0; } +filepath* settings_get_meta_path(settings* usersettings) +{ + if (usersettings) + return &usersettings->metapath; + else + return 0; +} + filepath* settings_get_plainrgn_path(settings* usersettings) { if (usersettings) @@ -243,16 +243,16 @@ void settings_set_tmd_path(settings* usersettings, const char* path) filepath_set(&usersettings->tmdpath, path); } -void settings_set_meta_path(settings* usersettings, const char* path) -{ - filepath_set(&usersettings->metapath, path); -} - void settings_set_content_path(settings* usersettings, const char* path) { filepath_set(&usersettings->contentpath, path); } +void settings_set_meta_path(settings* usersettings, const char* path) +{ + filepath_set(&usersettings->metapath, path); +} + void settings_set_exefs_dir_path(settings* usersettings, const char* path) { filepath_set(&usersettings->exefsdirpath, path); diff --git a/ctrtool/settings.h b/ctrtool/settings.h index 30b42d2..2822b93 100644 --- a/ctrtool/settings.h +++ b/ctrtool/settings.h @@ -38,8 +38,8 @@ filepath* settings_get_logo_path(settings* usersettings); filepath* settings_get_certs_path(settings* usersettings); filepath* settings_get_tik_path(settings* usersettings); filepath* settings_get_tmd_path(settings* usersettings); -filepath* settings_get_meta_path(settings* usersettings); filepath* settings_get_content_path(settings* usersettings); +filepath* settings_get_meta_path(settings* usersettings); filepath* settings_get_exefs_dir_path(settings* usersettings); filepath* settings_get_romfs_dir_path(settings* usersettings); filepath* settings_get_firm_dir_path(settings* usersettings); @@ -62,8 +62,8 @@ void settings_set_logo_path(settings* usersettings, const char* path); void settings_set_certs_path(settings* usersettings, const char* path); void settings_set_tik_path(settings* usersettings, const char* path); void settings_set_tmd_path(settings* usersettings, const char* path); -void settings_set_meta_path(settings* usersettings, const char* path); void settings_set_content_path(settings* usersettings, const char* path); +void settings_set_meta_path(settings* usersettings, const char* path); void settings_set_exefs_dir_path(settings* usersettings, const char* path); void settings_set_romfs_dir_path(settings* usersettings, const char* path); void settings_set_firm_dir_path(settings* usersettings, const char* path);