From f7c956c35a20b0c316e3268762be991cb70c37dc Mon Sep 17 00:00:00 2001 From: Bart House Date: Sun, 14 Jul 2019 21:12:59 -0700 Subject: [PATCH] Revert "Adding ptr_array data structure." This reverts commit e665d3b85024e3a7580e80888a70b47d5ae9384c. --- include/decl.h | 7 ------- include/extern.h | 2 -- src/hacklib.c | 34 ---------------------------------- 3 files changed, 43 deletions(-) diff --git a/include/decl.h b/include/decl.h index 834b14ab8..5ebaa326e 100644 --- a/include/decl.h +++ b/include/decl.h @@ -455,13 +455,6 @@ struct early_opt { boolean valallowed; }; -struct ptr_array { - size_t length; - size_t max_length; - void ** elements; -}; -typedef struct ptr_array ptr_array_t; - #undef E #endif /* DECL_H */ diff --git a/include/extern.h b/include/extern.h index d2ed2ff9e..abea20a68 100644 --- a/include/extern.h +++ b/include/extern.h @@ -968,8 +968,6 @@ E void FDECL(strbuf_append, (strbuf_t *, const char *)); E void FDECL(strbuf_reserve, (strbuf_t *, int)); E void FDECL(strbuf_empty, (strbuf_t *)); E void FDECL(strbuf_nl_to_crlf, (strbuf_t *)); -E struct ptr_array * FDECL(ptr_array_new, (size_t length)); -E void FDECL(ptr_array_free, (struct ptr_array *)); /* ### invent.c ### */ diff --git a/src/hacklib.c b/src/hacklib.c index 9fe316517..b97a78a65 100644 --- a/src/hacklib.c +++ b/src/hacklib.c @@ -1223,38 +1223,4 @@ strbuf_t *strbuf; } } -ptr_array_t * -ptr_array_new(max_length) - size_t max_length; -{ - size_t esize = max_length * sizeof(void *); - ptr_array_t * a = (ptr_array_t *) malloc(sizeof(ptr_array_t) + esize); - a->elements = (void **)(a + 1); - a->length = 0; - a->max_length = max_length; - memset(a->elements, 0, esize); - return a; -} - -void -ptr_array_free(a) - ptr_array_t * a; -{ - size_t i; - - nhassert(a->length <= a->max_length); - - for(i = 0; i < a->length; i++) - if(a->elements[i]) - free(a->elements[i]); - - for (i = a->length; i < a->max_length; i++) { - nhassert(a->elements[i] == NULL); - if(a->elements[i]) - free(a->elements[i]); - } - - free(a); -} - /*hacklib.c*/