From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Mike Gran Newsgroups: gmane.lisp.guile.user Subject: Patch to Guile-DBI: SCM_ASSERT Date: Mon, 10 Nov 2008 20:32:38 -0800 (PST) Message-ID: <406962.97326.qm@web37901.mail.mud.yahoo.com> References: <3ae3aa420811101444p3488b456u9fcf243f0a5cb9be@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0-52500291-1226377958=:97326" X-Trace: ger.gmane.org 1226378376 5365 80.91.229.12 (11 Nov 2008 04:39:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 11 Nov 2008 04:39:36 +0000 (UTC) To: Guile User Mailing List Original-X-From: guile-user-bounces+guile-user=m.gmane.org@gnu.org Tue Nov 11 05:40:37 2008 Return-path: Envelope-to: guile-user@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Kzl3M-0006ah-O3 for guile-user@m.gmane.org; Tue, 11 Nov 2008 05:40:37 +0100 Original-Received: from localhost ([127.0.0.1]:53935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kzl2E-0003r5-QJ for guile-user@m.gmane.org; Mon, 10 Nov 2008 23:39:26 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kzl2A-0003qm-Il for guile-user@gnu.org; Mon, 10 Nov 2008 23:39:22 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kzl28-0003qS-RF for guile-user@gnu.org; Mon, 10 Nov 2008 23:39:22 -0500 Original-Received: from [199.232.76.173] (port=53517 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kzl28-0003qP-KU for guile-user@gnu.org; Mon, 10 Nov 2008 23:39:20 -0500 Original-Received: from web37901.mail.mud.yahoo.com ([209.191.91.163]:37628) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1Kzl28-0001zv-2L for guile-user@gnu.org; Mon, 10 Nov 2008 23:39:20 -0500 Original-Received: (qmail 97636 invoked by uid 60001); 11 Nov 2008 04:32:38 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=X-YMail-OSG:Received:X-Mailer:References:Date:From:Subject:To:MIME-Version:Content-Type:Message-ID; b=xov5ekMa8uIx6rbApNnrASQjmeYb/6psDvGgrb7I7CSxGqxaGdYvG4Rqw1hZ2KObYuZ06gMI61SJy3VXiOARIJCexucsxZ/HkXv+ckXLdfNqSMBKyubHzuQ0s8ejYOnrdVV/3+WCANMKKSvQ9CvV+4dA3WLh6wZTZjVrCLpFlGg=; X-YMail-OSG: B61iij4VM1nG3qulGG2COc.vblmAiOfdBukJEL8H7FmUYsyfBBE55Lw.E1aNKjRwJJZkxsNot6bdtXW615cSB_Ww.AQeUlw5j_FVILuUbtTZj6OhcfsS_Ek2cxcbw73HpcwG7oYrdOglqoZTR2l6CTwqPVHhBfNJi6YxJysYP0SDfQ1YKv8N9rnDvQ-- Original-Received: from [69.228.7.65] by web37901.mail.mud.yahoo.com via HTTP; Mon, 10 Nov 2008 20:32:38 PST X-Mailer: YahooMailRC/1155.20 YahooMailWebService/0.7.260.1 X-detected-operating-system: by monty-python.gnu.org: FreeBSD 6.x (1) X-BeenThere: guile-user@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: General Guile related discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-user-bounces+guile-user=m.gmane.org@gnu.org Errors-To: guile-user-bounces+guile-user=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.user:6868 Archived-At: --0-52500291-1226377958=:97326 Content-Type: text/plain; charset=us-ascii ----- Original Message ---- > From: Linas Vepstas > > I was finally able to update the gna.org website for guile-dbi > with a new release. > See http://home.gna.org/guile-dbi/guile-dbi.html A patch. SCM_ASSERT usually uses the scheme function name in the assertion error instead of the C function name. Also, in make_g_db_handle, the assertion for the second parameter is incorrect. Thanks, Mike Gran --0-52500291-1226377958=:97326 Content-Type: application/octet-stream; name="guile-dbi.c.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="guile-dbi.c.patch" LS0tIGd1aWxlLWRiaS5jLjAJMjAwOC0xMS0xMCAyMDoxNTo0NS43ODEyNTAw MDAgLTA4MDAKKysrIGd1aWxlLWRiaS5jCTIwMDgtMTEtMTAgMjA6MjM6NDQu NDA2MjUwMDAwIC0wODAwCkBAIC0zNywxNSArMzcsMTUgQEAKIFNDTV9ERUZJ TkUgKG1ha2VfZ19kYl9oYW5kbGUsICJkYmktb3BlbiIsIDIsIDAsIDAsCiAJ ICAgIChTQ00gYmNrbmQsIFNDTSBjb25uX3N0cmluZyksCiAJICAgICJCdWls ZCBkYl9oYW5kbGUgc21vYi4iKQotI2RlZmluZSBGVU5DX05BTUUgc19tYWtl X2RiX2hhbmRsZQorI2RlZmluZSBGVU5DX05BTUUgc19tYWtlX2dfZGJfaGFu ZGxlCiB7CiAgIHN0cnVjdCBnX2RiX2hhbmRsZSAqZ19kYl9oYW5kbGUgPSBO VUxMOwogICBjaGFyKiBzb2RiZCAgICAgICAgICAgICAgICAgICAgID0gTlVM TDsKICAgY2hhciogYmNrbmRfc3RyICAgICAgICAgICAgICAgICA9IE5VTEw7 CiAgIHZvaWQgKCpjb25uZWN0KShnZGJpX2RiX2hhbmRsZV90Kik7CiAKLSAg U0NNX0FTU0VSVCAoc2NtX2lzX3N0cmluZyAoYmNrbmQpLCBiY2tuZCwgU0NN X0FSRzEsICJtYWtlX2dfZGJfaGFuZGxlIik7Ci0gIFNDTV9BU1NFUlQgKHNj bV9pc19zdHJpbmcgKGNvbm5fc3RyaW5nKSwgYmNrbmQsIFNDTV9BUkcyLCAi bWFrZV9nX2RiX2hhbmRsZSIpOworICBTQ01fQVNTRVJUIChzY21faXNfc3Ry aW5nIChiY2tuZCksIGJja25kLCBTQ01fQVJHMSwgRlVOQ19OQU1FKTsKKyAg U0NNX0FTU0VSVCAoc2NtX2lzX3N0cmluZyAoY29ubl9zdHJpbmcpLCBjb25u X3N0cmluZywgU0NNX0FSRzIsIEZVTkNfTkFNRSk7CiAKICAgZ19kYl9oYW5k bGUgPSAoc3RydWN0IGdfZGJfaGFuZGxlKilzY21fZ2NfbWFsbG9jKHNpemVv ZiAoc3RydWN0IGdfZGJfaGFuZGxlKSwKIAkJCQkJCSAgICJnX2RiX2hhbmRs ZSIpOwpAQCAtMTUzLDEyICsxNTMsMTIgQEAKIFNDTV9ERUZJTkUgKGNsb3Nl X2dfZGJfaGFuZGxlLCAiZGJpLWNsb3NlIiwgMSwgMCwgMCwKIAkgICAgKFND TSBkYl9oYW5kbGUpLAogCSAgICAiQ2xvc2UgZGIgY29ubmVjdGlvbi4iKQot I2RlZmluZSBGVU5DX05BTUUgc19jbG9zZV9kYl9oYW5kbGUKKyNkZWZpbmUg RlVOQ19OQU1FIHNfY2xvc2VfZ19kYl9oYW5kbGUKIHsKICAgc3RydWN0IGdf ZGJfaGFuZGxlICpnX2RiX2hhbmRsZSA9IE5VTEw7CiAgIHZvaWQgKCpkYmRf Y2xvc2UpKGdkYmlfZGJfaGFuZGxlX3QqKTsKIAotICBTQ01fQVNTRVJUIChE QklfU01PQl9QKGRiX2hhbmRsZSksIGRiX2hhbmRsZSwgU0NNX0FSRzEsICJj bG9zZV9nX2RiX2hhbmRsZSIpOworICBTQ01fQVNTRVJUIChEQklfU01PQl9Q KGRiX2hhbmRsZSksIGRiX2hhbmRsZSwgU0NNX0FSRzEsIEZVTkNfTkFNRSk7 CiAgIGdfZGJfaGFuZGxlID0gKHN0cnVjdCBnX2RiX2hhbmRsZSopU0NNX1NN T0JfREFUQShkYl9oYW5kbGUpOwogCiAgIGlmIChnX2RiX2hhbmRsZS0+Y2xv c2VkID09IFNDTV9CT09MX1QpCkBAIC0yMTAsMTUgKzIxMCwxNSBAQAogU0NN X0RFRklORSAocXVlcnlfZ19kYl9oYW5kbGUsICJkYmktcXVlcnkiLCAyLCAw LCAwLAogCSAgICAoU0NNIGRiX2hhbmRsZSwgU0NNIHF1ZXJ5KSwKIAkgICAg IkRvIGEgcXVlcnkgYW5kIHNldCBzdGF0dXMuIikKLSNkZWZpbmUgRlVOQ19O QU1FIHNfcXVlcnlfZGJfaGFuZGxlCisjZGVmaW5lIEZVTkNfTkFNRSBzX3F1 ZXJ5X2dfZGJfaGFuZGxlCiB7CiAgIHN0cnVjdCBnX2RiX2hhbmRsZSAqZ19k Yl9oYW5kbGUgPSBOVUxMOwogICBjaGFyICAgICAgICAgICAgICAgKnF1ZXJ5 X3N0ciAgID0gTlVMTDsKIAogICB2b2lkICgqZGJpX3F1ZXJ5KShnZGJpX2Ri X2hhbmRsZV90KixjaGFyKik7CiAKLSAgU0NNX0FTU0VSVCAoREJJX1NNT0Jf UChkYl9oYW5kbGUpLCBkYl9oYW5kbGUsIFNDTV9BUkcxLCAicXVlcnlfZ19k Yl9oYW5kbGUiKTsgIAotICBTQ01fQVNTRVJUIChzY21faXNfc3RyaW5nIChx dWVyeSksIHF1ZXJ5LCBTQ01fQVJHMiwgInF1ZXJ5X2dfZGJfaGFuZGxlIik7 CisgIFNDTV9BU1NFUlQgKERCSV9TTU9CX1AoZGJfaGFuZGxlKSwgZGJfaGFu ZGxlLCBTQ01fQVJHMSwgRlVOQ19OQU1FKTsgIAorICBTQ01fQVNTRVJUIChz Y21faXNfc3RyaW5nIChxdWVyeSksIHF1ZXJ5LCBTQ01fQVJHMiwgRlVOQ19O QU1FKTsKIAogICBnX2RiX2hhbmRsZSA9IChzdHJ1Y3QgZ19kYl9oYW5kbGUq KVNDTV9TTU9CX0RBVEEoZGJfaGFuZGxlKTsKICAgcXVlcnlfc3RyID0gc2Nt X3RvX2xvY2FsZV9zdHJpbmcocXVlcnkpOwpAQCAtMjQwLDEzICsyNDAsMTMg QEAKIFNDTV9ERUZJTkUgKGdldHJvd19nX2RiX2hhbmRsZSwgImRiaS1nZXRf cm93IiwgMSwgMCwgMCwKIAkgICAgKFNDTSBkYl9oYW5kbGUpLAogCSAgICAi RG8gYSBxdWVyeSBhbmQgcmV0dXJuIGEgcm93IGluIGZvcm0gb2YgcGFpciBs aXN0IG9yIGZhbHNlIikKLSNkZWZpbmUgRlVOQ19OQU1FIHNfZ2V0cm93X2Ri X2hhbmRsZQorI2RlZmluZSBGVU5DX05BTUUgc19nZXRyb3dfZ19kYl9oYW5k bGUKIHsKICAgc3RydWN0IGdfZGJfaGFuZGxlICpnX2RiX2hhbmRsZSA9IE5V TEw7CiAgIFNDTSByZXRyb3cgPSBTQ01fRU9MOwogICBTQ00gKCpkYmlfZ2V0 cm93KShnZGJpX2RiX2hhbmRsZV90Kik7CiAKLSAgU0NNX0FTU0VSVCAoREJJ X1NNT0JfUChkYl9oYW5kbGUpLCBkYl9oYW5kbGUsIFNDTV9BUkcxLCAiZ2V0 cm93X2dfZGJfaGFuZGxlIik7ICAKKyAgU0NNX0FTU0VSVCAoREJJX1NNT0Jf UChkYl9oYW5kbGUpLCBkYl9oYW5kbGUsIFNDTV9BUkcxLCBGVU5DX05BTUUp OyAgCiAgIGdfZGJfaGFuZGxlID0gKHN0cnVjdCBnX2RiX2hhbmRsZSopU0NN X1NNT0JfREFUQShkYl9oYW5kbGUpOwogCiAgIF9fZ2RiaV9kYmRfd3JhcChn X2RiX2hhbmRsZSwgX19GVU5DVElPTl9fLCh2b2lkKiopICZkYmlfZ2V0cm93 KTsKQEAgLTI2OCwxMSArMjY4LDExIEBACiBTQ01fREVGSU5FIChnZXRzdGF0 X2dfZGJfaGFuZGxlLCAiZGJpLWdldF9zdGF0dXMiLCAxLCAwLCAwLAogCSAg ICAoU0NNIGRiX2hhbmRsZSksCiAJICAgICJSZXR1cm4gc3RhdHVzIHBhaXIs IGNvZGUgYW5kIG1zZywgZnJvbSBkYmkgc21vYi4iKQotI2RlZmluZSBGVU5D X05BTUUgc19nZXRzdGF0X2RiX2hhbmRsZQorI2RlZmluZSBGVU5DX05BTUUg c19nZXRzdGF0X2dfZGJfaGFuZGxlCiB7CiAgIHN0cnVjdCBnX2RiX2hhbmRs ZSAqZ19kYl9oYW5kbGUgPSBOVUxMOwogCi0gIFNDTV9BU1NFUlQgKERCSV9T TU9CX1AoZGJfaGFuZGxlKSwgZGJfaGFuZGxlLCBTQ01fQVJHMSwgImdldHN0 YXRfZ19kYl9oYW5kbGUiKTsgIAorICBTQ01fQVNTRVJUIChEQklfU01PQl9Q KGRiX2hhbmRsZSksIGRiX2hhbmRsZSwgU0NNX0FSRzEsIEZVTkNfTkFNRSk7 ICAKIAogICBnX2RiX2hhbmRsZSA9IChzdHJ1Y3QgZ19kYl9oYW5kbGUqKVND TV9TTU9CX0RBVEEoZGJfaGFuZGxlKTsKIAo= --0-52500291-1226377958=:97326--