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

Include fully-qualified names in all error messages.

Browse Source 
2008-11-11  Owen Taylor  <otaylor@redhat.com>

        * girepository/giroffsets.c: Include fully-qualified names in
        all error messages.

svn path=/trunk/; revision=884
This commit is contained in:
Owen Taylor 2008-11-11 15:25:51 +00:00 committed by Owen Taylor
parent 9d4aa3bba3
commit ac8db19d3f
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
giroffsets.c
View File

@ -111,18 +111,21 @@ get_enum_size_alignment (GIrNodeEnum *enum_node,
} }
static gboolean static gboolean
get_interface_size_alignment (GIrNodeType *type, get_interface_size_alignment (GIrNodeField *field,
GIrModule *module, GIrNode *parent_node,
GList *modules, GIrModule *module,
gint *size, GList *modules,
gint *alignment) gint *size,
gint *alignment)
{ {
GIrNodeType *type = field->type;
GIrNode *iface; GIrNode *iface;
GIrModule *iface_module; GIrModule *iface_module;
if (!g_ir_find_node (module, modules, type->interface, &iface, &iface_module)) if (!g_ir_find_node (module, modules, type->interface, &iface, &iface_module))
{ {
g_warning ("Type for type name '%s' not found", type->interface); g_warning ("Can't resolve type '%s' for field %s.%s.%s",
type->interface, module->name, parent_node->name, ((GIrNode *)field)->name);
*size = -1; *size = -1;
*alignment = -1; *alignment = -1;
return FALSE; return FALSE;
@ -168,7 +171,8 @@ get_interface_size_alignment (GIrNodeType *type,
} }
default: default:
{ {
g_warning ("Unexpected non-pointer field of type %s in structure", g_warning ("Field %s.%s.%s has is not a pointer and is of type %s",
module->name, parent_node->name, ((GIrNode *)field)->name,
g_ir_node_type_to_string (iface->type)); g_ir_node_type_to_string (iface->type));
*size = -1; *size = -1;
*alignment = -1; *alignment = -1;
@ -181,6 +185,7 @@ get_interface_size_alignment (GIrNodeType *type,
static gboolean static gboolean
get_field_size_alignment (GIrNodeField *field, get_field_size_alignment (GIrNodeField *field,
GIrNode *parent_node,
GIrModule *module, GIrModule *module,
GList *modules, GList *modules,
gint *size, gint *size,
@ -197,7 +202,7 @@ get_field_size_alignment (GIrNodeField *field,
{ {
if (type->tag == GI_TYPE_TAG_INTERFACE) if (type->tag == GI_TYPE_TAG_INTERFACE)
{ {
return get_interface_size_alignment (type, return get_interface_size_alignment (field, parent_node,
module, modules, module, modules,
size, alignment); size, alignment);
} }
@ -207,15 +212,16 @@ get_field_size_alignment (GIrNodeField *field,
if (type_ffi == &ffi_type_void) if (type_ffi == &ffi_type_void)
{ {
g_warning ("field '%s' has void type", ((GIrNode *)field)->name); g_warning ("Field %s.%s.%s has void type",
module->name, parent_node->name, ((GIrNode *)field)->name);
*size = -1; *size = -1;
*alignment = -1; *alignment = -1;
return FALSE; return FALSE;
} }
else if (type_ffi == &ffi_type_pointer) else if (type_ffi == &ffi_type_pointer)
{ {
g_warning ("non-pointer field '%s' has unhandled type %s", g_warning ("Field %s.%s.%s has is not a pointer and is of type %s",
((GIrNode *)field)->name, module->name, parent_node->name, ((GIrNode *)field)->name,
g_type_tag_to_string (type->tag)); g_type_tag_to_string (type->tag));
*size = -1; *size = -1;
*alignment = -1; *alignment = -1;
@ -234,7 +240,8 @@ get_field_size_alignment (GIrNodeField *field,
#define ALIGN(n, align) (((n) + (align) - 1) & ~((align) - 1)) #define ALIGN(n, align) (((n) + (align) - 1) & ~((align) - 1))
static gboolean static gboolean
compute_struct_field_offsets (GList *members, compute_struct_field_offsets (GIrNode *node,
GList *members,
GIrModule *module, GIrModule *module,
GList *modules, GList *modules,
gint *size_out, gint *size_out,
@ -260,7 +267,7 @@ compute_struct_field_offsets (GList *members,
int member_size; int member_size;
int member_alignment; int member_alignment;
if (get_field_size_alignment (field, if (get_field_size_alignment (field, node,
module, modules, module, modules,
&member_size, &member_alignment)) &member_size, &member_alignment))
{ {
@ -301,7 +308,8 @@ compute_struct_field_offsets (GList *members,
} }
static gboolean static gboolean
compute_union_field_offsets (GList *members, compute_union_field_offsets (GIrNode *node,
GList *members,
GIrModule *module, GIrModule *module,
GList *modules, GList *modules,
gint *size_out, gint *size_out,
@ -327,7 +335,7 @@ compute_union_field_offsets (GList *members,
int member_size; int member_size;
int member_alignment; int member_alignment;
if (get_field_size_alignment (field, if (get_field_size_alignment (field, node,
module, modules, module, modules,
&member_size, &member_alignment)) &member_size, &member_alignment))
{ {
@ -401,7 +409,7 @@ g_ir_node_compute_offsets (GIrNode *node,
if (!check_needs_computation (node, module, boxed->alignment)) if (!check_needs_computation (node, module, boxed->alignment))
return; return;
compute_struct_field_offsets (boxed->members, compute_struct_field_offsets (node, boxed->members,
module, modules, module, modules,
&boxed->size, &boxed->alignment); &boxed->size, &boxed->alignment);
break; break;
@ -413,7 +421,7 @@ g_ir_node_compute_offsets (GIrNode *node,
if (!check_needs_computation (node, module, struct_->alignment)) if (!check_needs_computation (node, module, struct_->alignment))
return; return;
compute_struct_field_offsets (struct_->members, compute_struct_field_offsets (node, struct_->members,
module, modules, module, modules,
&struct_->size, &struct_->alignment); &struct_->size, &struct_->alignment);
break; break;
@ -425,7 +433,7 @@ g_ir_node_compute_offsets (GIrNode *node,
if (!check_needs_computation (node, module, union_->alignment)) if (!check_needs_computation (node, module, union_->alignment))
return; return;
compute_union_field_offsets (union_->members, compute_union_field_offsets (node, union_->members,
module, modules, module, modules,
&union_->size, &union_->alignment); &union_->size, &union_->alignment);
break; break;