[gentoo-commits] gentoo-x86 commit in net-irc/atheme-services/files: atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch atheme-services-7.0.0_alpha7-mowgli-strl.patch

[Nathan Phillip Brink (binki)]

binki       11/09/30 03:38:22

  Added:               
                        atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch
                        atheme-services-7.0.0_alpha7-mowgli-strl.patch
  Log:
  Bump to atheme-services-7.0.0_alpha7 with patches pulled from git allowing it to compile.
  
  (Portage version: 2.2.0_alpha55-r1/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch?rev=1.1&content-type=text/plain

Index: atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch
===================================================================
From 7759002d4f84301541e8b6e5eb4c7a20d559d98d Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@××××××××××××.org>
Date: Wed, 31 Aug 2011 00:57:22 -0500
Subject: [PATCH] transport/xmlrpc: unbreak build

---
 modules/transport/xmlrpc/xmlrpclib.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/transport/xmlrpc/xmlrpclib.c b/modules/transport/xmlrpc/xmlrpclib.c
index c708985..11e3b7a 100644
--- a/modules/transport/xmlrpc/xmlrpclib.c
+++ b/modules/transport/xmlrpc/xmlrpclib.c
@@ -315,7 +315,7 @@ void xmlrpc_generic_error(int code, const char *string)
 {
 	char buf[1024];
 	const char *ss;
-	mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE);
+	mowgli_string_t *s = mowgli_string_create();
 	char *s2;
 	int len;
 
@@ -353,7 +353,8 @@ void xmlrpc_generic_error(int code, const char *string)
 	}
 	else
 		xmlrpc.setbuffer(s->str, len);
-	s->delete(s);
+
+	s->destroy(s);
 }
 
 /*************************************************************************/
@@ -387,7 +388,7 @@ void xmlrpc_send(int argc, ...)
 	int len;
 	char buf[1024];
 	const char *ss;
-	mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE);
+	mowgli_string_t *s = mowgli_string_create();
 	char *s2;
 	char *header;
 
@@ -438,7 +439,8 @@ void xmlrpc_send(int argc, ...)
 		free(xmlrpc.encode);
 		xmlrpc.encode = NULL;
 	}
-	s->delete(s);
+
+	s->destroy(s);
 }
 
 /*************************************************************************/
@@ -448,7 +450,7 @@ void xmlrpc_send_string(const char *value)
 	int len;
 	char buf[1024];
 	const char *ss;
-	mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE);
+	mowgli_string_t *s = mowgli_string_create();
 	char *s2;
 	char *header;
 
@@ -493,7 +495,8 @@ void xmlrpc_send_string(const char *value)
 		free(xmlrpc.encode);
 		xmlrpc.encode = NULL;
 	}
-	s->delete(s);
+
+	s->destroy(s);
 }
 
 /*************************************************************************/
@@ -736,7 +739,7 @@ void xmlrpc_char_encode(char *outbuffer, const char *s1)
 	long unsigned int i;
 	unsigned char c;
 	char buf2[15];
-	mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE);
+	mowgli_string_t *s = mowgli_string_create();
 	*buf2 = '\0';
 	*outbuffer = '\0';
 
-- 
1.7.3.4




1.1                  net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-mowgli-strl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-mowgli-strl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-mowgli-strl.patch?rev=1.1&content-type=text/plain

Index: atheme-services-7.0.0_alpha7-mowgli-strl.patch
===================================================================
From e933fc04fea4636325fbe60c769e1e20da74496c Mon Sep 17 00:00:00 2001
From: JD Horelick <jdhore1@×××××.com>
Date: Wed, 31 Aug 2011 03:09:11 -0400
Subject: [PATCH] hostserv|rpgserv: Change some code in headers to use mowgli_strlcpy() and mowgli_strlcat().

---
 modules/hostserv/hostserv.h   |    2 +-
 modules/rpgserv/prettyprint.h |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hostserv/hostserv.h b/modules/hostserv/hostserv.h
index 10ec4de..953105a 100644
--- a/modules/hostserv/hostserv.h
+++ b/modules/hostserv/hostserv.h
@@ -31,7 +31,7 @@ static inline void do_sethost(user_t *u, char *host)
                 return;
 
 	svs = service_find("hostserv");
-        strlcpy(u->vhost, host ? host : u->host, HOSTLEN);
+        mowgli_strlcpy(u->vhost, host ? host : u->host, HOSTLEN);
         user_sethost(svs->me, u, u->vhost);
 }
 
diff --git a/modules/rpgserv/prettyprint.h b/modules/rpgserv/prettyprint.h
index e643608..362eef6 100644
--- a/modules/rpgserv/prettyprint.h
+++ b/modules/rpgserv/prettyprint.h
@@ -70,7 +70,7 @@ static inline const char *rs_prettyprint_keywords(metadata_t *md, const char **k
 
 	*ppbuf = '\0';
 
-	strlcpy(parsebuf, md->value, BUFSIZE);
+	mowgli_strlcpy(parsebuf, md->value, BUFSIZE);
 
 	keyword = strtok_r(parsebuf, " ", &pos);
 	if (keyword == NULL)
@@ -85,9 +85,9 @@ static inline const char *rs_prettyprint_keywords(metadata_t *md, const char **k
 			if (!strcasecmp(keyword, keys[i]))
 			{
 				if (*ppbuf != '\0')
-					strlcat(ppbuf, ", ", BUFSIZE);
+					mowgli_strlcat(ppbuf, ", ", BUFSIZE);
 
-				strlcat(ppbuf, values[i], BUFSIZE);
+				mowgli_strlcat(ppbuf, values[i], BUFSIZE);
 			}
 		}
 	}
-- 
1.7.3.4