mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon.c: replace git_config() with git_config_get_bool() family

Browse Source 
Use `git_config_get_bool()` family instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.

Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tanay Abhra
2014-08-07 09:21:16 -07:00
committed by Junio C Hamano
parent 8a7b034d6d
commit 8939d32d81
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
daemon.c
View File

@ -230,23 +230,6 @@ struct daemon_service {
int overridable; int overridable;
}; };
static struct daemon_service *service_looking_at;
static int service_enabled;
static int git_daemon_config(const char *var, const char *value, void *cb)
{
const char *service;
if (skip_prefix(var, "daemon.", &service) &&
!strcmp(service, service_looking_at->config_name)) {
service_enabled = git_config_bool(var, value);
return 0;
}
/* we are not interested in parsing any other configuration here */
return 0;
}
static int daemon_error(const char *dir, const char *msg) static int daemon_error(const char *dir, const char *msg)
{ {
if (!informative_errors) if (!informative_errors)
@ -324,6 +307,7 @@ static int run_service(const char *dir, struct daemon_service *service)
{ {
const char *path; const char *path;
int enabled = service->enabled; int enabled = service->enabled;
struct strbuf var = STRBUF_INIT;
loginfo("Request %s for '%s'", service->name, dir); loginfo("Request %s for '%s'", service->name, dir);
@ -354,11 +338,9 @@ static int run_service(const char *dir, struct daemon_service *service)
} }
if (service->overridable) { if (service->overridable) {
service_looking_at = service; strbuf_addf(&var, "daemon.%s", service->config_name);
service_enabled = -1; git_config_get_bool(var.buf, &enabled);
git_config(git_daemon_config, NULL); strbuf_release(&var);
if (0 <= service_enabled)
enabled = service_enabled;
} }
if (!enabled) { if (!enabled) {
logerror("'%s': service not enabled for '%s'", logerror("'%s': service not enabled for '%s'",