From 1705e5d927dba731c135e1192bfdee421829786a Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Fri, 22 Jan 2016 12:58:16 +0200 Subject: Unify some typedefs. Use _ptr_t suffix for typedefs that define pointers. --- include/grecs/list.h | 31 +++++++++++++++---------------- include/grecs/node.h | 2 +- include/grecs/symtab.h | 21 +++++++++++---------- include/grecs/value.h | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'include') diff --git a/include/grecs/list.h b/include/grecs/list.h index efccd56..a5840db 100644 --- a/include/grecs/list.h +++ b/include/grecs/list.h @@ -17,8 +17,8 @@ #ifndef _GRECS_LIST_H #define _GRECS_LIST_H -typedef struct grecs_list_entry *grecs_list_entry_t; -typedef struct grecs_list *grecs_list_t; +typedef struct grecs_list_entry *grecs_list_entry_ptr_t; +typedef struct grecs_list *grecs_list_ptr_t; struct grecs_list_entry { struct grecs_list_entry *next, *prev; @@ -32,24 +32,23 @@ struct grecs_list { void (*free_entry)(void *); }; -grecs_list_t grecs_list_create(void); -size_t grecs_list_size(grecs_list_t); -void grecs_list_append(grecs_list_t, void *); -void grecs_list_push(grecs_list_t, void *); -void *grecs_list_pop(grecs_list_t); -void *grecs_list_locate(grecs_list_t, void *); -void *grecs_list_index(grecs_list_t, size_t); -void *grecs_list_remove_tail(grecs_list_t); -void grecs_list_remove_entry(grecs_list_t, grecs_list_entry_t); -void grecs_list_clear(grecs_list_t); -void grecs_list_free(grecs_list_t); -void grecs_list_add(grecs_list_t, grecs_list_t); +grecs_list_ptr_t grecs_list_create(void); +size_t grecs_list_size(grecs_list_ptr_t); +void grecs_list_append(grecs_list_ptr_t, void *); +void grecs_list_push(grecs_list_ptr_t, void *); +void *grecs_list_pop(grecs_list_ptr_t); +void *grecs_list_locate(grecs_list_ptr_t, void *); +void *grecs_list_index(grecs_list_ptr_t, size_t); +void *grecs_list_remove_tail(grecs_list_ptr_t); +void grecs_list_remove_entry(grecs_list_ptr_t, grecs_list_entry_ptr_t); +void grecs_list_clear(grecs_list_ptr_t); +void grecs_list_free(grecs_list_ptr_t); +void grecs_list_add(grecs_list_ptr_t, grecs_list_ptr_t); +int grecs_list_compare(grecs_list_ptr_t, grecs_list_ptr_t); /* FIXME */ struct grecs_list *_grecs_simple_list_create(int dispose); struct grecs_list *grecs_value_list_create(void); - - #endif diff --git a/include/grecs/node.h b/include/grecs/node.h index 5bbe9dc..2d879ad 100644 --- a/include/grecs/node.h +++ b/include/grecs/node.h @@ -38,7 +38,7 @@ typedef struct grecs_node { grecs_locus_t idloc; union { grecs_value_t *value; - grecs_symtab_t texttab; + grecs_symtab_ptr_t texttab; } v; } grecs_node_t; diff --git a/include/grecs/symtab.h b/include/grecs/symtab.h index a4a7106..3008b17 100644 --- a/include/grecs/symtab.h +++ b/include/grecs/symtab.h @@ -17,7 +17,8 @@ #ifndef _GRECS_SYMTAB_H #define _GRECS_SYMTAB_H -typedef struct grecs_symtab *grecs_symtab_t; +typedef struct grecs_symtab *grecs_symtab_ptr_t; +typedef struct grecs_syment *grecs_syment_ptr_t; struct grecs_syment { char *name; @@ -27,24 +28,24 @@ typedef int (*grecs_symtab_enumerator_t)(void *sym, void *data); const char *grecs_symtab_strerror(int rc); -void *grecs_symtab_lookup_or_install(grecs_symtab_t st, +void *grecs_symtab_lookup_or_install(grecs_symtab_ptr_t st, void *key, int *install); -void grecs_symtab_clear(grecs_symtab_t st); -grecs_symtab_t grecs_symtab_create(size_t elsize, +void grecs_symtab_clear(grecs_symtab_ptr_t st); +grecs_symtab_ptr_t grecs_symtab_create(size_t elsize, unsigned (*hash_fun)(void *, unsigned long), int (*cmp_fun)(const void *, const void *), int (*copy_fun)(void *, void *), void *(*alloc_fun)(size_t), void (*free_fun)(void *)); -grecs_symtab_t grecs_symtab_create_default(size_t elsize); +grecs_symtab_ptr_t grecs_symtab_create_default(size_t elsize); -void grecs_symtab_free(grecs_symtab_t pst); -int grecs_symtab_remove(grecs_symtab_t st, void *elt); -int grecs_symtab_replace(grecs_symtab_t st, void *ent, void **old_ent); -int grecs_symtab_enumerate(grecs_symtab_t st, +void grecs_symtab_free(grecs_symtab_ptr_t pst); +int grecs_symtab_remove(grecs_symtab_ptr_t st, void *elt); +int grecs_symtab_replace(grecs_symtab_ptr_t st, void *ent, void **old_ent); +int grecs_symtab_enumerate(grecs_symtab_ptr_t st, grecs_symtab_enumerator_t fun, void *data); -size_t grecs_symtab_count_entries(grecs_symtab_t st); +size_t grecs_symtab_count_entries(grecs_symtab_ptr_t st); unsigned grecs_hash_string(const char *name, unsigned long hashsize); unsigned grecs_hash_string_ci(const char *name, unsigned long hashsize); diff --git a/include/grecs/value.h b/include/grecs/value.h index 73f979c..8cd2800 100644 --- a/include/grecs/value.h +++ b/include/grecs/value.h @@ -28,7 +28,7 @@ typedef struct grecs_value { int type; grecs_locus_t locus; union { - grecs_list_t list; + grecs_list_ptr_t list; char *string; struct { size_t c; -- cgit v1.2.1