Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit71bb851

Browse files
committed
config: propagate errors from get_backend_for_use
Now that get_backend_for_use can return other error codes (by virtueof key-name normalization), make sure to propagate the appropriateerror code when used.
1 parent1e85681 commit71bb851

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

‎src/libgit2/config.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -646,9 +646,10 @@ static int get_backend_for_use(git_config_backend **out,
646646
intgit_config_delete_entry(git_config*cfg,constchar*name)
647647
{
648648
git_config_backend*backend;
649+
interror=0;
649650

650-
if (get_backend_for_use(&backend,cfg,name,BACKEND_USE_DELETE)<0)
651-
returnGIT_ENOTFOUND;
651+
if ((error=get_backend_for_use(&backend,cfg,name,BACKEND_USE_DELETE))<0)
652+
returnerror;
652653

653654
returnbackend->del(backend,name);
654655
}
@@ -680,8 +681,8 @@ int git_config_set_string(git_config *cfg, const char *name, const char *value)
680681
return-1;
681682
}
682683

683-
if (get_backend_for_use(&backend,cfg,name,BACKEND_USE_SET)<0)
684-
returnGIT_ENOTFOUND;
684+
if ((error=get_backend_for_use(&backend,cfg,name,BACKEND_USE_SET))<0)
685+
returnerror;
685686

686687
error=backend->set(backend,name,value);
687688

@@ -1121,19 +1122,21 @@ int git_config_multivar_iterator_new(git_config_iterator **out, const git_config
11211122
intgit_config_set_multivar(git_config*cfg,constchar*name,constchar*regexp,constchar*value)
11221123
{
11231124
git_config_backend*backend;
1125+
interror=0;
11241126

1125-
if (get_backend_for_use(&backend,cfg,name,BACKEND_USE_DELETE)<0)
1126-
returnGIT_ENOTFOUND;
1127+
if ((error=get_backend_for_use(&backend,cfg,name,BACKEND_USE_SET))<0)
1128+
returnerror;
11271129

11281130
returnbackend->set_multivar(backend,name,regexp,value);
11291131
}
11301132

11311133
intgit_config_delete_multivar(git_config*cfg,constchar*name,constchar*regexp)
11321134
{
11331135
git_config_backend*backend;
1136+
interror=0;
11341137

1135-
if (get_backend_for_use(&backend,cfg,name,BACKEND_USE_DELETE)<0)
1136-
returnGIT_ENOTFOUND;
1138+
if ((error=get_backend_for_use(&backend,cfg,name,BACKEND_USE_DELETE))<0)
1139+
returnerror;
11371140

11381141
returnbackend->del_multivar(backend,name,regexp);
11391142
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp