Use G_VA_COPY instead of va_copy.
This commit is contained in:
parent
a32c0f87c9
commit
3ff3196d9d
2 changed files with 18 additions and 18 deletions
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.22 2003/11/13 10:58:43 fvdl Exp $
|
||||
$NetBSD: distinfo,v 1.23 2003/12/30 12:25:44 gavan Exp $
|
||||
|
||||
SHA1 (glib-2.2.3.tar.bz2) = 05580cbe110b94dd5020a07cf6d380190a2a13af
|
||||
Size (glib-2.2.3.tar.bz2) = 1636987 bytes
|
||||
SHA1 (patch-aa) = 29ff7360a007d3d02cc3c28dce20e42ccf24bd5a
|
||||
SHA1 (patch-ab) = 6713466fc35ee8aed6cb9e7ab52519c632891e56
|
||||
SHA1 (patch-ab) = b951b1480eaa66074e311f347df2e1b137ec7089
|
||||
SHA1 (patch-ac) = 1b94c567ac0086abfc927f5af1e657f14b091218
|
||||
SHA1 (patch-ad) = 58739c123a640a66206c9afa8c28d81e3eb02986
|
||||
SHA1 (patch-ae) = fcbd0e4e3bab6805c829c10ae5f3be405b1e9bb5
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
||||
$NetBSD: patch-ab,v 1.8 2003/12/30 12:25:44 gavan Exp $
|
||||
|
||||
--- glib/trio/trio.c.orig 2003-08-26 02:17:43.000000000 +0200
|
||||
+++ glib/trio/trio.c
|
||||
|
@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
assert(VALID(format));
|
||||
|
||||
- return TrioFormat(stdout, 0, TrioOutStreamFile, format, &args, NULL);
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
+ return TrioFormat(stdout, 0, TrioOutStreamFile, format, &args2, NULL);
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
-
|
||||
- return TrioFormat(file, 0, TrioOutStreamFile, format, &args, NULL);
|
||||
+
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
+ return TrioFormat(file, 0, TrioOutStreamFile, format, &args2, NULL);
|
||||
}
|
||||
|
||||
|
@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
-
|
||||
- return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, &args, NULL);
|
||||
+
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
+ return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, &args2, NULL);
|
||||
}
|
||||
|
||||
|
@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
data.stream.out = stream;
|
||||
data.closure = closure;
|
||||
- return TrioFormat(&data, 0, TrioOutStreamCustom, format, &args, NULL);
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
+ return TrioFormat(&data, 0, TrioOutStreamCustom, format, &args2, NULL);
|
||||
}
|
||||
|
||||
|
@ -76,7 +76,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
assert(VALID(format));
|
||||
|
||||
- status = TrioFormat(&buffer, 0, TrioOutStreamString, format, &args, NULL);
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
+ status = TrioFormat(&buffer, 0, TrioOutStreamString, format, &args2, NULL);
|
||||
*buffer = NIL;
|
||||
return status;
|
||||
|
@ -91,7 +91,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
assert(max == 0 || VALID(buffer));
|
||||
assert(VALID(format));
|
||||
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
status = TrioFormat(&buffer, max > 0 ? max - 1 : 0,
|
||||
- TrioOutStreamStringMax, format, &args, NULL);
|
||||
+ TrioOutStreamStringMax, format, &args2, NULL);
|
||||
|
@ -110,7 +110,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
|
||||
buf_len = trio_length(buffer);
|
||||
buffer = &buffer[buf_len];
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
status = TrioFormat(&buffer, max - 1 - buf_len,
|
||||
- TrioOutStreamStringMax, format, &args, NULL);
|
||||
+ TrioOutStreamStringMax, format, &args2, NULL);
|
||||
|
@ -129,7 +129,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
info = trio_xstring_duplicate("");
|
||||
if (info)
|
||||
{
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
(void)TrioFormat(info, 0, TrioOutStreamStringDynamic,
|
||||
- format, &args, NULL);
|
||||
+ format, &args2, NULL);
|
||||
|
@ -148,7 +148,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
}
|
||||
else
|
||||
{
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
status = TrioFormat(info, 0, TrioOutStreamStringDynamic,
|
||||
- format, &args, NULL);
|
||||
+ format, &args2, NULL);
|
||||
|
@ -164,7 +164,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
-
|
||||
- return TrioFormatRef((trio_reference_t *)ref, format, &arglist, NULL);
|
||||
+
|
||||
+ va_copy(args2, arglist);
|
||||
+ G_VA_COPY(args2, arglist);
|
||||
+ return TrioFormatRef((trio_reference_t *)ref, format, &args2, NULL);
|
||||
}
|
||||
|
||||
|
@ -177,7 +177,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
assert(VALID(format));
|
||||
-
|
||||
+
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
return TrioScan((trio_pointer_t)stdin, 0,
|
||||
TrioInStreamFile,
|
||||
- format, &args, NULL);
|
||||
|
@ -195,7 +195,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
assert(VALID(format));
|
||||
-
|
||||
+
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
return TrioScan((trio_pointer_t)file, 0,
|
||||
TrioInStreamFile,
|
||||
- format, &args, NULL);
|
||||
|
@ -211,7 +211,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
assert(VALID(format));
|
||||
-
|
||||
+
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
return TrioScan((trio_pointer_t)&fd, 0,
|
||||
TrioInStreamFileDescriptor,
|
||||
- format, &args, NULL);
|
||||
|
@ -233,7 +233,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
data.closure = closure;
|
||||
- return TrioScan(&data, 0, TrioInStreamCustom, format, &args, NULL);
|
||||
+
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
+ return TrioScan(&data, 0, TrioInStreamCustom, format, &args2, NULL);
|
||||
}
|
||||
|
||||
|
@ -248,7 +248,7 @@ $NetBSD: patch-ab,v 1.7 2003/11/11 13:39:09 fvdl Exp $
|
|||
assert(VALID(format));
|
||||
-
|
||||
+
|
||||
+ va_copy(args2, args);
|
||||
+ G_VA_COPY(args2, args);
|
||||
return TrioScan((trio_pointer_t)&buffer, 0,
|
||||
TrioInStreamString,
|
||||
- format, &args, NULL);
|
||||
|
|
Loading…
Reference in a new issue