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

Rename metadata to typelib in variable names, comments and apis.

Browse Source 
2008-08-09  Johan Dahlin  <johan@gnome.org>

    * *.[ch]:
    Rename metadata to typelib in variable names,
    comments and apis.


svn path=/trunk/; revision=339
This commit is contained in:
Johan Dahlin 2008-08-09 12:55:32 +00:00 committed by Johan Dahlin
parent 282a6c644e
commit 33455bc3ef
10 changed files with 632 additions and 632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

414
ginfo.c
View File

File diff suppressed because it is too large Load Diff

6
ginvoke.c
View File

@ -163,7 +163,7 @@ g_function_info_invoke (GIFunctionInfo *info,
symbol = g_function_info_get_symbol (info); symbol = g_function_info_get_symbol (info);
if (!g_module_symbol (g_base_info_get_metadata((GIBaseInfo *) info)->module, if (!g_module_symbol (g_base_info_get_typelib((GIBaseInfo *) info)->module,
symbol, &func)) symbol, &func))
{ {
GModule *entire_app; GModule *entire_app;
@ -172,7 +172,7 @@ g_function_info_invoke (GIFunctionInfo *info,
* We want to be able to add symbols to an app or an auxiliary * We want to be able to add symbols to an app or an auxiliary
* library to fill in gaps in an introspected library. However, * library to fill in gaps in an introspected library. However,
* normally we would only look for symbols in the main library * normally we would only look for symbols in the main library
* (metadata->module). * (typelib->module).
* *
* A more elaborate solution is probably possible, but as a * A more elaborate solution is probably possible, but as a
* simple approach for now, if we fail to find a symbol we look * simple approach for now, if we fail to find a symbol we look
@ -180,7 +180,7 @@ g_function_info_invoke (GIFunctionInfo *info,
* *
* This would not be very efficient if it happened often, since * This would not be very efficient if it happened often, since
* we always do the failed lookup above first, but very few * we always do the failed lookup above first, but very few
* symbols should be outside of metadata->module so it doesn't * symbols should be outside of typelib->module so it doesn't
* matter. * matter.
*/ */
entire_app = g_module_open (NULL, 0); entire_app = g_module_open (NULL, 0);

152
girepository.c
View File

@ -29,12 +29,12 @@
#include "gtypelib.h" #include "gtypelib.h"
static GIRepository *default_repository = NULL; static GIRepository *default_repository = NULL;
static GHashTable *default_metadata = NULL; static GHashTable *default_typelib = NULL;
static GSList *search_path = NULL; static GSList *search_path = NULL;
struct _GIRepositoryPrivate struct _GIRepositoryPrivate
{ {
GHashTable *metadata; /* (string) namespace -> GTypelib */ GHashTable *typelib; /* (string) namespace -> GTypelib */
}; };
G_DEFINE_TYPE (GIRepository, g_irepository, G_TYPE_OBJECT); G_DEFINE_TYPE (GIRepository, g_irepository, G_TYPE_OBJECT);
@ -51,7 +51,7 @@ g_irepository_finalize (GObject *object)
{ {
GIRepository *repository = G_IREPOSITORY (object); GIRepository *repository = G_IREPOSITORY (object);
g_hash_table_destroy (repository->priv->metadata); g_hash_table_destroy (repository->priv->typelib);
(* G_OBJECT_CLASS (g_irepository_parent_class)->finalize) (G_OBJECT (repository)); (* G_OBJECT_CLASS (g_irepository_parent_class)->finalize) (G_OBJECT (repository));
} }
@ -70,49 +70,49 @@ g_irepository_class_init (GIRepositoryClass *class)
const gchar * const gchar *
g_irepository_register (GIRepository *repository, g_irepository_register (GIRepository *repository,
GTypelib *metadata) GTypelib *typelib)
{ {
Header *header; Header *header;
const gchar *name; const gchar *name;
GHashTable *table; GHashTable *table;
GError *error = NULL; GError *error = NULL;
g_return_val_if_fail (metadata != NULL, NULL); g_return_val_if_fail (typelib != NULL, NULL);
header = (Header *)metadata->data; header = (Header *)typelib->data;
g_return_val_if_fail (header != NULL, NULL); g_return_val_if_fail (header != NULL, NULL);
if (repository != NULL) if (repository != NULL)
{ {
if (repository->priv->metadata == NULL) if (repository->priv->typelib == NULL)
repository->priv->metadata = g_hash_table_new_full (g_str_hash, g_str_equal, repository->priv->typelib = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) NULL, (GDestroyNotify) NULL,
(GDestroyNotify) g_typelib_free); (GDestroyNotify) g_typelib_free);
table = repository->priv->metadata; table = repository->priv->typelib;
} }
else else
{ {
if (default_metadata == NULL) if (default_typelib == NULL)
default_metadata = g_hash_table_new_full (g_str_hash, g_str_equal, default_typelib = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) NULL, (GDestroyNotify) NULL,
(GDestroyNotify) g_typelib_free); (GDestroyNotify) g_typelib_free);
table = default_metadata; table = default_typelib;
} }
name = g_typelib_get_string (metadata, header->namespace); name = g_typelib_get_string (typelib, header->namespace);
if (g_hash_table_lookup (table, name)) if (g_hash_table_lookup (table, name))
{ {
g_printerr ("metadata (%p) for '%s' already registered\n", g_printerr ("typelib (%p) for '%s' already registered\n",
metadata, name); typelib, name);
return NULL; return NULL;
} }
g_hash_table_insert (table, g_strdup(name), (void *)metadata); g_hash_table_insert (table, g_strdup(name), (void *)typelib);
if (metadata->module == NULL) if (typelib->module == NULL)
metadata->module = g_module_open (NULL, 0); typelib->module = g_module_open (NULL, 0);
if (g_getenv ("G_IREPOSITORY_VERBOSE")) if (g_getenv ("G_IREPOSITORY_VERBOSE"))
{ {
@ -130,9 +130,9 @@ g_irepository_unregister (GIRepository *repository,
GHashTable *table; GHashTable *table;
if (repository != NULL) if (repository != NULL)
table = repository->priv->metadata; table = repository->priv->typelib;
else else
table = default_metadata; table = default_typelib;
if (!g_hash_table_remove (table, namespace)) if (!g_hash_table_remove (table, namespace))
{ {
@ -147,9 +147,9 @@ g_irepository_is_registered (GIRepository *repository,
GHashTable *table; GHashTable *table;
if (repository != NULL) if (repository != NULL)
table = repository->priv->metadata; table = repository->priv->typelib;
else else
table = default_metadata; table = default_typelib;
return g_hash_table_lookup (table, namespace) != NULL; return g_hash_table_lookup (table, namespace) != NULL;
} }
@ -160,11 +160,11 @@ g_irepository_get_default (void)
if (default_repository == NULL) if (default_repository == NULL)
{ {
default_repository = g_object_new (G_TYPE_IREPOSITORY, NULL); default_repository = g_object_new (G_TYPE_IREPOSITORY, NULL);
if (default_metadata == NULL) if (default_typelib == NULL)
default_metadata = g_hash_table_new_full (g_str_hash, g_str_equal, default_typelib = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) NULL, (GDestroyNotify) NULL,
(GDestroyNotify) g_typelib_free); (GDestroyNotify) g_typelib_free);
default_repository->priv->metadata = default_metadata; default_repository->priv->typelib = default_typelib;
} }
return default_repository; return default_repository;
@ -175,10 +175,10 @@ count_interfaces (gpointer key,
gpointer value, gpointer value,
gpointer data) gpointer data)
{ {
guchar *metadata = ((GTypelib *) value)->data; guchar *typelib = ((GTypelib *) value)->data;
gint *n_interfaces = (gint *)data; gint *n_interfaces = (gint *)data;
*n_interfaces += ((Header *)metadata)->n_local_entries; *n_interfaces += ((Header *)typelib)->n_local_entries;
} }
gint gint
@ -189,16 +189,16 @@ g_irepository_get_n_infos (GIRepository *repository,
if (namespace) if (namespace)
{ {
GTypelib *metadata; GTypelib *typelib;
metadata = g_hash_table_lookup (repository->priv->metadata, namespace); typelib = g_hash_table_lookup (repository->priv->typelib, namespace);
if (metadata) if (typelib)
n_interfaces = ((Header *)metadata->data)->n_local_entries; n_interfaces = ((Header *)typelib->data)->n_local_entries;
} }
else else
{ {
g_hash_table_foreach (repository->priv->metadata, g_hash_table_foreach (repository->priv->typelib,
count_interfaces, &n_interfaces); count_interfaces, &n_interfaces);
} }
@ -219,7 +219,7 @@ find_interface (gpointer key,
gpointer data) gpointer data)
{ {
gint i; gint i;
GTypelib *metadata = (GTypelib *)value; GTypelib *typelib = (GTypelib *)value;
IfaceData *iface_data = (IfaceData *)data; IfaceData *iface_data = (IfaceData *)data;
gint index; gint index;
gint n_entries; gint n_entries;
@ -229,14 +229,14 @@ find_interface (gpointer key,
DirEntry *entry; DirEntry *entry;
index = 0; index = 0;
n_entries = ((Header *)metadata->data)->n_local_entries; n_entries = ((Header *)typelib->data)->n_local_entries;
if (iface_data->name) if (iface_data->name)
{ {
for (i = 1; i <= n_entries; i++) for (i = 1; i <= n_entries; i++)
{ {
entry = g_typelib_get_dir_entry (metadata, i); entry = g_typelib_get_dir_entry (typelib, i);
name = g_typelib_get_string (metadata, entry->name); name = g_typelib_get_string (typelib, entry->name);
if (strcmp (name, iface_data->name) == 0) if (strcmp (name, iface_data->name) == 0)
{ {
index = i; index = i;
@ -248,12 +248,12 @@ find_interface (gpointer key,
{ {
for (i = 1; i <= n_entries; i++) for (i = 1; i <= n_entries; i++)
{ {
entry = g_typelib_get_dir_entry (metadata, i); entry = g_typelib_get_dir_entry (typelib, i);
if (entry->blob_type < 4) if (entry->blob_type < 4)
continue; continue;
offset = *(guint32*)&metadata->data[entry->offset + 8]; offset = *(guint32*)&typelib->data[entry->offset + 8];
type = g_typelib_get_string (metadata, offset); type = g_typelib_get_string (typelib, offset);
if (strcmp (type, iface_data->type) == 0) if (strcmp (type, iface_data->type) == 0)
{ {
index = i; index = i;
@ -271,9 +271,9 @@ find_interface (gpointer key,
if (index != 0) if (index != 0)
{ {
entry = g_typelib_get_dir_entry (metadata, index); entry = g_typelib_get_dir_entry (typelib, index);
iface_data->iface = g_info_new (entry->blob_type, NULL, iface_data->iface = g_info_new (entry->blob_type, NULL,
metadata, entry->offset); typelib, entry->offset);
} }
} }
@ -291,15 +291,15 @@ g_irepository_get_info (GIRepository *repository,
if (namespace) if (namespace)
{ {
GTypelib *metadata; GTypelib *typelib;
metadata = g_hash_table_lookup (repository->priv->metadata, namespace); typelib = g_hash_table_lookup (repository->priv->typelib, namespace);
if (metadata) if (typelib)
find_interface ((void *)namespace, metadata, &data); find_interface ((void *)namespace, typelib, &data);
} }
else else
g_hash_table_foreach (repository->priv->metadata, find_interface, &data); g_hash_table_foreach (repository->priv->typelib, find_interface, &data);
return data.iface; return data.iface;
} }
@ -315,7 +315,7 @@ g_irepository_find_by_gtype (GIRepository *repository,
data.index = -1; data.index = -1;
data.iface = NULL; data.iface = NULL;
g_hash_table_foreach (repository->priv->metadata, find_interface, &data); g_hash_table_foreach (repository->priv->typelib, find_interface, &data);
return data.iface; return data.iface;
} }
@ -334,15 +334,15 @@ g_irepository_find_by_name (GIRepository *repository,
if (namespace) if (namespace)
{ {
GTypelib *metadata; GTypelib *typelib;
metadata = g_hash_table_lookup (repository->priv->metadata, namespace); typelib = g_hash_table_lookup (repository->priv->typelib, namespace);
if (metadata) if (typelib)
find_interface ((void *)namespace, metadata, &data); find_interface ((void *)namespace, typelib, &data);
} }
else else
g_hash_table_foreach (repository->priv->metadata, find_interface, &data); g_hash_table_foreach (repository->priv->typelib, find_interface, &data);
return data.iface; return data.iface;
} }
@ -364,7 +364,7 @@ g_irepository_get_namespaces (GIRepository *repository)
gchar **names; gchar **names;
gint i; gint i;
g_hash_table_foreach (repository->priv->metadata, collect_namespaces, &list); g_hash_table_foreach (repository->priv->typelib, collect_namespaces, &list);
names = g_malloc0 (sizeof (gchar *) * (g_list_length (list) + 1)); names = g_malloc0 (sizeof (gchar *) * (g_list_length (list) + 1));
i = 0; i = 0;
@ -379,15 +379,15 @@ const gchar *
g_irepository_get_shared_library (GIRepository *repository, g_irepository_get_shared_library (GIRepository *repository,
const gchar *namespace) const gchar *namespace)
{ {
GTypelib *metadata; GTypelib *typelib;
Header *header; Header *header;
metadata = g_hash_table_lookup (repository->priv->metadata, namespace); typelib = g_hash_table_lookup (repository->priv->typelib, namespace);
if (!metadata) if (!typelib)
return NULL; return NULL;
header = (Header *) metadata->data; header = (Header *) typelib->data;
if (header->shared_library) if (header->shared_library)
return g_typelib_get_string (metadata, header->shared_library); return g_typelib_get_string (typelib, header->shared_library);
else else
return NULL; return NULL;
} }
@ -423,16 +423,16 @@ g_irepository_register_file (GIRepository *repository,
gchar *fname, *full_path; gchar *fname, *full_path;
GMappedFile *mfile; GMappedFile *mfile;
GError *error1 = NULL; GError *error1 = NULL;
GTypelib *metadata = NULL; GTypelib *typelib = NULL;
const gchar *metadata_namespace, *shlib_fname; const gchar *typelib_namespace, *shlib_fname;
GModule *module; GModule *module;
guint32 shlib; guint32 shlib;
GHashTable *table; GHashTable *table;
if (repository != NULL) if (repository != NULL)
table = repository->priv->metadata; table = repository->priv->typelib;
else else
table = default_metadata; table = default_typelib;
/* don't bother loading a namespace if already registered */ /* don't bother loading a namespace if already registered */
if (g_hash_table_lookup (table, namespace)) if (g_hash_table_lookup (table, namespace))
@ -454,35 +454,35 @@ g_irepository_register_file (GIRepository *repository,
continue; continue;
} }
g_free (full_path); g_free (full_path);
metadata = g_typelib_new_from_mapped_file (mfile); typelib = g_typelib_new_from_mapped_file (mfile);
metadata_namespace = g_typelib_get_string (metadata, ((Header *) metadata->data)->namespace); typelib_namespace = g_typelib_get_string (typelib, ((Header *) typelib->data)->namespace);
if (strcmp (metadata_namespace, namespace) != 0) { if (strcmp (typelib_namespace, namespace) != 0) {
g_set_error (error, G_IREPOSITORY_ERROR, g_set_error (error, G_IREPOSITORY_ERROR,
G_IREPOSITORY_ERROR_NAMESPACE_MISMATCH, G_IREPOSITORY_ERROR_NAMESPACE_MISMATCH,
"Metadata file %s for namespace '%s' contains namespace '%s'" "Typelib file %s for namespace '%s' contains namespace '%s'"
" which doesn't match the file name", " which doesn't match the file name",
full_path, namespace, metadata_namespace); full_path, namespace, typelib_namespace);
return NULL; return NULL;
} }
break; break;
} }
g_free (fname); g_free (fname);
if (metadata == NULL) { if (typelib == NULL) {
g_set_error (error, G_IREPOSITORY_ERROR, g_set_error (error, G_IREPOSITORY_ERROR,
G_IREPOSITORY_ERROR_METADATA_NOT_FOUND, G_IREPOSITORY_ERROR_TYPELIB_NOT_FOUND,
"Metadata file for namespace '%s' was not found in search" "Typelib file for namespace '%s' was not found in search"
" path or could not be openened", namespace); " path or could not be openened", namespace);
return NULL; return NULL;
} }
/* optionally load shared library and attach it to the metadata */ /* optionally load shared library and attach it to the typelib */
shlib = ((Header *) metadata->data)->shared_library; shlib = ((Header *) typelib->data)->shared_library;
if (shlib) { if (shlib) {
shlib_fname = g_typelib_get_string (metadata, shlib); shlib_fname = g_typelib_get_string (typelib, shlib);
module = g_module_open (shlib_fname, G_MODULE_BIND_LAZY|G_MODULE_BIND_LOCAL); module = g_module_open (shlib_fname, G_MODULE_BIND_LAZY|G_MODULE_BIND_LOCAL);
if (module == NULL) { if (module == NULL) {
g_set_error (error, G_IREPOSITORY_ERROR, g_set_error (error, G_IREPOSITORY_ERROR,
G_IREPOSITORY_ERROR_METADATA_NOT_FOUND, G_IREPOSITORY_ERROR_TYPELIB_NOT_FOUND,
"Metadata for namespace '%s' references shared library %s," "Typelib for namespace '%s' references shared library %s,"
" but it could not be openened (%s)", " but it could not be openened (%s)",
namespace, shlib_fname, g_module_error ()); namespace, shlib_fname, g_module_error ());
return NULL; return NULL;
@ -490,7 +490,7 @@ g_irepository_register_file (GIRepository *repository,
} }
g_hash_table_remove (table, namespace); g_hash_table_remove (table, namespace);
return g_irepository_register (repository, metadata); return g_irepository_register (repository, typelib);
} }

20
girepository.h
View File

@ -73,7 +73,7 @@ struct _GIRepositoryClass
GType g_irepository_get_type (void) G_GNUC_CONST; GType g_irepository_get_type (void) G_GNUC_CONST;
GIRepository *g_irepository_get_default (void); GIRepository *g_irepository_get_default (void);
const gchar * g_irepository_register (GIRepository *repository, const gchar * g_irepository_register (GIRepository *repository,
GTypelib *metadata); GTypelib *typelib);
void g_irepository_unregister (GIRepository *repository, void g_irepository_unregister (GIRepository *repository,
const gchar *namespace); const gchar *namespace);
const gchar * g_irepository_register_file (GIRepository *repository, const gchar * g_irepository_register_file (GIRepository *repository,
@ -94,21 +94,21 @@ GIBaseInfo * g_irepository_get_info (GIRepository *repository,
gint index); gint index);
const gchar * g_irepository_get_shared_library (GIRepository *repository, const gchar * g_irepository_get_shared_library (GIRepository *repository,
const gchar *namespace); const gchar *namespace);
/* Metadata */ /* Typelib */
GTypelib * g_typelib_new_from_memory (guchar *memory, GTypelib * g_typelib_new_from_memory (guchar *memory,
gsize len); gsize len);
GTypelib * g_typelib_new_from_const_memory (const guchar *memory, GTypelib * g_typelib_new_from_const_memory (const guchar *memory,
gsize len); gsize len);
GTypelib * g_typelib_new_from_mapped_file (GMappedFile *mfile); GTypelib * g_typelib_new_from_mapped_file (GMappedFile *mfile);
void g_typelib_free (GTypelib *metadata); void g_typelib_free (GTypelib *typelib);
void g_typelib_set_module (GTypelib *metadata, void g_typelib_set_module (GTypelib *typelib,
GModule *module); GModule *module);
const gchar * g_typelib_get_namespace (GTypelib *metadata); const gchar * g_typelib_get_namespace (GTypelib *typelib);
typedef enum typedef enum
{ {
G_IREPOSITORY_ERROR_METADATA_NOT_FOUND, G_IREPOSITORY_ERROR_TYPELIB_NOT_FOUND,
G_IREPOSITORY_ERROR_NAMESPACE_MISMATCH, G_IREPOSITORY_ERROR_NAMESPACE_MISMATCH,
G_IREPOSITORY_ERROR_LIBRARY_NOT_FOUND G_IREPOSITORY_ERROR_LIBRARY_NOT_FOUND
} GIRepositoryError; } GIRepositoryError;
@ -156,11 +156,11 @@ gboolean g_base_info_is_deprecated (GIBaseInfo *info);
const gchar * g_base_info_get_annotation (GIBaseInfo *info, const gchar * g_base_info_get_annotation (GIBaseInfo *info,
const gchar *name); const gchar *name);
GIBaseInfo * g_base_info_get_container (GIBaseInfo *info); GIBaseInfo * g_base_info_get_container (GIBaseInfo *info);
GTypelib * g_base_info_get_metadata (GIBaseInfo *info); GTypelib * g_base_info_get_typelib (GIBaseInfo *info);
GIBaseInfo * g_info_new (GIInfoType type, GIBaseInfo * g_info_new (GIInfoType type,
GIBaseInfo *container, GIBaseInfo *container,
GTypelib *metadata, GTypelib *typelib,
guint32 offset); guint32 offset);

12
girmodule.c
View File

@ -1,4 +1,4 @@
/* GObject introspection: Metadata creation /* GObject introspection: Typelib creation
* *
* Copyright (C) 2005 Matthias Clasen * Copyright (C) 2005 Matthias Clasen
* *
@ -61,10 +61,10 @@ g_ir_module_free (GIrModule *module)
} }
GTypelib * GTypelib *
g_ir_module_build_metadata (GIrModule *module, g_ir_module_build_typelib (GIrModule *module,
GList *modules) GList *modules)
{ {
guchar *metadata; guchar *typelib;
gsize length; gsize length;
gint i; gint i;
GList *e; GList *e;
@ -190,7 +190,7 @@ g_ir_module_build_metadata (GIrModule *module,
entry->offset = offset; entry->offset = offset;
entry->name = write_string (node->name, strings, data, &offset2); entry->name = write_string (node->name, strings, data, &offset2);
g_ir_node_build_metadata (node, module, modules, g_ir_node_build_typelib (node, module, modules,
strings, types, data, &offset, &offset2); strings, types, data, &offset, &offset2);
if (offset2 > old_offset + g_ir_node_get_full_size (node)) if (offset2 > old_offset + g_ir_node_get_full_size (node))
@ -208,8 +208,8 @@ g_ir_module_build_metadata (GIrModule *module,
g_message ("reallocating to %d bytes", offset2); g_message ("reallocating to %d bytes", offset2);
metadata = g_realloc (data, offset2); typelib = g_realloc (data, offset2);
length = header->size = offset2; length = header->size = offset2;
return g_typelib_new_from_memory (metadata, length); return g_typelib_new_from_memory (typelib, length);
} }

2
girmodule.h
View File

@ -40,7 +40,7 @@ GIrModule *g_ir_module_new (const gchar *name,
const gchar *module_filename); const gchar *module_filename);
void g_ir_module_free (GIrModule *module); void g_ir_module_free (GIrModule *module);
GTypelib * g_ir_module_build_metadata (GIrModule *module, GTypelib * g_ir_module_build_typelib (GIrModule *module,
GList *modules); GList *modules);
G_END_DECLS G_END_DECLS

194
girnode.c
View File

@ -1,4 +1,4 @@
/* GObject introspection: Metadata creation /* GObject introspection: Typelib creation
* *
* Copyright (C) 2005 Matthias Clasen * Copyright (C) 2005 Matthias Clasen
* *
@ -1209,14 +1209,14 @@ serialize_type (GIrModule *module,
} }
void void
g_ir_node_build_metadata (GIrNode *node, g_ir_node_build_typelib (GIrNode *node,
GIrModule *module, GIrModule *module,
GList *modules, GList *modules,
GHashTable *strings, GHashTable *strings,
GHashTable *types, GHashTable *types,
guchar *data, guchar *data,
guint32 *offset, guint32 *offset,
guint32 *offset2) guint32 *offset2)
{ {
GList *l; GList *l;
guint32 old_offset = *offset; guint32 old_offset = *offset;
@ -1224,7 +1224,7 @@ g_ir_node_build_metadata (GIrNode *node,
g_assert (node != NULL); g_assert (node != NULL);
g_debug ("build_metadata (%s)", g_debug ("build_typelib (%s)",
g_ir_node_type_to_string (node->type)); g_ir_node_type_to_string (node->type));
switch (node->type) switch (node->type)
@ -1287,9 +1287,9 @@ g_ir_node_build_metadata (GIrNode *node,
pos = *offset2 + 4; pos = *offset2 + 4;
*offset2 += 8; *offset2 += 8;
g_ir_node_build_metadata ((GIrNode *)type->parameter_type1, g_ir_node_build_typelib ((GIrNode *)type->parameter_type1,
module, modules, strings, types, module, modules, strings, types,
data, &pos, offset2); data, &pos, offset2);
} }
break; break;
@ -1322,9 +1322,9 @@ g_ir_node_build_metadata (GIrNode *node,
pos = *offset2 + 4; pos = *offset2 + 4;
*offset2 += 8; *offset2 += 8;
g_ir_node_build_metadata ((GIrNode *)type->parameter_type1, g_ir_node_build_typelib ((GIrNode *)type->parameter_type1,
module, modules, strings, types, module, modules, strings, types,
data, &pos, offset2); data, &pos, offset2);
} }
break; break;
@ -1342,12 +1342,12 @@ g_ir_node_build_metadata (GIrNode *node,
pos = *offset2 + 4; pos = *offset2 + 4;
*offset2 += 12; *offset2 += 12;
g_ir_node_build_metadata ((GIrNode *)type->parameter_type1, g_ir_node_build_typelib ((GIrNode *)type->parameter_type1,
module, modules, strings, types, module, modules, strings, types,
data, &pos, offset2); data, &pos, offset2);
g_ir_node_build_metadata ((GIrNode *)type->parameter_type2, g_ir_node_build_typelib ((GIrNode *)type->parameter_type2,
module, modules, strings, types, module, modules, strings, types,
data, &pos, offset2); data, &pos, offset2);
} }
break; break;
@ -1395,9 +1395,9 @@ g_ir_node_build_metadata (GIrNode *node,
blob->bits = 0; blob->bits = 0;
blob->struct_offset = field->offset; blob->struct_offset = field->offset;
g_ir_node_build_metadata ((GIrNode *)field->type, g_ir_node_build_typelib ((GIrNode *)field->type,
module, modules, strings, types, module, modules, strings, types,
data, offset, offset2); data, offset, offset2);
} }
break; break;
@ -1415,9 +1415,9 @@ g_ir_node_build_metadata (GIrNode *node,
blob->construct_only = prop->construct_only; blob->construct_only = prop->construct_only;
blob->reserved = 0; blob->reserved = 0;
g_ir_node_build_metadata ((GIrNode *)prop->type, g_ir_node_build_typelib ((GIrNode *)prop->type,
module, modules, strings, types, module, modules, strings, types,
data, offset, offset2); data, offset, offset2);
} }
break; break;
@ -1447,9 +1447,9 @@ g_ir_node_build_metadata (GIrNode *node,
blob->symbol = write_string (function->symbol, strings, data, offset2); blob->symbol = write_string (function->symbol, strings, data, offset2);
blob->signature = signature; blob->signature = signature;
g_ir_node_build_metadata ((GIrNode *)function->result->type, g_ir_node_build_typelib ((GIrNode *)function->result->type,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = function->result->null_ok; blob2->may_return_null = function->result->null_ok;
blob2->caller_owns_return_value = function->result->transfer; blob2->caller_owns_return_value = function->result->transfer;
@ -1463,9 +1463,9 @@ g_ir_node_build_metadata (GIrNode *node,
{ {
GIrNode *param = (GIrNode *)l->data; GIrNode *param = (GIrNode *)l->data;
g_ir_node_build_metadata (param, g_ir_node_build_typelib (param,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
} }
} }
break; break;
@ -1490,9 +1490,9 @@ g_ir_node_build_metadata (GIrNode *node,
blob->name = write_string (node->name, strings, data, offset2); blob->name = write_string (node->name, strings, data, offset2);
blob->signature = signature; blob->signature = signature;
g_ir_node_build_metadata ((GIrNode *)function->result->type, g_ir_node_build_typelib ((GIrNode *)function->result->type,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = function->result->null_ok; blob2->may_return_null = function->result->null_ok;
blob2->caller_owns_return_value = function->result->transfer; blob2->caller_owns_return_value = function->result->transfer;
@ -1506,9 +1506,9 @@ g_ir_node_build_metadata (GIrNode *node,
{ {
GIrNode *param = (GIrNode *)l->data; GIrNode *param = (GIrNode *)l->data;
g_ir_node_build_metadata (param, g_ir_node_build_typelib (param,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
} }
} }
break; break;
@ -1542,9 +1542,9 @@ g_ir_node_build_metadata (GIrNode *node,
blob->name = write_string (node->name, strings, data, offset2); blob->name = write_string (node->name, strings, data, offset2);
blob->signature = signature; blob->signature = signature;
g_ir_node_build_metadata ((GIrNode *)signal->result->type, g_ir_node_build_typelib ((GIrNode *)signal->result->type,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = signal->result->null_ok; blob2->may_return_null = signal->result->null_ok;
blob2->caller_owns_return_value = signal->result->transfer; blob2->caller_owns_return_value = signal->result->transfer;
@ -1558,8 +1558,8 @@ g_ir_node_build_metadata (GIrNode *node,
{ {
GIrNode *param = (GIrNode *)l->data; GIrNode *param = (GIrNode *)l->data;
g_ir_node_build_metadata (param, module, modules, strings, types, g_ir_node_build_typelib (param, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
} }
} }
break; break;
@ -1589,9 +1589,9 @@ g_ir_node_build_metadata (GIrNode *node,
blob->reserved2 = 0; blob->reserved2 = 0;
blob->signature = signature; blob->signature = signature;
g_ir_node_build_metadata ((GIrNode *)vfunc->result->type, g_ir_node_build_typelib ((GIrNode *)vfunc->result->type,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = vfunc->result->null_ok; blob2->may_return_null = vfunc->result->null_ok;
blob2->caller_owns_return_value = vfunc->result->transfer; blob2->caller_owns_return_value = vfunc->result->transfer;
@ -1605,8 +1605,8 @@ g_ir_node_build_metadata (GIrNode *node,
{ {
GIrNode *param = (GIrNode *)l->data; GIrNode *param = (GIrNode *)l->data;
g_ir_node_build_metadata (param, module, modules, strings, g_ir_node_build_typelib (param, module, modules, strings,
types, data, &signature, offset2); types, data, &signature, offset2);
} }
} }
break; break;
@ -1629,8 +1629,8 @@ g_ir_node_build_metadata (GIrNode *node,
blob->return_value = param->retval; blob->return_value = param->retval;
blob->reserved = 0; blob->reserved = 0;
g_ir_node_build_metadata ((GIrNode *)param->type, module, modules, g_ir_node_build_typelib ((GIrNode *)param->type, module, modules,
strings, types, data, offset, offset2); strings, types, data, offset, offset2);
} }
break; break;
@ -1658,8 +1658,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FIELD) if (member->type == G_IR_NODE_FIELD)
{ {
blob->n_fields++; blob->n_fields++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1670,8 +1670,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FUNCTION) if (member->type == G_IR_NODE_FUNCTION)
{ {
blob->n_methods++; blob->n_methods++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
} }
@ -1701,8 +1701,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FIELD) if (member->type == G_IR_NODE_FIELD)
{ {
blob->n_fields++; blob->n_fields++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1713,8 +1713,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FUNCTION) if (member->type == G_IR_NODE_FUNCTION)
{ {
blob->n_methods++; blob->n_methods++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
} }
@ -1751,9 +1751,9 @@ g_ir_node_build_metadata (GIrNode *node,
{ {
*offset += 24; *offset += 24;
blob->discriminated = TRUE; blob->discriminated = TRUE;
g_ir_node_build_metadata ((GIrNode *)union_->discriminator_type, g_ir_node_build_typelib ((GIrNode *)union_->discriminator_type,
module, modules, strings, types, module, modules, strings, types,
data, offset, offset2); data, offset, offset2);
} }
else else
{ {
@ -1770,8 +1770,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FIELD) if (member->type == G_IR_NODE_FIELD)
{ {
blob->n_fields++; blob->n_fields++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1782,8 +1782,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FUNCTION) if (member->type == G_IR_NODE_FUNCTION)
{ {
blob->n_functions++; blob->n_functions++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1793,8 +1793,8 @@ g_ir_node_build_metadata (GIrNode *node,
{ {
GIrNode *member = (GIrNode *)l->data; GIrNode *member = (GIrNode *)l->data;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
} }
@ -1837,8 +1837,8 @@ g_ir_node_build_metadata (GIrNode *node,
GIrNode *value = (GIrNode *)l->data; GIrNode *value = (GIrNode *)l->data;
blob->n_values++; blob->n_values++;
g_ir_node_build_metadata (value, module, modules, strings, types, g_ir_node_build_typelib (value, module, modules, strings, types,
data, offset, offset2); data, offset, offset2);
} }
} }
break; break;
@ -1883,8 +1883,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FIELD) if (member->type == G_IR_NODE_FIELD)
{ {
blob->n_fields++; blob->n_fields++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1896,8 +1896,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_PROPERTY) if (member->type == G_IR_NODE_PROPERTY)
{ {
blob->n_properties++; blob->n_properties++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1909,8 +1909,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FUNCTION) if (member->type == G_IR_NODE_FUNCTION)
{ {
blob->n_methods++; blob->n_methods++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1922,8 +1922,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_SIGNAL) if (member->type == G_IR_NODE_SIGNAL)
{ {
blob->n_signals++; blob->n_signals++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1935,8 +1935,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_VFUNC) if (member->type == G_IR_NODE_VFUNC)
{ {
blob->n_vfuncs++; blob->n_vfuncs++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -1948,8 +1948,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_CONSTANT) if (member->type == G_IR_NODE_CONSTANT)
{ {
blob->n_constants++; blob->n_constants++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
} }
@ -1989,8 +1989,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_PROPERTY) if (member->type == G_IR_NODE_PROPERTY)
{ {
blob->n_properties++; blob->n_properties++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -2002,8 +2002,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_FUNCTION) if (member->type == G_IR_NODE_FUNCTION)
{ {
blob->n_methods++; blob->n_methods++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -2015,8 +2015,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_SIGNAL) if (member->type == G_IR_NODE_SIGNAL)
{ {
blob->n_signals++; blob->n_signals++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -2028,8 +2028,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_VFUNC) if (member->type == G_IR_NODE_VFUNC)
{ {
blob->n_vfuncs++; blob->n_vfuncs++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
@ -2041,8 +2041,8 @@ g_ir_node_build_metadata (GIrNode *node,
if (member->type == G_IR_NODE_CONSTANT) if (member->type == G_IR_NODE_CONSTANT)
{ {
blob->n_constants++; blob->n_constants++;
g_ir_node_build_metadata (member, module, modules, strings, g_ir_node_build_typelib (member, module, modules, strings,
types, data, offset, offset2); types, data, offset, offset2);
} }
} }
} }
@ -2165,8 +2165,8 @@ g_ir_node_build_metadata (GIrNode *node,
} }
*offset2 += ALIGN_VALUE (blob->size, 4); *offset2 += ALIGN_VALUE (blob->size, 4);
g_ir_node_build_metadata ((GIrNode *)constant->type, module, modules, g_ir_node_build_typelib ((GIrNode *)constant->type, module, modules,
strings, types, data, &pos, offset2); strings, types, data, &pos, offset2);
} }
break; break;
default: default:
@ -2182,8 +2182,8 @@ g_ir_node_build_metadata (GIrNode *node,
} }
/* if str is already in the pool, return previous location, otherwise write str /* if str is already in the pool, return previous location, otherwise write str
* to the metadata at offset, put it in the pool and update offset. If the * to the typelib at offset, put it in the pool and update offset. If the
* metadata is not large enough to hold the string, reallocate it. * typelib is not large enough to hold the string, reallocate it.
*/ */
guint32 guint32
write_string (const gchar *str, write_string (const gchar *str,

28
girnode.h
View File

@ -309,23 +309,23 @@ GIrNode * g_ir_node_new (GIrNodeTypeId type);
void g_ir_node_free (GIrNode *node); void g_ir_node_free (GIrNode *node);
guint32 g_ir_node_get_size (GIrNode *node); guint32 g_ir_node_get_size (GIrNode *node);
guint32 g_ir_node_get_full_size (GIrNode *node); guint32 g_ir_node_get_full_size (GIrNode *node);
void g_ir_node_build_metadata (GIrNode *node, void g_ir_node_build_typelib (GIrNode *node,
GIrModule *module, GIrModule *module,
GList *modules, GList *modules,
GHashTable *strings, GHashTable *strings,
GHashTable *types, GHashTable *types,
guchar *data, guchar *data,
guint32 *offset, guint32 *offset,
guint32 *offset2); guint32 *offset2);
int g_ir_node_cmp (GIrNode *node, int g_ir_node_cmp (GIrNode *node,
GIrNode *other); GIrNode *other);
gboolean g_ir_node_can_have_member (GIrNode *node); gboolean g_ir_node_can_have_member (GIrNode *node);
void g_ir_node_add_member (GIrNode *node, void g_ir_node_add_member (GIrNode *node,
GIrNodeFunction *member); GIrNodeFunction *member);
guint32 write_string (const gchar *str, guint32 write_string (const gchar *str,
GHashTable *strings, GHashTable *strings,
guchar *data, guchar *data,
guint32 *offset); guint32 *offset);
const gchar * g_ir_node_param_direction_string (GIrNodeParam * node); const gchar * g_ir_node_param_direction_string (GIrNodeParam * node);

424
gtypelib.c
View File

File diff suppressed because it is too large Load Diff

12
gtypelib.h
View File

@ -1,5 +1,5 @@
/* GObject introspection: struct definitions for the binary /* GObject introspection: struct definitions for the binary
* metadata format, validation * typelib format, validation
* *
* Copyright (C) 2005 Matthias Clasen * Copyright (C) 2005 Matthias Clasen
* *
@ -521,12 +521,12 @@ struct _GTypelib {
GModule *module; GModule *module;
}; };
DirEntry *g_typelib_get_dir_entry (GTypelib *metadata, DirEntry *g_typelib_get_dir_entry (GTypelib *typelib,
guint16 index); guint16 index);
void g_typelib_check_sanity (void); void g_typelib_check_sanity (void);
#define g_typelib_get_string(metadata,offset) ((const gchar*)&(metadata->data)[(offset)]) #define g_typelib_get_string(typelib,offset) ((const gchar*)&(typelib->data)[(offset)])
typedef enum typedef enum
@ -542,8 +542,8 @@ typedef enum
GQuark g_typelib_error_quark (void); GQuark g_typelib_error_quark (void);
gboolean g_typelib_validate (GTypelib *metadata, gboolean g_typelib_validate (GTypelib *typelib,
GError **error); GError **error);
G_END_DECLS G_END_DECLS