[patch] varargs use

[David Zeuthen]

--=-qMj3aocah+1YhypxZ6mL
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Sat, 2004-02-28 at 19:12, Havoc Pennington wrote:
> Hi,
> 
> Patch looks good. For licensing you probably want to check glib
> ChangeLog or cvs annotate to see who made that patch. My guess is Tim
> Janik.
> 

Your guess is correct. Tim also pointed out some flaws in the patch, so
here is yet another one.

Tim: Ok to relicense this under AFL 2.0 and GPL?

Havoc: Ok to apply?

Thanks,
David


--=-qMj3aocah+1YhypxZ6mL
Content-Disposition: attachment; filename=dze_va_copy_macro_and_fix-5.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=dze_va_copy_macro_and_fix-5.patch; charset=

PyBweXRob24vLmRlcHMNCj8gcHl0aG9uLy5saWJzDQo/IHB5dGhvbi9NYWtlZmlsZQ0KPyBweXRo
b24vTWFrZWZpbGUuaW4NCj8gcHl0aG9uL2RidXNfYmluZGluZ3MuYw0KPyBweXRob24vZGJ1c19i
aW5kaW5ncy5sYQ0KPyBweXRob24vZGJ1c19iaW5kaW5ncy5sbw0KPyBweXRob24vZGJ1c19iaW5k
aW5ncy5weXgNCj8gdGVzdC9nbGliLy5kZXBzDQo/IHRlc3QvZ2xpYi8ubGlicw0KPyB0ZXN0L2ds
aWIvTWFrZWZpbGUNCj8gdGVzdC9nbGliL01ha2VmaWxlLmluDQo/IHRlc3QvZ2xpYi90ZXN0LWRi
dXMtZ2xpYg0KPyB0ZXN0L2dsaWIvdGVzdC1wcm9maWxlDQo/IHRlc3QvZ2xpYi90ZXN0LXNlcnZp
Y2UtZ2xpYg0KPyB0ZXN0L2dsaWIvdGVzdC10aHJlYWQtY2xpZW50DQo/IHRlc3QvZ2xpYi90ZXN0
LXRocmVhZC1zZXJ2ZXINCj8gdG9vbHMvZGJ1cy12aWV3ZXINCkluZGV4OiBDaGFuZ2VMb2cNCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL2RidXMvZGJ1cy9DaGFuZ2VMb2csdg0KcmV0cmlldmlu
ZyByZXZpc2lvbiAxLjQ1MA0KZGlmZiAtdSAtcCAtcjEuNDUwIENoYW5nZUxvZw0KLS0tIGEvQ2hh
bmdlTG9nCTI0IEZlYiAyMDA0IDE5OjUwOjI1IC0wMDAwCTEuNDUwDQorKysgYi9DaGFuZ2VMb2cJ
MSBNYXIgMjAwNCAxMjoxNjozNSAtMDAwMA0KQEAgLTEsMyArMSwxNSBAQA0KKzIwMDQtMDMtMDEg
IERhdmlkIFpldXRoZW4gIDxkYXZpZEBmdWJhci5kaz4NCisNCisJKiBkYnVzL2RidXMtc3RyaW5n
LmMgKF9kYnVzX3N0cmluZ19hcHBlbmRfcHJpbnRmX3ZhbGlzdCk6IEZpeCBhDQorCWJ1ZyB3aGVy
ZSBhcmdzIHdlcmUgdXNlZCB0d2ljZS4gVGhpcyBidWcgcmVzdWx0ZWQgaW4gYSBzZWdmYXVsdA0K
KwlvbiBhIERlYmlhbi9QUEMgc3lzdGVtIHdoZW4gc3RhcnRpbmcgdGhlIG1lc3NhZ2VidXMgZGFl
bW9uLiBJbmNsdWRlDQorCWRidXMtc3lzZGVwcy5oIGZvciBEQlVTX1ZBX0NPUFkNCisNCisJKiBk
YnVzL2RidXMtc3lzZGVwcy5oOiBEZWZpbmUgREJVU19WQV9DT1BZIGlmIG5lY2Nlc3NhcnkuIEZy
b20gR0xpYg0KKw0KKwkqIGNvbmZpZ3VyZS5pbjogQ2hlY2sgZm9yIHZhX2NvcHk7IGRlZmluZSBE
QlVTX1ZBX0NPUFkgdG8gdGhlDQorCWFwcHJvcHJpYXRlIHZhX2NvcHkgaW1wbGVtZW50YXRpb24u
IEZyb20gR0xpYg0KKyAJDQogMjAwNC0wMi0yNCAgSm9lIFNoYXcgIDxqb2VAeGltaWFuLmNvbT4N
CiANCiAJKiBidXMvc2VydmljZXMuYyAoYnVzX3JlZ2lzdHJ5X2FjcXVpcmVfc2VydmljZSk6IFdl
IG5lZWQgdG8gcGFzcw0KSW5kZXg6IGNvbmZpZ3VyZS5pbg0KPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6
IC9jdnMvZGJ1cy9kYnVzL2NvbmZpZ3VyZS5pbix2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNzYN
CmRpZmYgLXUgLXAgLXIxLjc2IGNvbmZpZ3VyZS5pbg0KLS0tIGEvY29uZmlndXJlLmluCTE5IE5v
diAyMDAzIDIxOjUxOjA5IC0wMDAwCTEuNzYNCisrKyBiL2NvbmZpZ3VyZS5pbgkxIE1hciAyMDA0
IDEyOjE2OjM1IC0wMDAwDQpAQCAtMjkzLDYgKzI5Myw4MiBAQCBBQ19TVUJTVChEQlVTX0hBVkVf
SU5UNjQpDQogIyMgYnl0ZSBvcmRlcg0KIEFDX0NfQklHRU5ESUFODQogDQorDQorZG5sICoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioNCitkbmwgKioqIHZhX2NvcHkgY2hlY2tzIChm
cm9tIEdMaWIpICoqKg0KK2RubCAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqDQor
ZG5sIHdlIGN1cnJlbnRseSBjaGVjayBmb3IgYWxsIHRocmVlIHZhX2NvcHkgcG9zc2liaWxpdGll
cywgc28gd2UgZ2V0DQorZG5sIGFsbCByZXN1bHRzIGluIGNvbmZpZy5sb2cgZm9yIGJ1ZyByZXBv
cnRzLg0KK0FDX0NBQ0hFX0NIRUNLKFtmb3IgYW4gaW1wbGVtZW50YXRpb24gb2YgdmFfY29weSgp
XSxkYnVzX2N2X3ZhX2NvcHksWw0KKwlBQ19MSU5LX0lGRUxTRShbI2luY2x1ZGUgPHN0ZGFyZy5o
Pg0KKwl2b2lkIGYgKGludCBpLCAuLi4pIHsNCisJdmFfbGlzdCBhcmdzMSwgYXJnczI7DQorCXZh
X3N0YXJ0IChhcmdzMSwgaSk7DQorCXZhX2NvcHkgKGFyZ3MyLCBhcmdzMSk7DQorCWlmICh2YV9h
cmcgKGFyZ3MyLCBpbnQpICE9IDQyIHx8IHZhX2FyZyAoYXJnczEsIGludCkgIT0gNDIpDQorCSAg
ZXhpdCAoMSk7DQorCXZhX2VuZCAoYXJnczEpOyB2YV9lbmQgKGFyZ3MyKTsNCisJfQ0KKwlpbnQg
bWFpbigpIHsNCisJICBmICgwLCA0Mik7DQorCSAgcmV0dXJuIDA7DQorCX1dLA0KKwlbZGJ1c19j
dl92YV9jb3B5PXllc10sDQorCVtkYnVzX2N2X3ZhX2NvcHk9bm9dKQ0KK10pDQorQUNfQ0FDSEVf
Q0hFQ0soW2ZvciBhbiBpbXBsZW1lbnRhdGlvbiBvZiBfX3ZhX2NvcHkoKV0sZGJ1c19jdl9fX3Zh
X2NvcHksWw0KKwlBQ19MSU5LX0lGRUxTRShbI2luY2x1ZGUgPHN0ZGFyZy5oPg0KKwl2b2lkIGYg
KGludCBpLCAuLi4pIHsNCisJdmFfbGlzdCBhcmdzMSwgYXJnczI7DQorCXZhX3N0YXJ0IChhcmdz
MSwgaSk7DQorCV9fdmFfY29weSAoYXJnczIsIGFyZ3MxKTsNCisJaWYgKHZhX2FyZyAoYXJnczIs
IGludCkgIT0gNDIgfHwgdmFfYXJnIChhcmdzMSwgaW50KSAhPSA0MikNCisJICBleGl0ICgxKTsN
CisJdmFfZW5kIChhcmdzMSk7IHZhX2VuZCAoYXJnczIpOw0KKwl9DQorCWludCBtYWluKCkgew0K
KwkgIGYgKDAsIDQyKTsNCisJICByZXR1cm4gMDsNCisJfV0sDQorCVtkYnVzX2N2X19fdmFfY29w
eT15ZXNdLA0KKwlbZGJ1c19jdl9fX3ZhX2NvcHk9bm9dKQ0KK10pDQorDQoraWYgdGVzdCAieCRk
YnVzX2N2X3ZhX2NvcHkiID0gInh5ZXMiOyB0aGVuDQorICBkYnVzX3ZhX2NvcHlfZnVuYz12YV9j
b3B5DQorZWxzZSBpZiB0ZXN0ICJ4JGRidXNfY3ZfX192YV9jb3B5IiA9ICJ4eWVzIjsgdGhlbg0K
KyAgZGJ1c192YV9jb3B5X2Z1bmM9X192YV9jb3B5DQorZmkNCitmaQ0KKw0KK2lmIHRlc3QgLW4g
IiRkYnVzX3ZhX2NvcHlfZnVuYyI7IHRoZW4NCisgIEFDX0RFRklORV9VTlFVT1RFRChEQlVTX1ZB
X0NPUFksJGRidXNfdmFfY29weV9mdW5jLFtBICd2YV9jb3B5JyBzdHlsZSBmdW5jdGlvbl0pDQor
ZmkNCisNCitBQ19DQUNIRV9DSEVDSyhbd2hldGhlciB2YV9saXN0cyBjYW4gYmUgY29waWVkIGJ5
IHZhbHVlXSxkYnVzX2N2X3ZhX3ZhbF9jb3B5LFsNCisJQUNfVFJZX1JVTihbI2luY2x1ZGUgPHN0
ZGFyZy5oPg0KKwl2b2lkIGYgKGludCBpLCAuLi4pIHsNCisJdmFfbGlzdCBhcmdzMSwgYXJnczI7
DQorCXZhX3N0YXJ0IChhcmdzMSwgaSk7DQorCWFyZ3MyID0gYXJnczE7DQorCWlmICh2YV9hcmcg
KGFyZ3MyLCBpbnQpICE9IDQyIHx8IHZhX2FyZyAoYXJnczEsIGludCkgIT0gNDIpDQorCSAgZXhp
dCAoMSk7DQorCXZhX2VuZCAoYXJnczEpOyB2YV9lbmQgKGFyZ3MyKTsNCisJfQ0KKwlpbnQgbWFp
bigpIHsNCisJICBmICgwLCA0Mik7DQorCSAgcmV0dXJuIDA7DQorCX1dLA0KKwlbZGJ1c19jdl92
YV92YWxfY29weT15ZXNdLA0KKwlbZGJ1c19jdl92YV92YWxfY29weT1ub10sDQorCVtkYnVzX2N2
X3ZhX3ZhbF9jb3B5PXllc10pDQorXSkNCisNCitpZiB0ZXN0ICJ4JGRidXNfY3ZfdmFfdmFsX2Nv
cHkiID0gInhubyI7IHRoZW4NCisgIEFDX0RFRklORShEQlVTX1ZBX0NPUFlfQVNfQVJSQVksMSwg
Wyd2YV9saXN0cycgY2Fubm90IGJlIGNvcGllcyBhcyB2YWx1ZXNdKQ0KK2ZpDQorDQorDQogIyMj
IyBBdG9taWMgaW50ZWdlcnMgKGNoZWNrcyBieSBTZWJhc3RpYW4gV2lsaGVsbWkgZm9yIEdMaWIp
DQogQUNfTVNHX0NIRUNLSU5HKFt3aGV0aGVyIHRvIHVzZSBpbmxpbmUgYXNzZW1ibGVyIHJvdXRp
bmVzIGZvciBhdG9taWMgaW50ZWdlcnNdKQ0KIGhhdmVfYXRvbWljX2luYz1ubw0KSW5kZXg6IGRi
dXMvZGJ1cy1zdHJpbmcuYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnMvZGJ1cy9kYnVzL2Ri
dXMvZGJ1cy1zdHJpbmcuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDUNCmRpZmYgLXUgLXAg
LXIxLjQ1IGRidXMtc3RyaW5nLmMNCi0tLSBhL2RidXMvZGJ1cy1zdHJpbmcuYwkyIERlYyAyMDAz
IDEwOjQ0OjIxIC0wMDAwCTEuNDUNCisrKyBiL2RidXMvZGJ1cy1zdHJpbmcuYwkxIE1hciAyMDA0
IDEyOjE2OjM1IC0wMDAwDQpAQCAtMzEsNiArMzEsOCBAQA0KICNkZWZpbmUgREJVU19DQU5fVVNF
X0RCVVNfU1RSSU5HX1BSSVZBVEUgMQ0KICNpbmNsdWRlICJkYnVzLXN0cmluZy1wcml2YXRlLmgi
DQogI2luY2x1ZGUgImRidXMtcHJvdG9jb2wuaCINCisvKiBmb3IgREJVU19WQV9DT1BZICovDQor
I2luY2x1ZGUgImRidXMtc3lzZGVwcy5oIg0KIA0KIC8qKg0KICAqIEBkZWZncm91cCBEQnVzU3Ry
aW5nIHN0cmluZyBjbGFzcw0KQEAgLTEwMTMsMTYgKzEwMTUsMjYgQEAgX2RidXNfc3RyaW5nX2Fw
cGVuZF9wcmludGZfdmFsaXN0ICAoREJ1cw0KIHsNCiAgIGludCBsZW47DQogICBjaGFyIGM7DQor
ICB2YV9saXN0IGFyZ3NfY29weTsNCisNCiAgIERCVVNfU1RSSU5HX1BSRUFNQkxFIChzdHIpOw0K
LSAgDQorDQorICBEQlVTX1ZBX0NPUFkgKGFyZ3NfY29weSwgYXJncyk7DQorDQogICAvKiBNZWFz
dXJlIHRoZSBtZXNzYWdlIGxlbmd0aCB3aXRob3V0IHRlcm1pbmF0aW5nIG51bCAqLw0KICAgbGVu
ID0gdnNucHJpbnRmICgmYywgMSwgZm9ybWF0LCBhcmdzKTsNCiANCiAgIGlmICghX2RidXNfc3Ry
aW5nX2xlbmd0aGVuIChzdHIsIGxlbikpDQotICAgIHJldHVybiBGQUxTRTsNCi0NCisgICAgew0K
KyAgICAgIC8qIGRvbid0IGxlYWsgdGhlIGNvcHkgKi8NCisgICAgICB2YV9lbmQgKGFyZ3NfY29w
eSk7DQorICAgICAgcmV0dXJuIEZBTFNFOw0KKyAgICB9DQorICANCiAgIHZzcHJpbnRmIChyZWFs
LT5zdHIgKyAocmVhbC0+bGVuIC0gbGVuKSwNCi0gICAgICAgICAgICBmb3JtYXQsIGFyZ3MpOw0K
KyAgICAgICAgICAgIGZvcm1hdCwgYXJnc19jb3B5KTsNCisNCisgIHZhX2VuZCAoYXJnc19jb3B5
KTsNCiANCiAgIHJldHVybiBUUlVFOw0KIH0NCkluZGV4OiBkYnVzL2RidXMtc3lzZGVwcy5oDQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09DQpSQ1MgZmlsZTogL2N2cy9kYnVzL2RidXMvZGJ1cy9kYnVzLXN5c2RlcHMuaCx2
DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzcNCmRpZmYgLXUgLXAgLXIxLjM3IGRidXMtc3lzZGVw
cy5oDQotLS0gYS9kYnVzL2RidXMtc3lzZGVwcy5oCTIgRGVjIDIwMDMgMTA6NDQ6MjEgLTAwMDAJ
MS4zNw0KKysrIGIvZGJ1cy9kYnVzLXN5c2RlcHMuaAkxIE1hciAyMDA0IDEyOjE2OjM2IC0wMDAw
DQpAQCAtMzA2LDYgKzMwNiwyMCBAQCB2b2lkIF9kYnVzX3NldF9zaWduYWxfaGFuZGxlciAoaW50
ICAgICAgDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERCdXNTaWduYWxIYW5kbGVy
IGhhbmRsZXIpOw0KIA0KIA0KKy8qIERlZmluZSBEQlVTX1ZBX0NPUFkoKSB0byBkbyB0aGUgcmln
aHQgdGhpbmcgZm9yIGNvcHlpbmcgdmFfbGlzdCB2YXJpYWJsZXMuIA0KKyAqIGNvbmZpZy5oIG1h
eSBoYXZlIGFscmVhZHkgZGVmaW5lZCBEQlVTX1ZBX0NPUFkgYXMgdmFfY29weSBvciBfX3ZhX2Nv
cHkuIA0KKyAqLw0KKyNpZiAhZGVmaW5lZCAoREJVU19WQV9DT1BZKQ0KKyMgIGlmIGRlZmluZWQg
KF9fR05VQ19fKSAmJiBkZWZpbmVkIChfX1BQQ19fKSAmJiAoZGVmaW5lZCAoX0NBTExfU1lTVikg
fHwgZGVmaW5lZCAoX1dJTjMyKSkNCisjICAgIGRlZmluZSBEQlVTX1ZBX0NPUFkoYXAxLCBhcDIp
ICAgKCooYXAxKSA9ICooYXAyKSkNCisjICBlbGlmIGRlZmluZWQgKERCVVNfVkFfQ09QWV9BU19B
UlJBWSkNCisjICAgIGRlZmluZSBEQlVTX1ZBX0NPUFkoYXAxLCBhcDIpICAgbWVtY3B5ICgoYXAx
KSwgKGFwMiksIHNpemVvZiAodmFfbGlzdCkpDQorIyAgZWxzZSAvKiB2YV9saXN0IGlzIGEgcG9p
bnRlciAqLw0KKyMgICAgZGVmaW5lIERCVVNfVkFfQ09QWShhcDEsIGFwMikgICAoKGFwMSkgPSAo
YXAyKSkNCisjICBlbmRpZiAvKiB2YV9saXN0IGlzIGEgcG9pbnRlciAqLw0KKyNlbmRpZiAvKiAh
REJVU19WQV9DT1BZICovDQorDQorDQogREJVU19FTkRfREVDTFM7DQogDQogI2VuZGlmIC8qIERC
VVNfU1lTREVQU19IICovDQo=

--=-qMj3aocah+1YhypxZ6mL--