#include <glib.h>
-#include "gmetadata.h"
+#include "gtypelib.h"
#define ALIGN_VALUE(this, boundary) \
DirEntry *
-g_metadata_get_dir_entry (GMetadata *metadata,
+g_typelib_get_dir_entry (GTypelib *metadata,
guint16 index)
{
Header *header = (Header *)metadata->data;
}
void
-g_metadata_check_sanity (void)
+g_typelib_check_sanity (void)
{
/* Check that struct layout is as we expect */
g_assert (sizeof (Header) == 100);
}
static gboolean
-validate_header (GMetadata *metadata,
+validate_header (GTypelib *metadata,
GError **error)
{
Header *header;
if (metadata->len < sizeof (Header))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (strncmp (header->magic, G_IDL_MAGIC, 16) != 0)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Magic string not found");
return FALSE;
if (header->major_version != 1 || header->minor_version != 0)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Version mismatch");
return FALSE;
if (header->n_entries < header->n_local_entries)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Inconsistent entry counts");
return FALSE;
}
if (header->size != metadata->len)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Metadata size mismatch");
return FALSE;
}
header->union_blob_size != 28)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Blob size mismatch");
return FALSE;
}
if (!is_aligned (header->directory))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Misaligned directory");
return FALSE;
}
if (!is_aligned (header->annotations))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Misaligned annotations");
return FALSE;
}
if (header->annotations == 0 && header->n_annotations > 0)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Wrong number of annotations");
return FALSE;
}
if (!is_name (metadata->data, header->namespace))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_HEADER,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_HEADER,
"Invalid namespace name");
return FALSE;
}
return TRUE;
}
-static gboolean validate_type_blob (GMetadata *metadata,
+static gboolean validate_type_blob (GTypelib *metadata,
guint32 offset,
guint32 signature_offset,
gboolean return_type,
GError **error);
static gboolean
-validate_array_type_blob (GMetadata *metadata,
+validate_array_type_blob (GTypelib *metadata,
guint32 offset,
guint32 signature_offset,
gboolean return_type,
if (!blob->pointer)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Pointer type exected for tag %d", blob->tag);
return FALSE;
}
}
static gboolean
-validate_iface_type_blob (GMetadata *metadata,
+validate_iface_type_blob (GTypelib *metadata,
guint32 offset,
guint32 signature_offset,
gboolean return_type,
if (blob->interface == 0 || blob->interface > header->n_entries)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid directory index %d", blob->interface);
return FALSE;
}
}
static gboolean
-validate_param_type_blob (GMetadata *metadata,
+validate_param_type_blob (GTypelib *metadata,
guint32 offset,
guint32 signature_offset,
gboolean return_type,
if (!blob->pointer)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Pointer type exected for tag %d", blob->tag);
return FALSE;
}
if (blob->n_types != n_params)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Parameter type number mismatch");
return FALSE;
}
}
static gboolean
-validate_error_type_blob (GMetadata *metadata,
+validate_error_type_blob (GTypelib *metadata,
guint32 offset,
guint32 signature_offset,
gboolean return_type,
if (!blob->pointer)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Pointer type exected for tag %d", blob->tag);
return FALSE;
}
if (blob->domains[i] == 0 || blob->domains[i] > header->n_entries)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid directory index %d", blob->domains[i]);
return FALSE;
}
- entry = g_metadata_get_dir_entry (metadata, blob->domains[i]);
+ entry = g_typelib_get_dir_entry (metadata, blob->domains[i]);
if (entry->blob_type != BLOB_TYPE_ERROR_DOMAIN &&
(entry->local || entry->blob_type != BLOB_TYPE_INVALID))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
}
static gboolean
-validate_type_blob (GMetadata *metadata,
+validate_type_blob (GTypelib *metadata,
guint32 offset,
guint32 signature_offset,
gboolean return_type,
if (simple->tag >= TYPE_TAG_ARRAY)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong tag in simple type");
return FALSE;
}
!simple->pointer)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Pointer type exected for tag %d", simple->tag);
return FALSE;
}
break;
default:
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong tag in complex type");
return FALSE;
}
}
static gboolean
-validate_arg_blob (GMetadata *metadata,
+validate_arg_blob (GTypelib *metadata,
guint32 offset,
guint32 signature_offset,
GError **error)
if (metadata->len < offset + sizeof (ArgBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid argument name");
return FALSE;
}
}
static gboolean
-validate_signature_blob (GMetadata *metadata,
+validate_signature_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (SignatureBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
}
static gboolean
-validate_function_blob (GMetadata *metadata,
+validate_function_blob (GTypelib *metadata,
guint32 offset,
guint16 container_type,
GError **error)
if (metadata->len < offset + sizeof (FunctionBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (blob->blob_type != BLOB_TYPE_FUNCTION)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid function name");
return FALSE;
}
if (!is_name (metadata->data, blob->symbol))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid function symbol");
return FALSE;
}
break;
default:
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Constructor not allowed");
return FALSE;
}
break;
default:
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Setter, getter or wrapper not allowed");
return FALSE;
}
if (!(blob->setter || blob->getter || blob->wraps_vfunc))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Must be setter, getter or wrapper");
return FALSE;
}
}
static gboolean
-validate_callback_blob (GMetadata *metadata,
+validate_callback_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (CallbackBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (blob->blob_type != BLOB_TYPE_CALLBACK)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid callback name");
return FALSE;
}
}
static gboolean
-validate_constant_blob (GMetadata *metadata,
+validate_constant_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (ConstantBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (blob->blob_type != BLOB_TYPE_CONSTANT)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid constant name");
return FALSE;
}
if (!is_aligned (blob->offset))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Misaligned constant value");
return FALSE;
}
if (type->tag == 0)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Constant value type void");
return FALSE;
}
blob->size != value_size[type->tag])
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Constant value size mismatch");
return FALSE;
}
}
static gboolean
-validate_value_blob (GMetadata *metadata,
+validate_value_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (ValueBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid value name");
return FALSE;
}
}
static gboolean
-validate_field_blob (GMetadata *metadata,
+validate_field_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (FieldBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid field name");
return FALSE;
}
}
static gboolean
-validate_property_blob (GMetadata *metadata,
+validate_property_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (PropertyBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid property name");
return FALSE;
}
}
static gboolean
-validate_signal_blob (GMetadata *metadata,
+validate_signal_blob (GTypelib *metadata,
guint32 offset,
guint32 container_offset,
GError **error)
if (metadata->len < offset + sizeof (SignalBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid signal name");
return FALSE;
}
(blob->run_cleanup != 0) != 1)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid signal run flags");
return FALSE;
}
if (blob->class_closure >= n_signals)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid class closure index");
return FALSE;
}
}
static gboolean
-validate_vfunc_blob (GMetadata *metadata,
+validate_vfunc_blob (GTypelib *metadata,
guint32 offset,
guint32 container_offset,
GError **error)
if (metadata->len < offset + sizeof (VFuncBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid vfunc name");
return FALSE;
}
if (blob->class_closure >= n_vfuncs)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid class closure index");
return FALSE;
}
}
static gboolean
-validate_struct_blob (GMetadata *metadata,
+validate_struct_blob (GTypelib *metadata,
guint32 offset,
guint16 blob_type,
GError **error)
if (metadata->len < offset + sizeof (StructBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (blob->blob_type != blob_type)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
(blob->blob_type == BLOB_TYPE_STRUCT && !blob->unregistered))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Registration/blob type mismatch");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid struct name");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid boxed type name");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_init))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid boxed type init");
return FALSE;
}
if (blob->gtype_name || blob->gtype_init)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Gtype data in struct");
return FALSE;
}
blob->n_methods * sizeof (FunctionBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
}
static gboolean
-validate_enum_blob (GMetadata *metadata,
+validate_enum_blob (GTypelib *metadata,
guint32 offset,
guint16 blob_type,
GError **error)
if (metadata->len < offset + sizeof (EnumBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (blob->blob_type != blob_type)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid enum type name");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_init))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid enum type init");
return FALSE;
}
if (blob->gtype_name || blob->gtype_init)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Gtype data in unregistered enum");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid enum name");
return FALSE;
}
blob->n_values * sizeof (ValueBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
{
/* FIXME should this be an error ? */
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Duplicate enum value");
return FALSE;
}
}
static gboolean
-validate_object_blob (GMetadata *metadata,
+validate_object_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (ObjectBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (blob->blob_type != BLOB_TYPE_OBJECT)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid object type name");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_init))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid object type init");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid object name");
return FALSE;
}
if (blob->parent > header->n_entries)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid parent index");
return FALSE;
}
{
DirEntry *entry;
- entry = g_metadata_get_dir_entry (metadata, blob->parent);
+ entry = g_typelib_get_dir_entry (metadata, blob->parent);
if (entry->blob_type != BLOB_TYPE_OBJECT &&
(entry->local || entry->blob_type != 0))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Parent not object");
return FALSE;
}
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (iface == 0 || iface > header->n_entries)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid interface index");
return FALSE;
}
- entry = g_metadata_get_dir_entry (metadata, iface);
+ entry = g_typelib_get_dir_entry (metadata, iface);
if (entry->blob_type != BLOB_TYPE_INTERFACE &&
(entry->local || entry->blob_type != 0))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Not an interface");
return FALSE;
}
}
static gboolean
-validate_interface_blob (GMetadata *metadata,
+validate_interface_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (InterfaceBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (blob->blob_type != BLOB_TYPE_INTERFACE)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Wrong blob type");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid interface type name");
return FALSE;
}
if (!is_name (metadata->data, blob->gtype_init))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid interface type init");
return FALSE;
}
if (!is_name (metadata->data, blob->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid interface name");
return FALSE;
}
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
if (req == 0 || req > header->n_entries)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid prerequisite index");
return FALSE;
}
- entry = g_metadata_get_dir_entry (metadata, req);
+ entry = g_typelib_get_dir_entry (metadata, req);
if (entry->blob_type != BLOB_TYPE_INTERFACE &&
entry->blob_type != BLOB_TYPE_OBJECT &&
(entry->local || entry->blob_type != 0))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_BLOB,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_BLOB,
"Not an interface or object");
return FALSE;
}
}
static gboolean
-validate_errordomain_blob (GMetadata *metadata,
+validate_errordomain_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
}
static gboolean
-validate_union_blob (GMetadata *metadata,
+validate_union_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
}
static gboolean
-validate_blob (GMetadata *metadata,
+validate_blob (GTypelib *metadata,
guint32 offset,
GError **error)
{
if (metadata->len < offset + sizeof (CommonBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
break;
default:
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_ENTRY,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_ENTRY,
"Invalid blob type");
return FALSE;
}
}
static gboolean
-validate_directory (GMetadata *metadata,
+validate_directory (GTypelib *metadata,
GError **error)
{
Header *header = (Header *)metadata->data;
if (metadata->len < header->directory + header->n_entries * sizeof (DirEntry))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
for (i = 0; i < header->n_entries; i++)
{
- entry = g_metadata_get_dir_entry (metadata, i + 1);
+ entry = g_typelib_get_dir_entry (metadata, i + 1);
if (!is_name (metadata->data, entry->name))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_DIRECTORY,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_DIRECTORY,
"Invalid entry name");
return FALSE;
}
entry->blob_type > BLOB_TYPE_UNION)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_DIRECTORY,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_DIRECTORY,
"Invalid entry type");
return FALSE;
}
if (!entry->local)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_DIRECTORY,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_DIRECTORY,
"Too few local directory entries");
return FALSE;
}
if (!is_aligned (entry->offset))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_DIRECTORY,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_DIRECTORY,
"Misaligned entry");
return FALSE;
}
if (entry->local)
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_DIRECTORY,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_DIRECTORY,
"Too many local directory entries");
return FALSE;
}
if (!is_name (metadata->data, entry->offset))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID_DIRECTORY,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID_DIRECTORY,
"Invalid namespace name");
return FALSE;
}
}
static gboolean
-validate_annotations (GMetadata *metadata,
+validate_annotations (GTypelib *metadata,
GError **error)
{
Header *header = (Header *)metadata->data;
if (header->size < header->annotations + header->n_annotations * sizeof (AnnotationBlob))
{
g_set_error (error,
- G_METADATA_ERROR,
- G_METADATA_ERROR_INVALID,
+ G_TYPELIB_ERROR,
+ G_TYPELIB_ERROR_INVALID,
"The buffer is too short");
return FALSE;
}
}
gboolean
-g_metadata_validate (GMetadata *metadata,
+g_typelib_validate (GTypelib *metadata,
GError **error)
{
if (!validate_header (metadata, error))
}
GQuark
-g_metadata_error_quark (void)
+g_typelib_error_quark (void)
{
static GQuark quark = 0;
if (quark == 0)
}
static const char*
-find_some_symbol (GMetadata *metadata)
+find_some_symbol (GTypelib *metadata)
{
Header *header = (Header *) metadata->data;
gint i;
{
DirEntry *entry;
- entry = g_metadata_get_dir_entry (metadata, i + 1);
+ entry = g_typelib_get_dir_entry (metadata, i + 1);
switch (entry->blob_type)
{
FunctionBlob *blob = (FunctionBlob *) &metadata->data[entry->offset];
if (blob->symbol)
- return g_metadata_get_string (metadata, blob->symbol);
+ return g_typelib_get_string (metadata, blob->symbol);
}
break;
case BLOB_TYPE_OBJECT:
RegisteredTypeBlob *blob = (RegisteredTypeBlob *) &metadata->data[entry->offset];
if (blob->gtype_init)
- return g_metadata_get_string (metadata, blob->gtype_init);
+ return g_typelib_get_string (metadata, blob->gtype_init);
}
break;
default:
}
static inline void
-_g_metadata_init (GMetadata *metadata)
+_g_typelib_init (GTypelib *metadata)
{
Header *header;
{
const gchar *shlib;
- shlib = g_metadata_get_string (metadata, header->shared_library);
+ shlib = g_typelib_get_string (metadata, header->shared_library);
/* note that NULL shlib means to open the main app, which is allowed */
/* If we do have a shared lib, first be sure the main app isn't already linked to it */
}
/**
- * g_metadata_new_from_memory:
+ * g_typelib_new_from_memory:
* @memory: address of memory chunk containing the metadata
* @len: length of memory chunk containing the metadata
*
- * Creates a new #GMetadata from a memory location. The memory block
+ * Creates a new #GTypelib from a memory location. The memory block
* pointed to by @metadata will be automatically g_free()d when the
* repository is destroyed.
*
- * Return value: the new #GMetadata
+ * Return value: the new #GTypelib
**/
-GMetadata *
-g_metadata_new_from_memory (guchar *memory, gsize len)
+GTypelib *
+g_typelib_new_from_memory (guchar *memory, gsize len)
{
- GMetadata *meta;
+ GTypelib *meta;
- meta = g_new0 (GMetadata, 1);
+ meta = g_new0 (GTypelib, 1);
meta->data = memory;
meta->len = len;
meta->owns_memory = TRUE;
- _g_metadata_init (meta);
+ _g_typelib_init (meta);
return meta;
}
/**
- * g_metadata_new_from_const_memory:
+ * g_typelib_new_from_const_memory:
* @memory: address of memory chunk containing the metadata
* @len: length of memory chunk containing the metadata
*
- * Creates a new #GMetadata from a memory location.
+ * Creates a new #GTypelib from a memory location.
*
- * Return value: the new #GMetadata
+ * Return value: the new #GTypelib
**/
-GMetadata *
-g_metadata_new_from_const_memory (const guchar *memory, gsize len)
+GTypelib *
+g_typelib_new_from_const_memory (const guchar *memory, gsize len)
{
- GMetadata *meta;
+ GTypelib *meta;
- meta = g_new0 (GMetadata, 1);
+ meta = g_new0 (GTypelib, 1);
meta->data = (guchar *) memory;
meta->len = len;
meta->owns_memory = FALSE;
- _g_metadata_init (meta);
+ _g_typelib_init (meta);
return meta;
}
/**
- * g_metadata_new_from_mapped_file:
+ * g_typelib_new_from_mapped_file:
* @mfile: a #GMappedFile, that will be free'd when the repository is destroyed
*
- * Creates a new #GMetadata from a #GMappedFile.
+ * Creates a new #GTypelib from a #GMappedFile.
*
- * Return value: the new #GMetadata
+ * Return value: the new #GTypelib
**/
-GMetadata *
-g_metadata_new_from_mapped_file (GMappedFile *mfile)
+GTypelib *
+g_typelib_new_from_mapped_file (GMappedFile *mfile)
{
- GMetadata *meta;
+ GTypelib *meta;
- meta = g_new0 (GMetadata, 1);
+ meta = g_new0 (GTypelib, 1);
meta->mfile = mfile;
meta->owns_memory = FALSE;
meta->data = (guchar *) g_mapped_file_get_contents (mfile);
meta->len = g_mapped_file_get_length (mfile);
- _g_metadata_init (meta);
+ _g_typelib_init (meta);
return meta;
}
/**
- * g_metadata_free:
- * @metadata: a #GMetadata
+ * g_typelib_free:
+ * @metadata: a #GTypelib
*
- * Free a #GMetadata.
+ * Free a #GTypelib.
**/
void
-g_metadata_free (GMetadata *metadata)
+g_typelib_free (GTypelib *metadata)
{
if (metadata->mfile)
g_mapped_file_free (metadata->mfile);
}
/**
- * g_metadata_set_module:
- * @metadata: a #GMetadata instance
+ * g_typelib_set_module:
+ * @metadata: a #GTypelib instance
* @module: a #GModule; takes ownership of this module
*
* Sets the target module for all symbols referenced by the metadata.
**/
void
-g_metadata_set_module (GMetadata *metadata, GModule *module)
+g_typelib_set_module (GTypelib *metadata, GModule *module)
{
if (metadata->module)
g_module_close (metadata->module);
}
const gchar *
-g_metadata_get_namespace(GMetadata *metadata)
+g_typelib_get_namespace(GTypelib *metadata)
{
- return g_metadata_get_string (metadata, ((Header *) metadata->data)->namespace);
+ return g_typelib_get_string (metadata, ((Header *) metadata->data)->namespace);
}