[Gaim-commits] CVS: gaim/src core.c,1.15,1.16

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv16286

Modified Files:
	core.c 
Log Message:
fine.


Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- core.c	2001/10/18 20:56:59	1.15
+++ core.c	2001/10/19 02:43:18	1.16
@@ -41,16 +41,13 @@
 static gint UI_fd = -1;
 GSList *uis = NULL;
 
-static guchar *UI_build(guint32 *len, guchar type, guchar subtype, va_list args1)
+static guchar *UI_build(guint32 *len, guchar type, guchar subtype, va_list args)
 {
-	va_list args2;
 	guchar *buffer;
 	guint32 pos;
 	int size;
 	void *data;
 
-	G_VA_COPY(args2, args1);
-
 	*len = sizeof(guchar) * 2 + 4;
 	buffer = g_malloc(*len);
 	pos = 0;
@@ -61,24 +58,22 @@
 	/* we come back and do size last */
 	pos += 4;
 
-	size = va_arg(args2, int);
+	size = va_arg(args, int);
 	while (size != -1) {
 		*len += size;
 		buffer = g_realloc(buffer, *len);
 
-		data = va_arg(args2, void *);
+		data = va_arg(args, void *);
 		memcpy(buffer + pos, data, size);
 		pos += size;
 
-		size = va_arg(args2, int);
+		size = va_arg(args, int);
 	}
 
 	pos -= sizeof(guchar) * 2 + 4;
 
 	/* now we do size */
 	memcpy(buffer + sizeof(guchar) * 2, &pos, 4);
-
-	va_end(args2);
 
 	return buffer;
 }