diff options
Diffstat (limited to 'src/analysis/routine.c')
| -rw-r--r-- | src/analysis/routine.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/analysis/routine.c b/src/analysis/routine.c index 7151fdc..c26886f 100644 --- a/src/analysis/routine.c +++ b/src/analysis/routine.c @@ -43,11 +43,11 @@ struct _GBinRoutine RoutineType type; /* Type de routine */ - GOpenidaType *ret_type; /* Type retourné */ + GDataType *ret_type; /* Type retourné */ - GOpenidaType *namespace; /* Espace de noms / classe */ + GDataType *namespace; /* Espace de noms / classe */ char *name; /* Désignation humaine */ - GOpenidaType *full_name; /* Désignation très complète */ + GDataType *full_name; /* Désignation très complète */ GBinVariable **args; /* Arguments de la routines */ size_t args_count; /* Nombre d'arguments */ @@ -153,13 +153,13 @@ GBinRoutine *g_binary_routine_new(void) * * ******************************************************************************/ -GBinRoutine *g_binary_routine_new_constructor(GOpenidaType *type) +GBinRoutine *g_binary_routine_new_constructor(GDataType *type) { GBinRoutine *result; /* Structure à retourner */ result = g_object_new(G_TYPE_BIN_ROUTINE, NULL); - g_binary_routine_set_name(result, _g_openida_type_to_string(type, true)); + g_binary_routine_set_name(result, _g_data_type_to_string(type, true)); return result; @@ -360,7 +360,7 @@ void g_binary_routine_set_type(GBinRoutine *routine, RoutineType type) * * ******************************************************************************/ -void g_binary_routine_set_namespace(GBinRoutine *routine, GOpenidaType *namespace) +void g_binary_routine_set_namespace(GBinRoutine *routine, GDataType *namespace) { routine->namespace = namespace; @@ -379,7 +379,7 @@ void g_binary_routine_set_namespace(GBinRoutine *routine, GOpenidaType *namespac * * ******************************************************************************/ -GOpenidaType *g_binary_routine_get_namespace(const GBinRoutine *routine) +GDataType *g_binary_routine_get_namespace(const GBinRoutine *routine) { return routine->namespace; @@ -424,7 +424,7 @@ void g_binary_routine_set_name(GBinRoutine *routine, char *name) const char *g_binary_routine_get_name(const GBinRoutine *routine) { if (routine->name == NULL && routine->full_name != NULL) - g_binary_routine_set_name(routine, g_openida_type_to_string(routine->full_name)); + g_binary_routine_set_name(routine, g_data_type_to_string(routine->full_name)); return routine->name; @@ -444,7 +444,7 @@ const char *g_binary_routine_get_name(const GBinRoutine *routine) * * ******************************************************************************/ -void g_binary_routine_set_name_from_type(GBinRoutine *routine, GOpenidaType *type) +void g_binary_routine_set_name_from_type(GBinRoutine *routine, GDataType *type) { if (routine->full_name != NULL) g_object_unref(G_OBJECT(routine->full_name)); @@ -466,7 +466,7 @@ void g_binary_routine_set_name_from_type(GBinRoutine *routine, GOpenidaType *typ * * ******************************************************************************/ -GOpenidaType *g_binary_routine_get_type_from_name(const GBinRoutine *routine) +GDataType *g_binary_routine_get_type_from_name(const GBinRoutine *routine) { return routine->full_name; @@ -486,7 +486,7 @@ GOpenidaType *g_binary_routine_get_type_from_name(const GBinRoutine *routine) * * ******************************************************************************/ -void g_binary_routine_set_return_type(GBinRoutine *routine, GOpenidaType *type) +void g_binary_routine_set_return_type(GBinRoutine *routine, GDataType *type) { if (routine->ret_type != NULL) g_object_unref(G_OBJECT(routine->ret_type)); @@ -511,7 +511,7 @@ void g_binary_routine_set_return_type(GBinRoutine *routine, GOpenidaType *type) * * ******************************************************************************/ -GOpenidaType *g_binary_routine_get_return_type(const GBinRoutine *routine) +GDataType *g_binary_routine_get_return_type(const GBinRoutine *routine) { return routine->ret_type; @@ -757,8 +757,8 @@ char *_g_binary_routine_to_string(const GBinRoutine *routine, Routine2StringOpti if (routine->ret_type == NULL) result = strdup("??? "); else { - result = _g_openida_type_to_string(routine->ret_type, !(options & RSO_LONG_TYPE)); - if (!g_openida_type_is_pointer(routine->ret_type, true)) + result = _g_data_type_to_string(routine->ret_type, !(options & RSO_LONG_TYPE)); + if (!g_data_type_is_pointer(routine->ret_type, true)) result = stradd(result, " "); } break; @@ -769,7 +769,7 @@ char *_g_binary_routine_to_string(const GBinRoutine *routine, Routine2StringOpti if (options & RSO_NAMESPACE && routine->namespace != NULL) { - namespace = g_openida_type_to_string(routine->namespace); + namespace = g_data_type_to_string(routine->namespace); result = stradd(result, namespace); result = stradd(result, "." /* FIXME */); |