mirror of
https://github.com/git/git.git
synced 2024-06-01 13:36:12 +02:00
config: make git_config_include() static
It is not used from outside the file in which it is declared. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Acked-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
abe6bb3905
commit
ed69e11b89
12
config.c
12
config.c
|
@ -120,6 +120,16 @@ static long config_buf_ftell(struct config_source *conf)
|
||||||
return conf->u.buf.pos;
|
return conf->u.buf.pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct config_include_data {
|
||||||
|
int depth;
|
||||||
|
config_fn_t fn;
|
||||||
|
void *data;
|
||||||
|
const struct config_options *opts;
|
||||||
|
};
|
||||||
|
#define CONFIG_INCLUDE_INIT { 0 }
|
||||||
|
|
||||||
|
static int git_config_include(const char *var, const char *value, void *data);
|
||||||
|
|
||||||
#define MAX_INCLUDE_DEPTH 10
|
#define MAX_INCLUDE_DEPTH 10
|
||||||
static const char include_depth_advice[] = N_(
|
static const char include_depth_advice[] = N_(
|
||||||
"exceeded maximum include depth (%d) while including\n"
|
"exceeded maximum include depth (%d) while including\n"
|
||||||
|
@ -309,7 +319,7 @@ static int include_condition_is_true(const struct config_options *opts,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int git_config_include(const char *var, const char *value, void *data)
|
static int git_config_include(const char *var, const char *value, void *data)
|
||||||
{
|
{
|
||||||
struct config_include_data *inc = data;
|
struct config_include_data *inc = data;
|
||||||
const char *cond, *key;
|
const char *cond, *key;
|
||||||
|
|
37
config.h
37
config.h
|
@ -126,6 +126,8 @@ int git_default_config(const char *, const char *, void *);
|
||||||
/**
|
/**
|
||||||
* Read a specific file in git-config format.
|
* Read a specific file in git-config format.
|
||||||
* This function takes the same callback and data parameters as `git_config`.
|
* This function takes the same callback and data parameters as `git_config`.
|
||||||
|
*
|
||||||
|
* Unlike git_config(), this function does not respect includes.
|
||||||
*/
|
*/
|
||||||
int git_config_from_file(config_fn_t fn, const char *, void *);
|
int git_config_from_file(config_fn_t fn, const char *, void *);
|
||||||
|
|
||||||
|
@ -158,6 +160,8 @@ void read_very_early_config(config_fn_t cb, void *data);
|
||||||
* will first feed the user-wide one to the callback, and then the
|
* will first feed the user-wide one to the callback, and then the
|
||||||
* repo-specific one; by overwriting, the higher-priority repo-specific
|
* repo-specific one; by overwriting, the higher-priority repo-specific
|
||||||
* value is left at the end).
|
* value is left at the end).
|
||||||
|
*
|
||||||
|
* Unlike git_config_from_file(), this function respects includes.
|
||||||
*/
|
*/
|
||||||
void git_config(config_fn_t fn, void *);
|
void git_config(config_fn_t fn, void *);
|
||||||
|
|
||||||
|
@ -338,39 +342,6 @@ const char *current_config_origin_type(void);
|
||||||
const char *current_config_name(void);
|
const char *current_config_name(void);
|
||||||
int current_config_line(void);
|
int current_config_line(void);
|
||||||
|
|
||||||
/**
|
|
||||||
* Include Directives
|
|
||||||
* ------------------
|
|
||||||
*
|
|
||||||
* By default, the config parser does not respect include directives.
|
|
||||||
* However, a caller can use the special `git_config_include` wrapper
|
|
||||||
* callback to support them. To do so, you simply wrap your "real" callback
|
|
||||||
* function and data pointer in a `struct config_include_data`, and pass
|
|
||||||
* the wrapper to the regular config-reading functions. For example:
|
|
||||||
*
|
|
||||||
* -------------------------------------------
|
|
||||||
* int read_file_with_include(const char *file, config_fn_t fn, void *data)
|
|
||||||
* {
|
|
||||||
* struct config_include_data inc = CONFIG_INCLUDE_INIT;
|
|
||||||
* inc.fn = fn;
|
|
||||||
* inc.data = data;
|
|
||||||
* return git_config_from_file(git_config_include, file, &inc);
|
|
||||||
* }
|
|
||||||
* -------------------------------------------
|
|
||||||
*
|
|
||||||
* `git_config` respects includes automatically. The lower-level
|
|
||||||
* `git_config_from_file` does not.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
struct config_include_data {
|
|
||||||
int depth;
|
|
||||||
config_fn_t fn;
|
|
||||||
void *data;
|
|
||||||
const struct config_options *opts;
|
|
||||||
};
|
|
||||||
#define CONFIG_INCLUDE_INIT { 0 }
|
|
||||||
int git_config_include(const char *name, const char *value, void *data);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Match and parse a config key of the form:
|
* Match and parse a config key of the form:
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue