Revert "Add osmo_sockaddr_strs_to_str()"

This reverts commit e145e28a91eeca65d34d7b82caa2190fa89492b4.

Reason for revert:
The function osmo_sockaddr_strs_to_str() should not be part of the
osmo_sockaddr_str API. The implementation of this should live in
the function multiaddr_snprintf() added in patch
Icef53fe4b6e51563d97a1bc48001d67679b3b6e9
and should not use dynamic allocation.

Change-Id: I263dfd68313b896c5b474025fbca13c22ce41cdc

2 files changed, 2 insertions, 63 deletions

diff --git a/tests/sockaddr_str/sockaddr_str_test.c b/tests/sockaddr_str/sockaddr_str_test.c
index 8077b9a6..0d0674b6 100644
--- a/tests/sockaddr_str/sockaddr_str_test.c
+++ b/tests/sockaddr_str/sockaddr_str_test.c
@@ -24,10 +24,7 @@
 #include <errno.h>
 #include <string.h>
 #include <osmocom/core/sockaddr_str.h>
-#include <osmocom/core/application.h>
-#include <osmocom/core/logging.h>
 #include <osmocom/core/utils.h>
-#include <osmocom/core/socket.h>
 #include <netinet/in.h>
 
 struct osmo_sockaddr_str oip_data[] = {
@@ -262,62 +259,10 @@ static void test_osmo_sockaddr_str_cmp()
 	}
 }
 
-static int test_sockaddr_strs_dump(void *ctx, struct osmo_sockaddr_str *xdata, size_t count)
-{
-	char buf[OSMO_SOCK_NAME_MAXLEN * OSMO_SOCK_MAX_ADDRS * 2];
-	struct osmo_sockaddr_str *sa_strs[OSMO_SOCK_MAX_ADDRS];
-	int i, j, rc;
-
-	for (i = 0, j = 0; j < count && i < OSMO_SOCK_MAX_ADDRS; j++) {//ARRAY_SIZE(oip_data)
-		sa_strs[i] = talloc_zero(ctx, struct osmo_sockaddr_str);
-		struct sockaddr_storage tmp;
-		if (osmo_sockaddr_str_to_sockaddr(&xdata[j], &tmp) == 0) {//&oip_data[j]
-			rc = osmo_sockaddr_str_from_sockaddr(sa_strs[i], &tmp);
-			if (rc < 0) {
-				printf("osmo_sockaddr_str_from_sockaddr(%d) failed on ", i);
-				dump_oip(&xdata[j]);//&oip_data[j]
-				return rc;
-			}
-			i++;
-		}
-	}
-	rc = osmo_sockaddr_strs_to_str(buf, sizeof(buf), (const struct osmo_sockaddr_str **)sa_strs, i);
-	printf("\nTest data [%d == %ld]: %s\n", rc, strlen(buf), buf);
-	return rc;
-}
-
-const struct log_info_cat default_categories[] = {
-};
-
-static struct log_info info = {
-	.cat = default_categories,
-	.num_cat = ARRAY_SIZE(default_categories),
-};
-
 int main(int argc, char **argv)
 {
-	int rc;
-	void *ctx = talloc_named_const(NULL, 0, "sockaddr_str__test");
-	osmo_init_logging2(ctx, &info);
-	log_set_use_color(osmo_stderr_target, 0);
-	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
-	log_set_print_category(osmo_stderr_target, 0);
-	log_set_print_category_hex(osmo_stderr_target, 0);
-
 	sockaddr_str_test_conversions();
 	test_osmo_sockaddr_str_cmp();
-
-	rc = test_sockaddr_strs_dump(ctx, oip_data, ARRAY_SIZE(oip_data));
-	if (rc < 0)
-		return EXIT_FAILURE;
-
-	rc = test_sockaddr_strs_dump(ctx, oip_data, 1);
-	if (rc < 0)
-		return EXIT_FAILURE;
-
-	rc = test_sockaddr_strs_dump(ctx, oip_data, 0);
-	if (rc < 0)
-		return EXIT_FAILURE;
-
-	return EXIT_SUCCESS;
+	return 0;
 }
+
diff --git a/tests/sockaddr_str/sockaddr_str_test.ok b/tests/sockaddr_str/sockaddr_str_test.ok
index 504231c4..910e9195 100644
--- a/tests/sockaddr_str/sockaddr_str_test.ok
+++ b/tests/sockaddr_str/sockaddr_str_test.ok
@@ -937,9 +937,3 @@ test_osmo_sockaddr_str_cmp
   osmo_sockaddr_str_cmp(): [0::]:5(zero) > 0.0.0.0:5(zero)
   osmo_sockaddr_str_cmp(): [0::]:5(zero) == [::]:5(zero)
   osmo_sockaddr_str_cmp(): [0::]:5(zero) == [0::]:5(zero)
-
-Test data [179 == 179]: (1.2.3.4|0.0.0.0|255.255.255.255|[1:2:3::4]|[::]|[::1]|[ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]|[ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]|1.2.3.4|[::1:a09:807]|0.0.0.0|[::]|[::])
-
-Test data [7 == 7]: 1.2.3.4
-
-Test data [2 == 2]: ()