luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 18:18:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

girepository: Always use internal functions in internal implementations

Browse Source 
We are going to have a different logic in the public function so let's
just use the same code internally
This commit is contained in:
Marco Trevisan (Treviño)
2025-08-18 13:41:23 +02:00
parent 0a017b39c2
commit 8f25f70fc9
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
girepository/girepository.c
View File

@@ -135,6 +135,15 @@ struct _GIRepository
G_DEFINE_TYPE (GIRepository, gi_repository, G_TYPE_OBJECT); G_DEFINE_TYPE (GIRepository, gi_repository, G_TYPE_OBJECT);
static GITypelib *
require_internal (GIRepository *repository,
const char *namespace,
const char *version,
GIRepositoryLoadFlags flags,
const char * const *search_paths,
size_t n_search_paths,
GError **error);
#ifdef G_PLATFORM_WIN32 #ifdef G_PLATFORM_WIN32
#include <windows.h> #include <windows.h>
@@ -596,6 +605,10 @@ load_dependencies_recurse (GIRepository *repository,
{ {
int i; int i;
const char * const *search_path =
(const char * const *) repository->typelib_search_path->pdata;
gsize search_path_len = repository->typelib_search_path->len;
for (i = 0; dependencies[i]; i++) for (i = 0; dependencies[i]; i++)
{ {
char *dependency = dependencies[i]; char *dependency = dependencies[i];
@@ -608,8 +621,9 @@ load_dependencies_recurse (GIRepository *repository,
dependency_namespace = g_strndup (dependency, (size_t) (last_dash - dependency)); dependency_namespace = g_strndup (dependency, (size_t) (last_dash - dependency));
dependency_version = last_dash+1; dependency_version = last_dash+1;
if (!gi_repository_require (repository, dependency_namespace, dependency_version, if (!require_internal (repository, dependency_namespace, dependency_version,
0, error)) 0, search_path, search_path_len,
error))
{ {
g_free (dependency_namespace); g_free (dependency_namespace);
g_strfreev (dependencies); g_strfreev (dependencies);