From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Mon, 4 Oct 2021 08:36:58 +0000 (+0200)
Subject: dragonnet_addr_str: Use asprintf
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=eff3085797a5b229272b7ad2b6a1f85efaf8def9;p=dragonnet.git

dragonnet_addr_str: Use asprintf
---

diff --git a/addr.c b/addr.c
index a257a5d..e997257 100644
--- a/addr.c
+++ b/addr.c
@@ -1,3 +1,4 @@
+#include <dragonport/asprintf.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,10 +44,11 @@ DragonnetAddr dragonnet_addr_parse_str(char *str)
 	return addr;
 }
 
-void dragonnet_addr_str(char dst[7+INET6_ADDRSTRLEN], DragonnetAddr addr)
+char *dragonnet_addr_str(DragonnetAddr addr)
 {
-	memset(dst, 0, 7+INET6_ADDRSTRLEN);
-	sprintf(dst, "[%s]:%s", addr.ip, addr.port);
+	char *ptr;
+	asprintf(&ptr, "[%s]:%s", addr.ip, addr.port);
+	return ptr;
 }
 
 DragonnetAddr dragonnet_addr_parse_sock(struct sockaddr_in6 ai_addr)
diff --git a/addr.h b/addr.h
index 11fd281..7e8d732 100644
--- a/addr.h
+++ b/addr.h
@@ -9,7 +9,7 @@ typedef struct {
 } DragonnetAddr;
 
 DragonnetAddr dragonnet_addr_parse_str(char *addr);
-void dragonnet_addr_str(char dst[7+INET6_ADDRSTRLEN], DragonnetAddr addr);
+char *dragonnet_addr_str(DragonnetAddr addr);
 
 DragonnetAddr dragonnet_addr_parse_sock(struct sockaddr_in6 ai_addr);
 struct sockaddr_in6 dragonnet_addr_sock(DragonnetAddr addr);