X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc200171d7c40be3b204460f9c14d5d37e771866..5d3b05b9b624b745527e84f605c9cb04c6831c78:/src/irc_string.c

diff --git a/src/irc_string.c b/src/irc_string.c
index 90c21d1..f5f1187 100644
--- a/src/irc_string.c
+++ b/src/irc_string.c
@@ -218,7 +218,7 @@ ircd_base64_encode(const unsigned char *str, int length)
 		return NULL;
 	}
 
-	result = MyMalloc(((length + 2) / 3) * 5);
+	result = rb_malloc(((length + 2) / 3) * 5);
 	p = result;
 
 	while (length > 2) 
@@ -255,7 +255,7 @@ ircd_base64_decode(const unsigned char *str, int length, int *ret)
 	int ch, i = 0, j = 0, k;
 	unsigned char *result;
 	
-	result = MyMalloc(length + 1);
+	result = rb_malloc(length + 1);
 
 	while ((ch = *current++) != '\0' && length-- > 0) {
 		if (ch == base64_pad) break;
@@ -539,7 +539,7 @@ inetpton_sock(const char *src, struct sockaddr *dst)
 	{
 		((struct sockaddr_in *) dst)->sin_port = 0;
 		((struct sockaddr_in *) dst)->sin_family = AF_INET;
-		SET_SS_LEN((struct irc_sockaddr_storage *) dst, sizeof(struct sockaddr_in));
+		SET_SS_LEN((struct rb_sockaddr_storage *) dst, sizeof(struct sockaddr_in));
 		return 1;
 	}
 #ifdef IPV6
@@ -547,7 +547,7 @@ inetpton_sock(const char *src, struct sockaddr *dst)
 	{
 		((struct sockaddr_in6 *) dst)->sin6_port = 0;
 		((struct sockaddr_in6 *) dst)->sin6_family = AF_INET6;
-		SET_SS_LEN((struct irc_sockaddr_storage *) dst, sizeof(struct sockaddr_in6));
+		SET_SS_LEN((struct rb_sockaddr_storage *) dst, sizeof(struct sockaddr_in6));
 		return 1;
 	}
 #endif