[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_pgsql pgsql_driver.c

[Wez Furlong]

wez             Mon Nov 28 23:06:03 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/pdo_pgsql      pgsql_driver.c 
  Log:
  proto fixups
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53.2.2&r2=1.53.2.3&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.2 
php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.3
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.2       Mon Nov 28 21:11:37 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.c        Mon Nov 28 23:06:03 2005
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pgsql_driver.c,v 1.53.2.2 2005/11/29 02:11:37 wez Exp $ */
+/* $Id: pgsql_driver.c,v 1.53.2.3 2005/11/29 04:06:03 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -474,9 +474,9 @@
        return pdo_pgsql_transaction_cmd("ROLLBACK", dbh TSRMLS_CC);
 }
 
-/* {{{ string pgSQL::pgsqlLOBCreate()
+/* {{{ proto string PDO::pgsqlLOBCreate()
    Creates a new large object, returning its identifier.  Must be called 
inside a transaction. */
-static PHP_METHOD(pgSQL, pgsqlLOBCreate)
+static PHP_METHOD(PDO, pgsqlLOBCreate)
 {
        pdo_dbh_t *dbh;
        pdo_pgsql_db_handle *H;
@@ -499,9 +499,9 @@
 }
 /* }}} */
 
-/* {{{ resource pgSQL::pgsqlLOBOpen(string oid [, string mode = 'rb'])
+/* {{{ proto resource PDO::pgsqlLOBOpen(string oid [, string mode = 'rb'])
    Opens an existing large object stream.  Must be called inside a 
transaction. */
-static PHP_METHOD(pgSQL, pgsqlLOBOpen)
+static PHP_METHOD(PDO, pgsqlLOBOpen)
 {
        pdo_dbh_t *dbh;
        pdo_pgsql_db_handle *H;
@@ -548,16 +548,23 @@
 }
 /* }}} */
 
-/* {{{ bool pgSQL::pgsqlLOBUnlink(int oid)
+/* {{{ proto bool PDO::pgsqlLOBUnlink(string oid)
    Deletes the large object identified by oid.  Must be called inside a 
transaction. */
-static PHP_METHOD(pgSQL, pgsqlLOBUnlink)
+static PHP_METHOD(PDO, pgsqlLOBUnlink)
 {
        pdo_dbh_t *dbh;
        pdo_pgsql_db_handle *H;
-       long lfd;
+       Oid oid;
+       char *oidstr, *end_ptr;
+       int oidlen;
+
+       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
+                               &oidstr, &oidlen)) {
+               RETURN_FALSE;
+       }
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
-                               &lfd)) {
+       oid = (Oid)strtoul(oidstr, &end_ptr, 10);
+       if (oid == 0 && (errno == ERANGE || errno == EINVAL)) {
                RETURN_FALSE;
        }
 
@@ -566,19 +573,19 @@
 
        H = (pdo_pgsql_db_handle *)dbh->driver_data;
        
-       if (1 == lo_unlink(H->server, lfd)) {
+       if (1 == lo_unlink(H->server, oid)) {
                RETURN_TRUE;
        }
        pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "HY000");
        RETURN_FALSE;
 }
-
+/* }}} */
 
 
 static function_entry dbh_methods[] = {
-       PHP_ME(pgSQL, pgsqlLOBCreate, NULL, ZEND_ACC_PUBLIC)
-       PHP_ME(pgSQL, pgsqlLOBOpen, NULL, ZEND_ACC_PUBLIC)
-       PHP_ME(pgSQL, pgsqlLOBUnlink, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(PDO, pgsqlLOBCreate, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(PDO, pgsqlLOBOpen, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(PDO, pgsqlLOBUnlink, NULL, ZEND_ACC_PUBLIC)
        {NULL, NULL, NULL}
 };
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php