Changeset 14768 for release/4/postgresql/trunk/postgresql.scm

Timestamp:

05/25/09 05:47:51 (16 months ago)

Author:

sjamaan

Message:

Fix really bad bug; used pointer instead of c-pointer as argument type (damned compiler warnings didn't help)

Files:

• release/4/postgresql/trunk/postgresql.scm (modified) (6 diffs)

release/4/postgresql/trunk/postgresql.scm

@@ -600 +600 @@
            "    }"
            "}"
-           "res = PQsendQueryParams(conn, query, num, NULL,"
-           "                        vals, lens, fmts, resfmt);"
+           "res = PQsendQueryParams((PGconn *)conn, query, num, NULL,"
+           "                        (const char * const *)vals, lens, fmts, resfmt);"
            "for (i=0,cons=params; i < num; ++i,cons=C_u_i_cdr(cons)) {"
            "    obj = C_u_i_car(cons);"
@@ -631 +631 @@
     ;; This can allocate up to twice as much memory than the string actually
     ;; uses; in extreme cases this could be a problem.
-    (foreign-lambda* c-string* ((pointer conn) (c-string from) (int fromlen))
+    (foreign-lambda* c-string* ((pgconn* conn) (c-string from) (int flen))
                      "int err = 0; char *to;"
-                     "to = malloc(sizeof(char) * (fromlen * 2 + 1));"
-                     "PQescapeStringConn(conn, to, from, fromlen, &err);"
+                     "to = malloc(sizeof(char) * (flen * 2 + 1));"
+                     "PQescapeStringConn((PGconn *)conn, to, from, (size_t)flen, &err);"
                      "if (err) {"
                      "        free(to);"
@@ -640 +640 @@
                      "}"
                      "C_return(to);"))
-  (or (%escape-string-conn conn str (string-length str))
+  (or (%escape-string-conn (pg-connection-ptr conn) str (string-length str))
       (postgresql-error 'escape-string
                         (conc "String escaping failed. "
@@ -648 +648 @@
   (define %escape-bytea-conn
     ;; This must copy because libpq returns a malloced ptr...
-    (foreign-safe-lambda* scheme-object ((pointer conn)
+    (foreign-safe-lambda* scheme-object ((pgconn* conn)
                                          ;; not copied/NUL interpreted:
                                          ((const unsigned-c-string*) from)
-                                         (int fromlen))
+                                         (int flen))
                      "size_t tolen=0; C_word res, *fin; unsigned char *esc;"
-                     "esc = PQescapeByteaConn(conn, from, (size_t)fromlen, &tolen);"
+                     "esc = PQescapeByteaConn((PGconn *)conn, from, (size_t)flen, &tolen);"
                      "if (esc == NULL)"
-                     "        C_return(C_SCHEME_FALSE);"
+                     "    C_return(C_SCHEME_FALSE);"
                      "fin = C_alloc(C_bytestowords(tolen + sizeof(C_header)));"
                      "/* tolen includes the resulting NUL byte */"
@@ -661 +661 @@
                      "PQfreemem(esc);"
                      "C_return(res);"))
-  (or (%escape-bytea-conn conn str (string-length str))
+  (or (%escape-bytea-conn (pg-connection-ptr conn) str (string-length str))
       (postgresql-error 'escape-bytea
                         (conc "Byte array escaping failed. "
@@ -673 +673 @@
                      "unesc = PQunescapeBytea(from, &tolen);"
                      "if (unesc == NULL)"
-                     "        C_return(C_SCHEME_FALSE);"
+                     "    C_return(C_SCHEME_FALSE);"
                      "fin = C_alloc(C_bytestowords(tolen + sizeof(C_header)));"
                      "res = C_string(&fin, tolen, (char *)unesc);"