Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22277
Modified Files:
core.c
Log Message:
stupid
Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- core.c 2001/10/08 01:12:02 1.11
+++ core.c 2001/10/09 20:19:42 1.12
@@ -41,18 +41,18 @@
static gint UI_fd = -1;
GSList *uis = NULL;
-static guchar *UI_build(int *len, guchar type, guchar subtype, va_list args1)
+static guchar *UI_build(guint32 *len, guchar type, guchar subtype, va_list args1)
{
va_list args2;
guchar *buffer;
- int pos;
+ guint32 pos;
int size;
void *data;
G_VA_COPY(args2, args1);
- buffer = g_malloc(sizeof(guchar) * 2 + 4);
*len = sizeof(guchar) * 2 + 4;
+ buffer = g_malloc(*len);
pos = 0;
memcpy(buffer + pos, &type, sizeof(type)); pos += sizeof(type);
@@ -73,6 +73,9 @@
size = va_arg(args2, int);
}
+ /* now we do size */
+ memcpy(buffer + sizeof(guchar) * 2, &pos, 4);
+
va_end(args2);
return buffer;
@@ -95,7 +98,7 @@
{
va_list ap;
gchar *data;
- int len;
+ guint32 len;
va_start(ap, subtype);
data = UI_build(&len, type, subtype, ap);
@@ -120,7 +123,7 @@
{
va_list ap;
gchar *data;
- int len;
+ guint32 len;
if (!uis)
return;
|
