#include "stdinc.h"
#include "sprintf_irc.h"
-#include "tools.h"
#include "irc_string.h"
#include "client.h"
-#include "memory.h"
#include "setup.h"
#ifndef INADDRSZ
return NULL;
}
- result = MyMalloc(((length + 2) / 3) * 5);
+ result = rb_malloc(((length + 2) / 3) * 5);
p = result;
while (length > 2)
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;
* SOFTWARE.
*/
-#define SPRINTF(x) ((size_t)ircsprintf x)
+#define SPRINTF(x) ((size_t)rb_sprintf x)
/*
* WARNING: Don't even consider trying to compile this on a system where
{
((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 irc_sockaddr_storage *) dst, sizeof(struct sockaddr_in));
return 1;
}
#ifdef IPV6
{
((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 irc_sockaddr_storage *) dst, sizeof(struct sockaddr_in6));
return 1;
}
#endif
if(inet_pton4(src, dst))
{
char tmp[HOSTIPLEN];
- ircsprintf(tmp, "::ffff:%s", src);
+ rb_sprintf(tmp, "::ffff:%s", src);
return (inet_pton6(tmp, dst));
}
else