bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf.c: remove unnecessary _add_mirror function

Browse source 
It does very little, is only used in one place, and can't easily be
reused for other server types due to the inclusion of an error message.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
This commit is contained in:
Andrew Gregory 2023-11-22 14:22:09 -08:00 • committed by Allan McRae
parent 45e94e2dae
commit bad3e13eaa
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/pacman/conf.c
View file

@ -781,18 +781,6 @@ static char *replace_server_vars(config_t *c, config_repo_t *r, const char *s)
} }
} }
static int _add_mirror(alpm_db_t *db, char *value)
{
if(alpm_db_add_server(db, value) != 0) {
/* pm_errno is set by alpm_db_setserver */
pm_printf(ALPM_LOG_ERROR, _("could not add server URL to database '%s': %s (%s)\n"),
alpm_db_get_name(db), value, alpm_strerror(alpm_errno(config->handle)));
return 1;
}
return 0;
}
static int register_repo(config_repo_t *repo) static int register_repo(config_repo_t *repo)
{ {
alpm_list_t *i; alpm_list_t *i;
@ -810,7 +798,11 @@ static int register_repo(config_repo_t *repo)
alpm_db_set_usage(db, repo->usage); alpm_db_set_usage(db, repo->usage);
for(i = repo->servers; i; i = alpm_list_next(i)) { for(i = repo->servers; i; i = alpm_list_next(i)) {
if(_add_mirror(db, i->data) != 0) { const char *value = i->data;
if(alpm_db_add_server(db, value) != 0) {
/* pm_errno is set by alpm_db_setserver */
pm_printf(ALPM_LOG_ERROR, _("could not add server URL to database '%s': %s (%s)\n"),
alpm_db_get_name(db), value, alpm_strerror(alpm_errno(config->handle)));
return 1; return 1;
} }
} }