Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-07-03 19:04:40 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-07-03 19:18:16 +0300
commitd2db481dc70bba7b5ca2c3bf01e8748155fcefad (patch)
treec587f36b76c075bd3ecb4be48104fe1ce82d5e15 /source/blender/blenkernel/intern/appdir.c
parenta21cb22f8b12ea73937e7e6eda8465f1cba02b6e (diff)
Cleanup: Blendkernel, Clang-Tidy else-after-return fixes (incomplete)
This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/blenkernel` module. Not all warnings are addressed in this commit. No functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/appdir.c')
-rw-r--r--source/blender/blenkernel/intern/appdir.c42
1 files changed, 17 insertions, 25 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 8189385a69d..58337bcf488 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -154,13 +154,12 @@ static bool test_path(char *targetpath,
#endif
return true;
}
- else {
+
#ifdef PATH_DEBUG
- printf("\t%s missing: %s\n", __func__, targetpath);
+ printf("\t%s missing: %s\n", __func__, targetpath);
#endif
- // targetpath[0] = '\0';
- return false;
- }
+ // targetpath[0] = '\0';
+ return false;
}
/**
@@ -181,13 +180,12 @@ static bool test_env_path(char *path, const char *envvar)
#endif
return true;
}
- else {
- path[0] = '\0';
+
+ path[0] = '\0';
#ifdef PATH_DEBUG
- printf("\t%s env %s missing: %s\n", __func__, envvar, env);
+ printf("\t%s env %s missing: %s\n", __func__, envvar, env);
#endif
- return false;
- }
+ return false;
}
/**
@@ -272,10 +270,8 @@ static bool get_path_environment(char *targetpath,
if (subfolder_name) {
return test_path(targetpath, targetpath_len, user_path, NULL, subfolder_name);
}
- else {
- BLI_strncpy(targetpath, user_path, FILE_MAX);
- return true;
- }
+ BLI_strncpy(targetpath, user_path, FILE_MAX);
+ return true;
}
return false;
}
@@ -300,10 +296,8 @@ static bool get_path_environment_notest(char *targetpath,
BLI_join_dirfile(targetpath, targetpath_len, user_path, subfolder_name);
return true;
}
- else {
- BLI_strncpy(targetpath, user_path, FILE_MAX);
- return true;
- }
+ BLI_strncpy(targetpath, user_path, FILE_MAX);
+ return true;
}
return false;
}
@@ -347,9 +341,8 @@ static bool get_path_user(char *targetpath,
if (subfolder_name) {
return test_path(targetpath, targetpath_len, user_path, folder_name, subfolder_name);
}
- else {
- return test_path(targetpath, targetpath_len, user_path, NULL, folder_name);
- }
+
+ return test_path(targetpath, targetpath_len, user_path, NULL, folder_name);
}
/**
@@ -401,10 +394,9 @@ static bool get_path_system(char *targetpath,
/* try $BLENDERPATH/folder_name/subfolder_name */
return test_path(targetpath, targetpath_len, system_path, folder_name, subfolder_name);
}
- else {
- /* try $BLENDERPATH/folder_name */
- return test_path(targetpath, targetpath_len, system_path, NULL, folder_name);
- }
+
+ /* try $BLENDERPATH/folder_name */
+ return test_path(targetpath, targetpath_len, system_path, NULL, folder_name);
}
/**