From dbd48293ec5c9ec5b6ca4e5c93b22c84dd079682 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Tue, 6 Aug 2024 11:17:50 -0400
Subject: [PATCH] MT#55283 remove obsolete feature

Change-Id: I8bc2d99c1cf93f52d75592cc73d1da65d87d35ed
---
 daemon/bencode.c    | 24 ------------------------
 daemon/control_ng.c |  8 ++++----
 include/bencode.h   |  5 -----
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/daemon/bencode.c b/daemon/bencode.c
index afe918e4b..3b8880eb7 100644
--- a/daemon/bencode.c
+++ b/daemon/bencode.c
@@ -23,11 +23,6 @@ struct __bencode_buffer_piece {
 	struct __bencode_buffer_piece *next;
 	char buf[0];
 };
-struct __bencode_free_list {
-	void *ptr;
-	free_func_t func;
-	struct __bencode_free_list *next;
-};
 struct __bencode_hash {
 	struct bencode_item *buckets[BENCODE_HASH_BUCKETS];
 };
@@ -100,7 +95,6 @@ int bencode_buffer_init(bencode_buffer_t *buf) {
 	buf->pieces = __bencode_piece_new(0);
 	if (!buf->pieces)
 		return -1;
-	buf->free_list = NULL;
 	buf->error = 0;
 	return 0;
 }
@@ -141,12 +135,8 @@ alloc:
 }
 
 void bencode_buffer_free(bencode_buffer_t *buf) {
-	struct __bencode_free_list *fl;
 	struct __bencode_buffer_piece *piece, *next;
 
-	for (fl = buf->free_list; fl; fl = fl->next)
-		fl->func(fl->ptr);
-
 	for (piece = buf->pieces; piece; piece = next) {
 		next = piece->next;
 		BENCODE_FREE(piece);
@@ -686,20 +676,6 @@ bencode_item_t *bencode_dictionary_get_len(bencode_item_t *dict, const char *key
 	return NULL;
 }
 
-void bencode_buffer_destroy_add(bencode_buffer_t *buf, free_func_t func, void *p) {
-	struct __bencode_free_list *li;
-
-	if (!p)
-		return;
-	li = bencode_buffer_alloc(buf, sizeof(*li));
-	if (!li)
-		return;
-	li->ptr = p;
-	li->func = func;
-	li->next = buf->free_list;
-	buf->free_list = li;
-}
-
 static ssize_t __bencode_string(const char *s, ssize_t offset, size_t len) {
 	size_t pos;
 	unsigned long sl;
diff --git a/daemon/control_ng.c b/daemon/control_ng.c
index 6a0b3a69d..aad4060c8 100644
--- a/daemon/control_ng.c
+++ b/daemon/control_ng.c
@@ -614,10 +614,6 @@ ng_buffer *ng_buffer_new(struct obj *ref) {
 	if (ref)
 		ngbuf->ref = obj_get_o(ref); // hold until we're done
 
-	int ret = bencode_buffer_init(&ngbuf->buffer);
-	assert(ret == 0);
-	(void) ret;
-
 	return ngbuf;
 }
 
@@ -643,6 +639,10 @@ static void control_ng_process_payload(ng_ctx *hctx, str *reply, str *data, cons
 
 	/* Bencode dictionary */
 	if (data->s[0] == 'd') {
+		int ret = bencode_buffer_init(&parser_ctx.ngbuf->buffer);
+		assert(ret == 0);
+		(void) ret;
+
 		parser_ctx.req.benc = bencode_decode_expect_str(&parser_ctx.ngbuf->buffer, data, BENCODE_DICTIONARY);
 		errstr = "Could not decode bencode dictionary";
 		if (!parser_ctx.req.benc)
diff --git a/include/bencode.h b/include/bencode.h
index 11d185f09..6b041a935 100644
--- a/include/bencode.h
+++ b/include/bencode.h
@@ -39,7 +39,6 @@ struct bencode_item {
 
 struct bencode_buffer {
 	struct __bencode_buffer_piece *pieces;
-	struct __bencode_free_list *free_list;
 	unsigned int error:1;	/* set to !0 if allocation failed at any point */
 };
 
@@ -78,10 +77,6 @@ bencode_item_t *bencode_dictionary(bencode_buffer_t *buf);
  * Returns NULL if no memory could be allocated. */
 bencode_item_t *bencode_list(bencode_buffer_t *buf);
 
-/* Adds a pointer to the bencode_buffer_t object's internal free list. When the bencode_buffer_t
- * object is destroyed, the specified function will be called on this pointer. */
-void bencode_buffer_destroy_add(bencode_buffer_t *buf, free_func_t, void *);
-
 /* Returns the buffer associated with an item, or NULL if pointer given is NULL */
 INLINE bencode_buffer_t *bencode_item_buffer(bencode_item_t *);