Junio C Hamano <gitster@xxxxxxxxx> writes:
>> +struct libgit_config_set *libgit_configset_alloc(void)
>> +{
>> + return git_configset_alloc();
>> +}
>
> git_configset_alloc() returns "struct config_set *" while this thing
> returns an incompatible pointer.
>
> Sent out an outdated version or something? This wouldn't have
> passed even a compile test, I suspect.
The "shim" layer should hide the details of interfacing to the git
proper from callers, as well as it should hide the callers' from the
git proper. So if you really want to hide "struct config_set" from
your library callers, you may need to do something like the
attached, perhaps? At least this does pass compilation test.
.../libgit-rs/libgit-sys/public_symbol_export.h | 11 +++++++++
.../libgit-rs/libgit-sys/public_symbol_export.c | 26 ++++++++++++----------
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git c/contrib/libgit-rs/libgit-sys/public_symbol_export.h w/contrib/libgit-rs/libgit-sys/public_symbol_export.h
index 3933698976..70701ca63e 100644
--- c/contrib/libgit-rs/libgit-sys/public_symbol_export.h
+++ w/contrib/libgit-rs/libgit-sys/public_symbol_export.h
@@ -1,6 +1,17 @@
#ifndef PUBLIC_SYMBOL_EXPORT_H
#define PUBLIC_SYMBOL_EXPORT_H
+/* shim */
+struct libgit_config_set {
+ struct config_set cs;
+ /*
+ * the shim layer may want to add more members below, but then
+ * it may need to wrap underlying config_set differently,
+ * e.g., store a pointer of an allocated config_set in this
+ * shim structure.
+ */
+};
+
const char *libgit_setup_git_directory(void);
int libgit_config_get_int(const char *key, int *dest);
diff --git c/contrib/libgit-rs/libgit-sys/public_symbol_export.c w/contrib/libgit-rs/libgit-sys/public_symbol_export.c
index 07d6bfdd84..6f5eb3b249 100644
--- c/contrib/libgit-rs/libgit-sys/public_symbol_export.c
+++ w/contrib/libgit-rs/libgit-sys/public_symbol_export.c
@@ -3,12 +3,13 @@
// avoid conflicts with other libraries such as libgit2.
#include "git-compat-util.h"
-#include "contrib/libgit-rs/libgit-sys/public_symbol_export.h"
#include "common-init.h"
#include "config.h"
#include "setup.h"
#include "version.h"
+#include "contrib/libgit-rs/libgit-sys/public_symbol_export.h"
+
extern struct repository *the_repository;
#pragma GCC visibility push(default)
@@ -35,32 +36,33 @@ int libgit_parse_maybe_bool(const char *val)
struct libgit_config_set *libgit_configset_alloc(void)
{
- return git_configset_alloc();
+ void *cs = git_configset_alloc();
+ return (struct libgit_config_set *)cs;
}
-void libgit_configset_clear_and_free(struct libgit_config_set *cs)
+void libgit_configset_clear_and_free(struct libgit_config_set *lgcs)
{
- git_configset_clear_and_free(cs);
+ git_configset_clear_and_free(&lgcs->cs);
}
-void libgit_configset_init(struct libgit_config_set *cs)
+void libgit_configset_init(struct libgit_config_set *lgcs)
{
- git_configset_init(cs);
+ git_configset_init(&lgcs->cs);
}
-int libgit_configset_add_file(struct libgit_config_set *cs, const char *filename)
+int libgit_configset_add_file(struct libgit_config_set *lgcs, const char *filename)
{
- return git_configset_add_file(cs, filename);
+ return git_configset_add_file(&lgcs->cs, filename);
}
-int libgit_configset_get_int(struct libgit_config_set *cs, const char *key, int *dest)
+int libgit_configset_get_int(struct libgit_config_set *lgcs, const char *key, int *dest)
{
- return git_configset_get_int(cs, key, dest);
+ return git_configset_get_int(&lgcs->cs, key, dest);
}
-int libgit_configset_get_string(struct libgit_config_set *cs, const char *key, char **dest)
+int libgit_configset_get_string(struct libgit_config_set *lgcs, const char *key, char **dest)
{
- return git_configset_get_string(cs, key, dest);
+ return git_configset_get_string(&lgcs->cs, key, dest);
}
const char *libgit_user_agent(void)
