config: add options parameter to git_config_from_mem

The underlying config parser knows how to handle a
config_options struct, but git_config_from_mem() always
passes NULL. Let's allow our callers to specify the options
struct.

We could add a "_with_options" variant, but since there are
only a handful of callers, let's just update them to pass
NULL.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.c b/config.c
index ce02ceaf982920d53b1be0e3e2c58ba38e732c84..60132e3774c281a9ccaa483122d614d3fe4e1460 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1569,8 +1569,10 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
        return git_config_from_file_with_options(fn, filename, data, NULL);
 }
 
        return git_config_from_file_with_options(fn, filename, data, NULL);
 }
 

-int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_type,
-                       const char *name, const char *buf, size_t len, void *data)
+int git_config_from_mem(config_fn_t fn,
+                       const enum config_origin_type origin_type,
+                       const char *name, const char *buf, size_t len,
+                       void *data, const struct config_options *opts)

 {
        struct config_source top;
 
 {
        struct config_source top;
 


@@ -1585,7 +1587,7 @@ int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_typ
        top.do_ungetc = config_buf_ungetc;
        top.do_ftell = config_buf_ftell;
 
        top.do_ungetc = config_buf_ungetc;
        top.do_ftell = config_buf_ftell;
 

-       return do_config_from(&top, fn, data, NULL);
+       return do_config_from(&top, fn, data, opts);

 }
 
 int git_config_from_blob_oid(config_fn_t fn,
 }
 
 int git_config_from_blob_oid(config_fn_t fn,


@@ -1606,7 +1608,8 @@ int git_config_from_blob_oid(config_fn_t fn,
                return error("reference '%s' does not point to a blob", name);
        }
 
                return error("reference '%s' does not point to a blob", name);
        }
 

-       ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size, data);
+       ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size,
+                                 data, NULL);

        free(buf);
 
        return ret;
        free(buf);
 
        return ret;

diff --git a/config.h b/config.h
index c02809ffdc6e34153de06db7a3f35782118627f1..f2063ceb86f12d6bb6e56e62967a3d85195ca7fc 100644 (file)
--- a/config.h
+++ b/config.h
@@ -68,8 +68,11 @@ extern int git_config_from_file(config_fn_t fn, const char *, void *);
 extern int git_config_from_file_with_options(config_fn_t fn, const char *,
                                             void *,
                                             const struct config_options *);
 extern int git_config_from_file_with_options(config_fn_t fn, const char *,
                                             void *,
                                             const struct config_options *);

-extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
-                                       const char *name, const char *buf, size_t len, void *data);
+extern int git_config_from_mem(config_fn_t fn,
+                              const enum config_origin_type,
+                              const char *name,
+                              const char *buf, size_t len,
+                              void *data, const struct config_options *opts);

 extern int git_config_from_blob_oid(config_fn_t fn, const char *name,
                                    const struct object_id *oid, void *data);
 extern void git_config_push_parameter(const char *text);
 extern int git_config_from_blob_oid(config_fn_t fn, const char *name,
                                    const struct object_id *oid, void *data);
 extern void git_config_push_parameter(const char *text);

diff --git a/fsck.c b/fsck.c
index 0b8b20b6c464cdfbbb8afd9685f45e3e2e67adfa..aa7a52cc801f219d3b71bbffedc655a22456bbfa 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -1012,7 +1012,7 @@ static int fsck_blob(struct blob *blob, const char *buf,
        data.options = options;
        data.ret = 0;
        if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB,
        data.options = options;
        data.ret = 0;
        if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB,

-                               ".gitmodules", buf, size, &data))
+                               ".gitmodules", buf, size, &data, NULL))

                data.ret |= report(options, &blob->object,
                                   FSCK_MSG_GITMODULES_PARSE,
                                   "could not parse gitmodules blob");
                data.ret |= report(options, &blob->object,
                                   FSCK_MSG_GITMODULES_PARSE,
                                   "could not parse gitmodules blob");

diff --git a/submodule-config.c b/submodule-config.c
index 388ef1f892bdd63a485d9c93810a945fc3eab46f..2ca3272dd1cfbc34ff1071c89aa8088ba01ebdc5 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -561,7 +561,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
        parameter.gitmodules_oid = &oid;
        parameter.overwrite = 0;
        git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
        parameter.gitmodules_oid = &oid;
        parameter.overwrite = 0;
        git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,

-                       config, config_size, &parameter);
+                       config, config_size, &parameter, NULL);

        strbuf_release(&rev);
        free(config);
 
        strbuf_release(&rev);
        free(config);