[patch] varargs use

[David Zeuthen]

--=-Pbusve0H1Ih5xh9w9k4M
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Sat, 2003-12-20 at 21:34, Havoc Pennington wrote:
> On Sat, 2003-12-20 at 13:17, David Zeuthen wrote:
> > 
> > It's C99, so probably not that portable. Btw, using va_start/va_end is
> > not possible as the caller gives the va_list, yes?. 
> > 
> 
> Right. I think what we need to do is make our own portable va_copy
> macro, much as glib does.
> 

Ok, so I've now finally done this, see attached patch. I took the
configure.in bits from glib to provide us with a DBUS_VA_COPY macro so
we need glib authors permissions to relicense under AFL 2.0 and GPL. 

Havoc, do you know who I should get in touch with to get this
permission? (your name is in the AUTHORS file).

Ok to commit?

Thanks,
David


--=-Pbusve0H1Ih5xh9w9k4M
Content-Disposition: attachment; filename=dze_va_copy_macro_and_fix_for_ppc.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=dze_va_copy_macro_and_fix_for_ppc.patch; charset=

PyBweXRob24vLmRlcHMNCj8gcHl0aG9uLy5saWJzDQo/IHB5dGhvbi9NYWtlZmlsZQ0KPyBweXRo
b24vTWFrZWZpbGUuaW4NCj8gcHl0aG9uL2RidXNfYmluZGluZ3MuYw0KPyBweXRob24vZGJ1c19i
aW5kaW5ncy5sYQ0KPyBweXRob24vZGJ1c19iaW5kaW5ncy5sbw0KPyBweXRob24vZGJ1c19iaW5k
aW5ncy5weXgNCj8gdGVzdC9nbGliLy5kZXBzDQo/IHRlc3QvZ2xpYi8ubGlicw0KPyB0ZXN0L2ds
aWIvTWFrZWZpbGUNCj8gdGVzdC9nbGliL01ha2VmaWxlLmluDQo/IHRlc3QvZ2xpYi90ZXN0LWRi
dXMtZ2xpYg0KPyB0ZXN0L2dsaWIvdGVzdC1wcm9maWxlDQo/IHRlc3QvZ2xpYi90ZXN0LXNlcnZp
Y2UtZ2xpYg0KPyB0ZXN0L2dsaWIvdGVzdC10aHJlYWQtY2xpZW50DQo/IHRlc3QvZ2xpYi90ZXN0
LXRocmVhZC1zZXJ2ZXINCj8gdG9vbHMvZGJ1cy12aWV3ZXINCkluZGV4OiBDaGFuZ2VMb2cNCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL2RidXMvZGJ1cy9DaGFuZ2VMb2csdg0KcmV0cmlldmlu
ZyByZXZpc2lvbiAxLjQ1MA0KZGlmZiAtdSAtcCAtcjEuNDUwIENoYW5nZUxvZw0KLS0tIGEvQ2hh
bmdlTG9nCTI0IEZlYiAyMDA0IDE5OjUwOjI1IC0wMDAwCTEuNDUwDQorKysgYi9DaGFuZ2VMb2cJ
MjYgRmViIDIwMDQgMDc6NDY6MzYgLTAwMDANCkBAIC0xLDMgKzEsMTIgQEANCisyMDA0LTAyLTI1
ICBEYXZpZCBaZXV0aGVuICA8ZGF2aWRAZnViYXIuZGs+DQorDQorCSogY29uZmlndXJlLmluOiBD
aGVjayBmb3IgdmFfY29weTsgZGVmaW5lIERCVVNfVkFfQ09QWSB0byB0aGUNCisJYXBwcm9wcmlh
dGUgdmFfY29weSBpbXBsZW1lbnRhdGlvbg0KKw0KKwkqIGRidXMvZGJ1cy1zdHJpbmcuYyAoX2Ri
dXNfc3RyaW5nX2FwcGVuZF9wcmludGZfdmFsaXN0KTogRml4IGENCisJYnVnIHdoZXJlIGFyZ3Mg
d2VyZSB1c2VkIHR3aWNlLiBUaGlzIGJ1ZyByZXN1bHRlZCBpbiBhIHNlZ2ZhdWx0DQorCW9uIGEg
RGViaWFuL1BQQyBzeXN0ZW0gd2hlbiBzdGFydGluZyB0aGUgbWVzc2FnZWJ1cyBkYWVtb24uDQor
IAkNCiAyMDA0LTAyLTI0ICBKb2UgU2hhdyAgPGpvZUB4aW1pYW4uY29tPg0KIA0KIAkqIGJ1cy9z
ZXJ2aWNlcy5jIChidXNfcmVnaXN0cnlfYWNxdWlyZV9zZXJ2aWNlKTogV2UgbmVlZCB0byBwYXNz
DQpJbmRleDogY29uZmlndXJlLmluDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2cy9kYnVzL2Ri
dXMvY29uZmlndXJlLmluLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS43Ng0KZGlmZiAtdSAtcCAt
cjEuNzYgY29uZmlndXJlLmluDQotLS0gYS9jb25maWd1cmUuaW4JMTkgTm92IDIwMDMgMjE6NTE6
MDkgLTAwMDAJMS43Ng0KKysrIGIvY29uZmlndXJlLmluCTI2IEZlYiAyMDA0IDA3OjQ2OjM2IC0w
MDAwDQpAQCAtMjkzLDYgKzI5Myw4MiBAQCBBQ19TVUJTVChEQlVTX0hBVkVfSU5UNjQpDQogIyMg
Ynl0ZSBvcmRlcg0KIEFDX0NfQklHRU5ESUFODQogDQorDQorZG5sICoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioNCitkbmwgKioqIHZhX2NvcHkgY2hlY2tzIChmcm9tIEdMaWIpICoq
Kg0KK2RubCAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqDQorZG5sIHdlIGN1cnJl
bnRseSBjaGVjayBmb3IgYWxsIHRocmVlIHZhX2NvcHkgcG9zc2liaWxpdGllcywgc28gd2UgZ2V0
DQorZG5sIGFsbCByZXN1bHRzIGluIGNvbmZpZy5sb2cgZm9yIGJ1ZyByZXBvcnRzLg0KK0FDX0NB
Q0hFX0NIRUNLKFtmb3IgYW4gaW1wbGVtZW50YXRpb24gb2YgdmFfY29weSgpXSxkYnVzX2N2X3Zh
X2NvcHksWw0KKwlBQ19MSU5LX0lGRUxTRShbI2luY2x1ZGUgPHN0ZGFyZy5oPg0KKwl2b2lkIGYg
KGludCBpLCAuLi4pIHsNCisJdmFfbGlzdCBhcmdzMSwgYXJnczI7DQorCXZhX3N0YXJ0IChhcmdz
MSwgaSk7DQorCXZhX2NvcHkgKGFyZ3MyLCBhcmdzMSk7DQorCWlmICh2YV9hcmcgKGFyZ3MyLCBp
bnQpICE9IDQyIHx8IHZhX2FyZyAoYXJnczEsIGludCkgIT0gNDIpDQorCSAgZXhpdCAoMSk7DQor
CXZhX2VuZCAoYXJnczEpOyB2YV9lbmQgKGFyZ3MyKTsNCisJfQ0KKwlpbnQgbWFpbigpIHsNCisJ
ICBmICgwLCA0Mik7DQorCSAgcmV0dXJuIDA7DQorCX1dLA0KKwlbZGJ1c19jdl92YV9jb3B5PXll
c10sDQorCVtkYnVzX2N2X3ZhX2NvcHk9bm9dKQ0KK10pDQorQUNfQ0FDSEVfQ0hFQ0soW2ZvciBh
biBpbXBsZW1lbnRhdGlvbiBvZiBfX3ZhX2NvcHkoKV0sZGJ1c19jdl9fX3ZhX2NvcHksWw0KKwlB
Q19MSU5LX0lGRUxTRShbI2luY2x1ZGUgPHN0ZGFyZy5oPg0KKwl2b2lkIGYgKGludCBpLCAuLi4p
IHsNCisJdmFfbGlzdCBhcmdzMSwgYXJnczI7DQorCXZhX3N0YXJ0IChhcmdzMSwgaSk7DQorCV9f
dmFfY29weSAoYXJnczIsIGFyZ3MxKTsNCisJaWYgKHZhX2FyZyAoYXJnczIsIGludCkgIT0gNDIg
fHwgdmFfYXJnIChhcmdzMSwgaW50KSAhPSA0MikNCisJICBleGl0ICgxKTsNCisJdmFfZW5kIChh
cmdzMSk7IHZhX2VuZCAoYXJnczIpOw0KKwl9DQorCWludCBtYWluKCkgew0KKwkgIGYgKDAsIDQy
KTsNCisJICByZXR1cm4gMDsNCisJfV0sDQorCVtkYnVzX2N2X19fdmFfY29weT15ZXNdLA0KKwlb
ZGJ1c19jdl9fX3ZhX2NvcHk9bm9dKQ0KK10pDQorDQoraWYgdGVzdCAieCRkYnVzX2N2X3ZhX2Nv
cHkiID0gInh5ZXMiOyB0aGVuDQorICBkYnVzX3ZhX2NvcHlfZnVuYz12YV9jb3B5DQorZWxzZSBp
ZiB0ZXN0ICJ4JGRidXNfY3ZfX192YV9jb3B5IiA9ICJ4eWVzIjsgdGhlbg0KKyAgZGJ1c192YV9j
b3B5X2Z1bmM9X192YV9jb3B5DQorZmkNCitmaQ0KKw0KK2lmIHRlc3QgLW4gIiRkYnVzX3ZhX2Nv
cHlfZnVuYyI7IHRoZW4NCisgIEFDX0RFRklORV9VTlFVT1RFRChEQlVTX1ZBX0NPUFksJGRidXNf
dmFfY29weV9mdW5jLFtBICd2YV9jb3B5JyBzdHlsZSBmdW5jdGlvbl0pDQorZmkNCisNCitBQ19D
QUNIRV9DSEVDSyhbd2hldGhlciB2YV9saXN0cyBjYW4gYmUgY29waWVkIGJ5IHZhbHVlXSxkYnVz
X2N2X3ZhX3ZhbF9jb3B5LFsNCisJQUNfVFJZX1JVTihbI2luY2x1ZGUgPHN0ZGFyZy5oPg0KKwl2
b2lkIGYgKGludCBpLCAuLi4pIHsNCisJdmFfbGlzdCBhcmdzMSwgYXJnczI7DQorCXZhX3N0YXJ0
IChhcmdzMSwgaSk7DQorCWFyZ3MyID0gYXJnczE7DQorCWlmICh2YV9hcmcgKGFyZ3MyLCBpbnQp
ICE9IDQyIHx8IHZhX2FyZyAoYXJnczEsIGludCkgIT0gNDIpDQorCSAgZXhpdCAoMSk7DQorCXZh
X2VuZCAoYXJnczEpOyB2YV9lbmQgKGFyZ3MyKTsNCisJfQ0KKwlpbnQgbWFpbigpIHsNCisJICBm
ICgwLCA0Mik7DQorCSAgcmV0dXJuIDA7DQorCX1dLA0KKwlbZGJ1c19jdl92YV92YWxfY29weT15
ZXNdLA0KKwlbZGJ1c19jdl92YV92YWxfY29weT1ub10sDQorCVtkYnVzX2N2X3ZhX3ZhbF9jb3B5
PXllc10pDQorXSkNCisNCitpZiB0ZXN0ICJ4JGRidXNfY3ZfdmFfdmFsX2NvcHkiID0gInhubyI7
IHRoZW4NCisgIEFDX0RFRklORShEQlVTX1ZBX0NPUFlfQVNfQVJSQVksMSwgWyd2YV9saXN0cycg
Y2Fubm90IGJlIGNvcGllcyBhcyB2YWx1ZXNdKQ0KK2ZpDQorDQorDQogIyMjIyBBdG9taWMgaW50
ZWdlcnMgKGNoZWNrcyBieSBTZWJhc3RpYW4gV2lsaGVsbWkgZm9yIEdMaWIpDQogQUNfTVNHX0NI
RUNLSU5HKFt3aGV0aGVyIHRvIHVzZSBpbmxpbmUgYXNzZW1ibGVyIHJvdXRpbmVzIGZvciBhdG9t
aWMgaW50ZWdlcnNdKQ0KIGhhdmVfYXRvbWljX2luYz1ubw0KSW5kZXg6IGRidXMvZGJ1cy1zdHJp
bmcuYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnMvZGJ1cy9kYnVzL2RidXMvZGJ1cy1zdHJp
bmcuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNDUNCmRpZmYgLXUgLXAgLXIxLjQ1IGRidXMt
c3RyaW5nLmMNCi0tLSBhL2RidXMvZGJ1cy1zdHJpbmcuYwkyIERlYyAyMDAzIDEwOjQ0OjIxIC0w
MDAwCTEuNDUNCisrKyBiL2RidXMvZGJ1cy1zdHJpbmcuYwkyNiBGZWIgMjAwNCAwNzo0NjozNyAt
MDAwMA0KQEAgLTEwMTMsMTYgKzEwMTMsMjIgQEAgX2RidXNfc3RyaW5nX2FwcGVuZF9wcmludGZf
dmFsaXN0ICAoREJ1cw0KIHsNCiAgIGludCBsZW47DQogICBjaGFyIGM7DQorICB2YV9saXN0IGFy
Z3NfY29weTsNCisNCiAgIERCVVNfU1RSSU5HX1BSRUFNQkxFIChzdHIpOw0KLSAgDQorDQorICBE
QlVTX1ZBX0NPUFkgKGFyZ3NfY29weSwgYXJncyk7DQorDQogICAvKiBNZWFzdXJlIHRoZSBtZXNz
YWdlIGxlbmd0aCB3aXRob3V0IHRlcm1pbmF0aW5nIG51bCAqLw0KICAgbGVuID0gdnNucHJpbnRm
ICgmYywgMSwgZm9ybWF0LCBhcmdzKTsNCiANCiAgIGlmICghX2RidXNfc3RyaW5nX2xlbmd0aGVu
IChzdHIsIGxlbikpDQogICAgIHJldHVybiBGQUxTRTsNCi0NCisgIA0KICAgdnNwcmludGYgKHJl
YWwtPnN0ciArIChyZWFsLT5sZW4gLSBsZW4pLA0KLSAgICAgICAgICAgIGZvcm1hdCwgYXJncyk7
DQorICAgICAgICAgICAgZm9ybWF0LCBhcmdzX2NvcHkpOw0KKw0KKyAgdmFfZW5kIChhcmdzX2Nv
cHkpOw0KIA0KICAgcmV0dXJuIFRSVUU7DQogfQ0K

--=-Pbusve0H1Ih5xh9w9k4M--