diff --git a/ginfo.c b/ginfo.c index 1d56a22a0..724109feb 100644 --- a/ginfo.c +++ b/ginfo.c @@ -1093,23 +1093,6 @@ g_type_info_is_zero_terminated (GITypeInfo *info) return FALSE; } -GIArrayType -g_type_info_get_array_type (GITypeInfo *info) -{ - GIRealInfo *rinfo = (GIRealInfo *)info; - SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - - if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) - { - ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; - g_return_val_if_fail (blob->tag == GI_TYPE_TAG_ARRAY, -1); - - return blob->array_type; - } - - return -1; -} - gint g_type_info_get_n_error_domains (GITypeInfo *info) { diff --git a/girepository.h b/girepository.h index 9e62ab153..cfa5b3906 100644 --- a/girepository.h +++ b/girepository.h @@ -383,13 +383,6 @@ typedef enum { * See docs/typelib-format.txt SimpleTypeBlob definition */ } GITypeTag; -typedef enum { - GI_ARRAY_TYPE_C, - GI_ARRAY_TYPE_ARRAY, - GI_ARRAY_TYPE_PTR_ARRAY, - GI_ARRAY_TYPE_BYTE_ARRAY -} GIArrayType; - #define G_TYPE_TAG_IS_BASIC(tag) (tag < GI_TYPE_TAG_ARRAY) const gchar* g_type_tag_to_string (GITypeTag type); @@ -402,7 +395,6 @@ GIBaseInfo * g_type_info_get_interface (GITypeInfo *info); gint g_type_info_get_array_length (GITypeInfo *info); gint g_type_info_get_array_fixed_size(GITypeInfo *info); gboolean g_type_info_is_zero_terminated (GITypeInfo *info); -GIArrayType g_type_info_get_array_type (GITypeInfo *info); gint g_type_info_get_n_error_domains (GITypeInfo *info); GIErrorDomainInfo *g_type_info_get_error_domain (GITypeInfo *info, diff --git a/girnode.c b/girnode.c index 6f4a44af9..1694406da 100644 --- a/girnode.c +++ b/girnode.c @@ -1497,7 +1497,6 @@ g_ir_node_build_typelib (GIrNode *node, array->zero_terminated = type->zero_terminated; array->has_length = type->has_length; array->has_size = type->has_size; - array->array_type = type->array_type; array->reserved2 = 0; if (array->has_length) array->dimensions.length = type->length; diff --git a/girnode.h b/girnode.h index 5e6cba035..7fe235b89 100644 --- a/girnode.h +++ b/girnode.h @@ -138,7 +138,6 @@ struct _GIrNodeType gint length; gboolean has_size; gint size; - gint array_type; GIrNodeType *parameter_type1; GIrNodeType *parameter_type2; diff --git a/girparser.c b/girparser.c index 85f85e219..5b24604af 100644 --- a/girparser.c +++ b/girparser.c @@ -1717,40 +1717,22 @@ start_type (GMarkupParseContext *context, typenode->is_pointer = TRUE; typenode->is_array = TRUE; - ctype = find_attribute ("c:type", attribute_names, attribute_values); - if (g_str_has_prefix (ctype, "GArray")) { - typenode->array_type = GI_ARRAY_TYPE_ARRAY; - } else if (g_str_has_prefix (ctype, "GByteArray")) { - typenode->array_type = GI_ARRAY_TYPE_BYTE_ARRAY; - } else if (g_str_has_prefix (ctype, "GPtrArray")) { - typenode->array_type = GI_ARRAY_TYPE_PTR_ARRAY; - } else { - typenode->array_type = GI_ARRAY_TYPE_C; - } + zero = find_attribute ("zero-terminated", attribute_names, attribute_values); + len = find_attribute ("length", attribute_names, attribute_values); + size = find_attribute ("fixed-size", attribute_names, attribute_values); - if (typenode->array_type == GI_ARRAY_TYPE_C) { - zero = find_attribute ("zero-terminated", attribute_names, attribute_values); - len = find_attribute ("length", attribute_names, attribute_values); - size = find_attribute ("fixed-size", attribute_names, attribute_values); + typenode->zero_terminated = !(zero && strcmp (zero, "1") != 0); + typenode->has_length = len != NULL; + typenode->length = typenode->has_length ? atoi (len) : -1; - typenode->has_length = len != NULL; - typenode->length = typenode->has_length ? atoi (len) : -1; + typenode->has_size = size != NULL; + typenode->size = typenode->has_size ? atoi (size) : -1; - typenode->has_size = size != NULL; - typenode->size = typenode->has_size ? atoi (size) : -1; - - if (zero) - typenode->zero_terminated = strcmp(zero, "1") == 0; - else - /* If neither zero-terminated nor length nor fixed-size is given, assume zero-terminated. */ - typenode->zero_terminated = !(typenode->has_length || typenode->has_size); - } else { - typenode->zero_terminated = FALSE; - typenode->has_length = FALSE; - typenode->length = -1; - typenode->has_size = FALSE; - typenode->size = -1; - } + if (zero) + typenode->zero_terminated = strcmp(zero, "1") == 0; + else + /* If neither zero-terminated nor length nor fixed-size is given, assume zero-terminated. */ + typenode->zero_terminated = !(typenode->has_length || typenode->has_size); } else { diff --git a/gtypelib.h b/gtypelib.h index 820801498..14edc9841 100644 --- a/gtypelib.h +++ b/gtypelib.h @@ -524,14 +524,9 @@ typedef struct { * of the array. If both has_length and zero_terminated are set, the * convention is to pass -1 for the length if the array is * zero-terminated. - * @has_size: Indicates that size is the fixed size of the array. - * @array_type: Indicates whether this is a C array, GArray, GPtrArray, or - * GByteArray. If something other than a C array, the length and element size - * are implicit in the structure. * @length: The index of the parameter which is used to pass the length of the * array. The parameter must be an integer type and have the same * direction as this one. - * @size: The fixed size of the array. * @type: The type of the array elements. * * Arrays are passed by reference, thus is_pointer is always 1. @@ -544,8 +539,7 @@ typedef struct { guint16 zero_terminated :1; guint16 has_length :1; guint16 has_size :1; - guint16 array_type :2; - guint16 reserved2 :3; + guint16 reserved2 :5; union { guint16 length;