Fwd: [midgard-cvs] CVS update: /midgard/src/core/midgard/midgard/
"Jukka Zitting" <[email protected]> Thu, 2 Mar 2006 13:39:40 +0200
| Newsgroups | gmane.comp.web.midgard.devel |
|---|---|
| Message-ID | <[email protected]> |
UmV0cnlpbmcuLi4KCkJSLAoKSnVra2EgWml0dGluZwoKLS0tLS0tLS0tLSBGb3J3YXJkZWQgbWVz c2FnZSAtLS0tLS0tLS0tCkZyb206IEp1a2thIFppdHRpbmcgPGp1a2thLnppdHRpbmdAZ21haWwu Y29tPgpEYXRlOiBGZWIgMjcsIDIwMDYgODowMiBQTQpTdWJqZWN0OiBSZTogW21pZGdhcmQtY3Zz XSBDVlMgdXBkYXRlOiAvbWlkZ2FyZC9zcmMvY29yZS9taWRnYXJkL21pZGdhcmQvClRvOiBkZXZA bWlkZ2FyZC50aWdyaXMub3JnCgoKSGksCgpPbiAyNiBGZWIgMjAwNiAxNDozMzozMSAtMDAwMCwg cGlvdHJhc0B0aWdyaXMub3JnIDxwaW90cmFzQHRpZ3Jpcy5vcmc+IHdyb3RlOgo+IExvZzoKPiAg SW5pdGlhbAoKVGhhbmtzLCBncmVhdCB3b3JrISBUaGVyZSBhcmUgaG93ZXZlciBhIG51bWJlciBv ZiBwb2ludHMgSSdkIGxpa2UgdG8KcmFpc2UuIFNlZSBiZWxvdy4KCkZpcnN0IGEgZ2VuZXJhbCBw b2ludCBhYm91dCBtZXRob2QgZG9jdW1lbnRhdGlvbi4gV2hpbGUgdGhlIGZvbGxvd2luZwpkb2Mg Y29tbWVudCBpcyBiZXR0ZXIgdGhhbiBub3RoaW5nLCBpdCBhY3R1YWxseSBtb3N0bHkganVzdCBk dXBsaWNhdGVzCnRoZSBrbm93bGVkZ2UgdGhhdCBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgbWV0aG9k IHNpZ25hdHVyZToKCi8qKgogKiBcaW5ncm91cCBtaWRnYXJkCiAqCiAqIFNldHMgc2l0ZWdyb3Vw J3MgdmFsdWUuCiAqCiAqIFxwYXJhbVtpbl0gbWdkIE1pZGdhcmRDb25uZWN0aW9uIG9iamVjdAog KiBccGFyYW1baW5dIHZhbHVlICBzaXRlZ3JvdXAncyB2YWx1ZSBjb250YWluZXIKICoKICogU2V0 cyBpbnRlcm5hbCBzaXRlZ3JvdXAncyB2YWx1ZS4gR1ZhbHVlIGNhbiBob2xkIHN0cmluZyBvciBp bnRlZ2VyIHR5cGUuCiAqLwpleHRlcm4gdm9pZCBtaWRnYXJkX2Nvbm5lY3Rpb25fc2l0ZWdyb3Vw X3NldChNaWRnYXJkQ29ubmVjdGlvbiAqbWdkLApHVmFsdWUgKnZhbHVlKTsKClNlZToKCiAgICAi U2V0cyBzaXRlZ3JvdXAncyB2YWx1ZS4iICAgICAgICAgICAgICAgIDw9Cm1pZGdhcmRfY29ubmVj dGlvbl9zaXRlZ3JvdXBfc2V0KCkKICAgICJtZ2QgTWlkZ2FyZENvbm5lY3Rpb24gb2JqZWN0IiAg ICAgICAgICAgPD0gTWlkZ2FyZENvbm5lY3Rpb24gKm1nZAogICAgInZhbHVlIHNpdGVncm91cCdz IHZhbHVlIGNvbnRhaW5lciIgICAgICA8PSBHVmFsdWUgKnZhbHVlCiAgICAiU2V0cyBpbnRlcm5h bCBzaXRlZ3JvdXAncyB2YWx1ZSIgICAgICAgIDw9Cm1pZGdhcmRfY29ubmVjdGlvbl9zaXRlZ3Jv dXBfc2V0KCkKICAgICJHVmFsdWUgY2FuIGhvbGQgc3RyaW5nIG9yIGludGVnZXIgdHlwZSIgPD0g R1ZhbHVlCgpBbiBpbXByb3ZlZCBkb2MgY29tbWVudCB3b3VsZCBiZSBzb21ldGhpbmcgbGlrZSB0 aGlzIChzZWUgYWxzbyBteQpvdGhlciBjb21tZW50cyBhYm91dCB0aGlzIG1ldGhvZCBzaWduYXR1 cmUpOgoKLyoqCiAqIFxpbmdyb3VwIG1pZGdhcmRfY29ubmVjdGlvbgogKiBTZXRzIHRoZSBzaXRl Z3JvdXAgb2YgdGhlIGdpdmVuIE1pZGdhcmQgY29ubmVjdGlvbi4gVGhlIHNpdGVncm91cApvZiBh IGNvbm5lY3Rpb24KICogYWZmZWN0cyBhbGwgZGF0YWJhc2UgYWNjZXNzZXMgYXMgZGVzY3JpYmVk IGluIHRoZSBNaWRnYXJkIFNpdGVncm91cApkb2N1bWVudGF0aW9uLgogKgogKiBUaGUgZ2l2ZW4g XGMgc2l0ZWdyb3VwIHZhbHVlIHNob3VsZCBjb250YWluIGVpdGhlciBhIHNpdGVncm91cCBpZCwK Z3VpZCwgb3IgbmFtZS4KICogVGhlIGNvbm5lY3Rpb24gc2l0ZWdyb3VwIGlzIG5vdCBjaGFuZ2Vk IGlmIHRoZSBnaXZlbiB2YWx1ZSBpcyBpbnZhbGlkLgogKgogKiBccGFyYW0gICAgIG1nZCAgIHRo ZSBNaWRnYXJkIGNvbm5lY3Rpb24gd2hvc2Ugc2l0ZWdyb3VwIHZhbHVlIGlzIGNoYW5nZWQKICog XHBhcmFtW2luXSB2YWx1ZSB0aGUgbmV3IHNpdGVncm91cCB2YWx1ZSAoc2l0ZWdyb3VwIGlkLCBn dWlkLCBvciBuYW1lKQogKiBcc2VlIGh0dHA6Ly93d3cubWlkZ2FyZC1wcm9qZWN0Lm9yZy9kb2N1 bWVudGF0aW9uL2NvbmNlcHRzLXNpdGVncm91cHMvCiAqIFx0b2RvIG5lZWRzIGVycm9yIHJlcG9y dGluZwogKi8KZXh0ZXJuIHZvaWQgbWlkZ2FyZF9jb25uZWN0aW9uX3NpdGVncm91cF9zZXQoTWlk Z2FyZENvbm5lY3Rpb24gKm1nZCwKR1ZhbHVlICp2YWx1ZSk7CgpVc2UgXHBhcmFtW2luXSB3aGVu IHRoZSBwYXJhbWV0ZXIgaXMgb25seSByZWFkIGJ5IHRoZSBmdW5jdGlvbiwKXHBhcmFtW291dF0g d2hlbiB0aGUgdmFsdWUgaXMgb25seSB3cml0dGVuLCBhbmQgXHBhcmFtW2lub3V0XSB3aGVuIHRo ZQp2YWx1ZSBpcyBib3RoIHJlYWQgYW5kIHdyaXR0ZW4uIFBsYWluIFxwYXJhbSBpcyBiZXN0IHVz ZWQgd2hlbiB0aGUKYWNjZXNzIHR5cGUgaXMgbm90IGtub3duIG9yIHdoZW4gdGhlIHBhcmFtZXRl ciBpcyBhICR0aGlzIG9iamVjdAppbnN0YW5jZQoKPiAvKiBjb252ZW50aW9uIG1hY3JvcyAqLwo+ ICNkZWZpbmUgTUlER0FSRF9UWVBFX0NPTk5FQ1RJT04gKG1pZGdhcmRfY29ubmVjdGlvbl9nZXRf dHlwZSgpKQo+IFsuLi5dCgpXaHkgd291bGQgTWlkZ2FyZENvbm5lY3Rpb24gbmVlZCB0byBiZSBh IEdPYmplY3Q/IEkgc2VlIG5vIHVzZSBjYXNlIGZvciB0aGF0LgoKSU1PIGEgc2ltcGxlIG9wYXF1 ZSBzdHJ1Y3Qgd291bGQgYmUgbXVjaCBiZXR0ZXI6CgogICAgdHlwZWRlZiBzdHJ1Y3QgX01pZGdh cmRDb25uZWN0aW9uIE1pZGdhcmRDb25uZWN0aW9uOwoKTGVzcyBjb2RlLCBsZXNzIGJ1Z3MuLi4g Oi0pCgo+IHR5cGVkZWYgc3RydWN0IE1pZGdhcmRPYmplY3RQcm9wZXJ0eSBNaWRnYXJkT2JqZWN0 UHJvcGVydHk7Cj4gdHlwZWRlZiBzdHJ1Y3QgTWlkZ2FyZE9iamVjdFByb3BlcnR5Q2xhc3MgTWlk Z2FyZE9iamVjdFByb3BlcnR5Q2xhc3M7CgpXaGF0IGFyZSB0aGVzZSBkb2luZyBoZXJlPwoKPiBl eHRlcm4gTWlkZ2FyZENvbm5lY3Rpb24gKm1pZGdhcmRfY29ubmVjdGlvbl9uZXcodm9pZCk7CgpX aGF0IGNhbiBJIGRvIHdpdGggYW4gZW1wdHkgY29ubmVjdGlvbj8gSU1PIHRoZQptaWRnYXJkX2Nv bm5lY3Rpb25fb3BlbigpIG1ldGhvZHMgYXJlIGdvb2QgZW5vdWdoLgoKPiBleHRlcm4gdm9pZCBt aWRnYXJkX2Nvbm5lY3Rpb25fcmVzZXQoTWlkZ2FyZENvbm5lY3Rpb24gKm1nZCk7CgpXaHkgaXMg dGhpcyBuZWVkZWQ/Cgo+IGV4dGVybiB2b2lkIG1pZGdhcmRfY29ubmVjdGlvbl9zaHV0ZG93bihN aWRnYXJkQ29ubmVjdGlvbiAqbWdkLCBnYm9vbGVhbiBmcmVlX2NvbmZpZyk7CgpJJ2QgZHJvcCB0 aGUgZnJlZV9jb25maWcgYXJndW1lbnQgYW5kIHJlbmFtZSB0aGUgbWV0aG9kIHRvCm1pZGdhcmRf Y29ubmVjdGlvbl9jbG9zZSgpIChpdCByaHltZXMgYmV0dGVyIHdpdGgKbWlkZ2FyZF9jb25uZWN0 aW9uX29wZW4oKSkuCgo+IGV4dGVybiB2b2lkIG1pZGdhcmRfY29ubmVjdGlvbl9zaXRlZ3JvdXBf c2V0KE1pZGdhcmRDb25uZWN0aW9uICptZ2QsIEdWYWx1ZSAqdmFsdWUpOwo+IGV4dGVybiBHVmFs dWUgKm1pZGdhcmRfY29ubmVjdGlvbl9zaXRlZ3JvdXBfZ2V0KE1pZGdhcmRDb25uZWN0aW9uICpt Z2QpOwo+IGV4dGVybiB2b2lkIG1pZGdhcmRfY29ubmVjdGlvbl9sYW5nX3NldChNaWRnYXJkQ29u bmVjdGlvbiAqbWdkLCBHVmFsdWUgKnZhbHVlKTsKPiBleHRlcm4gR1ZhbHVlICptaWRnYXJkX2Nv bm5lY3Rpb25fbGFuZ19nZXQoTWlkZ2FyZENvbm5lY3Rpb24gKm1nZCk7CgpJIGJlbGlldmUgdGhl IG5hbWluZyBjb252ZW50aW9uIG1vZHVsZV9jbGFzc197c2V0LGdldH1fcHJvcGVydHkoKSBpcwpt b3JlIHN0YW5kYXJkIHRoYW4gLi4uX3Byb3BlcnR5X3tzZXQsZ2V0fSgpLgoKV2h5IEdWYWx1ZT8g VGhlIG1vcmUgc3BlY2lmaWMgdGhlIEFQSSBpcyB0aGUgYmV0dGVyLiBIb3cgYWJvdXQKc29tZXRo aW5nIGxpa2UgdGhpczoKCiAgICAvKioKICAgICAqIFxpbmdyb3VwIG1pZGdhcmRfY29ubmVjdGlv bgogICAgICogU2V0cyB0aGUgbGFuZ3VhZ2Ugb2YgdGhlIGdpdmVuIE1pZGdhcmQgY29ubmVjdGlv bi4gVGhlCmNvbm5lY3Rpb24gbGFuZ3VhZ2UKICAgICAqIGFmZmVjdHMgYWxsIE11bHRpTGFuZyBk YXRhYmFzZSBhY2Nlc3NlcyBhcyBkZXNjcmliZWQgaW4gdGhlCk1pZGdhcmQgTXVsdGlMYW5nCiAg ICAgKiBkb2N1bWVudGF0aW9uLgogICAgICoKICAgICAqIFRoZSBnaXZlbiBcYyBsYW5ndWFnZSBw YXJhbWV0ZXIgaXMgdGhlIHR3by1sZXR0ZXIgbGFuZ3VhZ2UgY29kZQpzdG9yZWQgaW4gdGhlCiAg ICAgKiBcYyBsYW5ndWFnZSB0YWJsZSBpbiB0aGUgTWlkZ2FyZCBkYXRhYmFzZS4gVGhpcyBtZXRo b2QgcmV0dXJucwpcYyBGQUxTRSBpZgogICAgICogdGhlIGdpdmVuIGxhbmd1YWdlIGlzIG5vdCBm b3VuZC4KICAgICAqCiAgICAgKiBccGFyYW0gICAgIGNvbm5lY3Rpb24gdGhlIE1pZGdhcmQgY29u bmVjdGlvbiB3aG9zZSBsYW5ndWFnZSBpcyBjaGFuZ2VkCiAgICAgKiBccGFyYW1baW5dIGxhbmd1 YWdlIHRoZSBuZXcgbGFuZ3VhZ2UgY29kZQogICAgICogXHJldHVybiBcYyBUUlVFIGlmIHRoZSBj b25uZWN0aW9uIGxhbmd1YWdlIHdhcyBjaGFuZ2VkLCBcYwpGQUxTRSBvdGhlcndpc2UKICAgICAq IFxzZWUgaHR0cDovL3d3dy5taWRnYXJkLXByb2plY3Qub3JnL2RvY3VtZW50YXRpb24vbWlkZ2Fy ZC1hbmQtbXVsdGlsaW5ndWFsLWNvbnRlbnQvCiAgICAgKi8KICAgIGV4dGVybiBnYm9vbGVhbiBt aWRnYXJkX2Nvbm5lY3Rpb25fc2V0X2xhbmcoCiAgICAgICAgICAgIE1pZGdhcmRDb25uZWN0aW9u ICpjb25uZWN0aW9uLCBjb25zdCBjaGFyICpsYW5ndWFnZSk7CgpXaGVyZSB0aGUgbGFuZyBwYXJh bWV0ZXIgaXMgdGhlIGxhbmd1YWdlIGNvZGUgdG8gYmUgdXNlZC4KCj4gZXh0ZXJuIE1pZGdhcmRD b25maWcgKm1pZGdhcmRfY29ubmVjdGlvbl9jb25maWdfZ2V0KE1pZGdhcmRDb25uZWN0aW9uICpt Z2QpOwoKSSdkIHJhdGhlciBub3QgaGF2ZSB0aGlzLiBJcyB0aGVyZSBhbnkgdXNlIGNhc2Ugd2hl cmUgdGhlIGNvbm5lY3Rpb24KY29uZmlndXJhdGlvbiBpcyBuZWVkZWQgYWZ0ZXIgdGhlIGNvbm5l Y3Rpb24gaGFzIGJlZW4gb3BlbmVkPwoKPiBleHRlcm4gdm9pZCBtaWRnYXJkX2Nvbm5lY3Rpb25f bG9nbGV2ZWxfc2V0KE1pZGdhcmRDb25uZWN0aW9uICptZ2QsIGNvbnN0IGdjaGFyICpsZXZlbCk7 Cj4gZXh0ZXJuIGd1aW50IG1pZGdhcmRfY29ubmVjdGlvbl9sb2dsZXZlbF9nZXQoTWlkZ2FyZENv bm5lY3Rpb24gKm1nZCk7Cj4gZXh0ZXJuIHZvaWQgbWlkZ2FyZF9jb25uZWN0aW9uX2xvZ2hhbmRs ZXJfc2V0KAo+ICAgICAgICAgICAgICAgICBNaWRnYXJkQ29ubmVjdGlvbiAqbWdkLCBndWludCBs b2doYW5kbGVyKTsKPiBleHRlcm4gZ3VpbnQgbWlkZ2FyZF9jb25uZWN0aW9uX2xvZ2hhbmRsZXJf Z2V0KE1pZGdhcmRDb25uZWN0aW9uICptZ2QpOwoKVGhpcyBmdW5jdGlvbmFsaXR5IGlzIGFscmVh ZHkgcHJvdmlkZWQgYnkgR0xpYi4gVGhlIG1vc3Qgd2Ugc2hvdWxkCnByb3ZpZGUgaXMgc29tZXRo aW5nIGxpa2UgdGhlIGZvbGxvd2luZyBzbyBjbGllbnRzIHdvdWxkbid0IG5lZWQgdG8Ka25vdyB0 aGUgbWlkZ2FyZC1jb3JlIGxvZyBkb21haW4uCgogICAgZ3VpbnQgbWlkZ2FyZF9zZXRfbG9nX2hh bmRsZXIoCiAgICAgICAgICAgR0xvZ0xldmVsRmxhZ3MgbGV2ZWxzLCBHTG9nRnVuYyBoYW5kbGVy LCBncG9pbnRlciBkYXRhKSB7CiAgICAgICAgICAgcmV0dXJuIGdfbG9nX3NldF9oYW5kbGVyKEdf TE9HX0RPTUFJTiwgbGV2ZWxzLCBoYW5kbGVyLCBkYXRhKTsKICAgIH0KCkFsbCB0aGUgb3RoZXIg bG9nIGZ1bmN0aW9ucyBhcmUgYmV0dGVyIGltcGxlbWVudGVkIGJ5IHRoZSBjbGllbnQgYXBwbGlj YXRpb24uCgpCUiwKCkp1a2thIFppdHRpbmcKCi0tCll1a2F0YW4gLSBodHRwOi8veXVrYXRhbi5m aS8gLSBpbmZvQHl1a2F0YW4uZmkKU29mdHdhcmUgY3JhZnRzbWFuc2hpcCwgSkNSIGNvbnN1bHRp bmcsIGFuZCBKYXZhIGRldmVsb3BtZW50Cg==