Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6184 from boretrk/noflexarray

Browse Source 
diff_driver: split global_drivers array into separate elements
This commit is contained in:
Edward Thomson
2022-01-20 09:09:31 -05:00
committed by GitHub
parent 4fead63671 5388e0c118
commit 50eb7d31f2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/diff_driver.c
View File

@@ -51,11 +51,9 @@ struct git_diff_driver_registry {
#define FORCE_DIFFABLE (GIT_DIFF_FORCE_TEXT | GIT_DIFF_FORCE_BINARY)
static git_diff_driver global_drivers[3] = {
{ DIFF_DRIVER_AUTO, 0, 0, },
{ DIFF_DRIVER_BINARY, GIT_DIFF_FORCE_BINARY, 0 },
{ DIFF_DRIVER_TEXT, GIT_DIFF_FORCE_TEXT, 0 },
};
static git_diff_driver diff_driver_auto = { DIFF_DRIVER_AUTO, 0, 0 };
static git_diff_driver diff_driver_binary = { DIFF_DRIVER_BINARY, GIT_DIFF_FORCE_BINARY, 0 };
static git_diff_driver diff_driver_text = { DIFF_DRIVER_TEXT, GIT_DIFF_FORCE_TEXT, 0 };
git_diff_driver_registry *git_diff_driver_registry_new(void)
{
@@ -266,7 +264,7 @@ static int git_diff_driver_load(
switch (git_config__get_bool_force(cfg, name.ptr, -1)) {
case true:
/* if diff.<driver>.binary is true, just return the binary driver */
*out = &global_drivers[DIFF_DRIVER_BINARY];
*out = &diff_driver_binary;
goto done;
case false:
/* if diff.<driver>.binary is false, force binary checks off */
@@ -374,9 +372,9 @@ int git_diff_driver_lookup(
else if (GIT_ATTR_IS_UNSPECIFIED(values[0]))
/* just use the auto value */;
else if (GIT_ATTR_IS_FALSE(values[0]))
*out = &global_drivers[DIFF_DRIVER_BINARY];
*out = &diff_driver_binary;
else if (GIT_ATTR_IS_TRUE(values[0]))
*out = &global_drivers[DIFF_DRIVER_TEXT];
*out = &diff_driver_text;
/* otherwise look for driver information in config and build driver */
else if ((error = git_diff_driver_load(out, repo, values[0])) < 0) {
@@ -387,7 +385,7 @@ int git_diff_driver_lookup(
}
if (!*out)
*out = &global_drivers[DIFF_DRIVER_AUTO];
*out = &diff_driver_auto;
return error;
}