diff options
Diffstat (limited to 'girepository/gitypelib.c')
| -rw-r--r-- | girepository/gitypelib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index d9e924f6..dbc7261e 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -272,7 +272,7 @@ strsplit_iter_init (StrSplitIter *iter, static gboolean strsplit_iter_next (StrSplitIter *iter, - char **out_val) + const char **out_val) { const char *s = iter->s; const char *next; @@ -324,7 +324,7 @@ g_typelib_matches_gtype_name_prefix (GITypelib *typelib, { Header *header = (Header *)typelib->data; const char *c_prefix; - gchar *prefix; + const gchar *prefix; gboolean ret = FALSE; StrSplitIter split_iter; gsize gtype_name_len; @@ -1500,7 +1500,7 @@ validate_struct_blob (ValidateContext *ctx, field_offset = offset + sizeof (StructBlob); for (i = 0; i < blob->n_fields; i++) { - FieldBlob *blob = (FieldBlob*) &typelib->data[field_offset]; + FieldBlob *field_blob = (FieldBlob*) &typelib->data[field_offset]; if (!validate_field_blob (ctx, field_offset, @@ -1508,7 +1508,7 @@ validate_struct_blob (ValidateContext *ctx, return FALSE; field_offset += sizeof (FieldBlob); - if (blob->has_embedded_type) + if (field_blob->has_embedded_type) field_offset += sizeof (CallbackBlob); } @@ -1778,14 +1778,14 @@ validate_object_blob (ValidateContext *ctx, n_field_callbacks = 0; for (i = 0; i < blob->n_fields; i++) { - FieldBlob *blob = (FieldBlob*) &typelib->data[offset2]; + FieldBlob *field_blob = (FieldBlob*) &typelib->data[offset2]; if (!validate_field_blob (ctx, offset2, error)) return FALSE; offset2 += sizeof (FieldBlob); /* Special case fields which are callbacks. */ - if (blob->has_embedded_type) { + if (field_blob->has_embedded_type) { offset2 += sizeof (CallbackBlob); n_field_callbacks++; } @@ -2455,7 +2455,7 @@ g_typelib_free (GITypelib *typelib) g_free (typelib->data); if (typelib->modules) { - g_list_foreach (typelib->modules, (GFunc) g_module_close, NULL); + g_list_foreach (typelib->modules, (GFunc) (void *) g_module_close, NULL); g_list_free (typelib->modules); } g_slice_free (GITypelib, typelib); |