Re: [PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2009-05-14 Thread Johannes Schlüter 
Hi,

On Thu, 2009-05-14 at 01:25 +, Felipe Pena wrote:
 felipeThu May 14 01:25:17 2009 UTC
 
   Modified files:  
 /php-src/ext/odbc php_odbc.c 
   Log:
   - Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
 driver)

 @@ -3122,6 +3122,10 @@
   schema = NULL;
   }
  
 + if (cat  cat_len == 0) {
 + cat = NULL;
 + }
 +

Passing  gives you tables that do not have schemas whereas NULL
gives you tables from all schemas, see
http://msdn.microsoft.com/en-us/library/ms711683.aspx

Similar for the other functions.

Not sure which feature is more important - didn't check where cat is
coming from so the user can explicitly make this NULL or .

johannes


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

Re: [PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2009-05-14 Thread Felipe Pena 
Hello,

Em Qui, 2009-05-14 às 11:55 +0200, Johannes Schlüter escreveu:
 Hi,
 
 On Thu, 2009-05-14 at 01:25 +, Felipe Pena wrote:
  felipe  Thu May 14 01:25:17 2009 UTC
  
Modified files:  
  /php-src/ext/odbc   php_odbc.c 
Log:
- Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
  driver)
 
  @@ -3122,6 +3122,10 @@
  schema = NULL;
  }
   
  +   if (cat  cat_len == 0) {
  +   cat = NULL;
  +   }
  +
 
 Passing  gives you tables that do not have schemas whereas NULL
 gives you tables from all schemas, see
 http://msdn.microsoft.com/en-us/library/ms711683.aspx
 
 Similar for the other functions.
 
 Not sure which feature is more important - didn't check where cat is
 coming from so the user can explicitly make this NULL or .
 

Oh, thanks. I'll need to change the parameter type in this case. (They
are all using 's')

-- 
Regards,
Felipe Pena


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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2009-05-13 Thread Felipe Pena 
felipe  Thu May 14 01:25:17 2009 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  - Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC 
driver)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.219r2=1.220diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.219 php-src/ext/odbc/php_odbc.c:1.220
--- php-src/ext/odbc/php_odbc.c:1.219   Fri May  1 03:02:32 2009
+++ php-src/ext/odbc/php_odbc.c Thu May 14 01:25:17 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.219 2009/05/01 03:02:32 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.220 2009/05/14 01:25:17 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -3122,6 +3122,10 @@
schema = NULL;
}
 
+   if (cat  cat_len == 0) {
+   cat = NULL;
+   }
+
rc = SQLColumns(result-stmt, 
cat, (SQLSMALLINT) cat_len,
schema, (SQLSMALLINT) schema_len,
@@ -3184,6 +3188,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLColumnPrivileges(result-stmt, 
cat, SAFE_SQL_NTS(cat),
@@ -3260,6 +3268,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (pcat_len == 0) {
+   pcat = NULL;
+   }
 
rc = SQLForeignKeys(result-stmt, 
pcat, SAFE_SQL_NTS(pcat), 
@@ -3385,6 +3397,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLPrimaryKeys(result-stmt, cat, SAFE_SQL_NTS(cat), schema, 
SAFE_SQL_NTS(schema), table, SAFE_SQL_NTS(table) );
 
@@ -3583,6 +3599,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLSpecialColumns(result-stmt, 
type,
@@ -3652,6 +3672,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLStatistics(result-stmt, 
cat, SAFE_SQL_NTS(cat),
@@ -3715,6 +3739,10 @@
efree(result);
RETURN_FALSE;
}
+   
+   if (cat_len == 0) {
+   cat = NULL;
+   }
 
rc = SQLTablePrivileges(result-stmt, 
cat, SAFE_SQL_NTS(cat), 



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2009-04-30 Thread Felipe Pena 
felipe  Fri May  1 03:02:32 2009 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  - Fixed bug #48038 (odbc_execute changes variables used to form params array)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.218r2=1.219diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.218 php-src/ext/odbc/php_odbc.c:1.219
--- php-src/ext/odbc/php_odbc.c:1.218   Tue Mar 10 23:39:27 2009
+++ php-src/ext/odbc/php_odbc.c Fri May  1 03:02:32 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.218 2009/03/10 23:39:27 helly Exp $ */
+/* $Id: php_odbc.c,v 1.219 2009/05/01 03:02:32 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1274,7 +1274,7 @@
}
 
otype = (*tmp)-type;
-   convert_to_string(*tmp);
+   convert_to_string_ex(tmp);
if (Z_TYPE_PP(tmp) != IS_STRING) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING,Error converting parameter);
SQLFreeStmt(result-stmt, SQL_RESET_PARAMS);



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2009-02-17 Thread Felipe Pena 
felipe  Tue Feb 17 12:03:44 2009 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  - Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.215r2=1.216diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.215 php-src/ext/odbc/php_odbc.c:1.216
--- php-src/ext/odbc/php_odbc.c:1.215   Wed Dec 31 11:12:33 2008
+++ php-src/ext/odbc/php_odbc.c Tue Feb 17 12:03:43 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.215 2008/12/31 11:12:33 sebastian Exp $ */
+/* $Id: php_odbc.c,v 1.216 2009/02/17 12:03:43 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -121,7 +121,7 @@
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_into, 0, 0, 2)
ZEND_ARG_INFO(0, result_id)
-   ZEND_ARG_INFO(0, result_array)
+   ZEND_ARG_INFO(1, result_array)
ZEND_ARG_INFO(0, rownumber)
 ZEND_END_ARG_INFO()
 



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2009-02-17 Thread Felipe Pena 
felipe  Tue Feb 17 12:32:06 2009 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  - Fix proto
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.216r2=1.217diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.216 php-src/ext/odbc/php_odbc.c:1.217
--- php-src/ext/odbc/php_odbc.c:1.216   Tue Feb 17 12:03:43 2009
+++ php-src/ext/odbc/php_odbc.c Tue Feb 17 12:32:06 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.216 2009/02/17 12:03:43 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.217 2009/02/17 12:32:06 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1763,7 +1763,7 @@
 /* }}} */
 #endif
 
-/* {{{ proto int odbc_fetch_into(resource result_id, array result_array, [, 
int rownumber])
+/* {{{ proto int odbc_fetch_into(resource result_id, array result_array, [, 
int rownumber])
Fetch one result row into an array */ 
 PHP_FUNCTION(odbc_fetch_into)
 {



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c php_odbc.h php_odbc_includes.h

2008-08-29 Thread Patrick van Kleef 
iodbc   Fri Aug 29 16:42:50 2008 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c php_odbc.h php_odbc_includes.h 
  Log:
  - Fixed code to use ODBC 3.52 datatypes for 64bit systems (bug #43666)
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.209r2=1.210diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.209 php-src/ext/odbc/php_odbc.c:1.210
--- php-src/ext/odbc/php_odbc.c:1.209   Sun Aug 24 20:50:02 2008
+++ php-src/ext/odbc/php_odbc.c Fri Aug 29 16:42:49 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.209 2008/08/24 20:50:02 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.210 2008/08/29 16:42:49 iodbc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -64,7 +64,7 @@
 
 static int le_result, le_conn, le_pconn;
 
-#define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0))
+#define SAFE_SQL_NTS(n) ((SQLSMALLINT) ((n)?(SQL_NTS):0))
 
 /* {{{ arginfo */
 static
@@ -477,7 +477,7 @@
if (res-stmt) {
 #if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35)
SQLTransact(res-conn_ptr-henv, res-conn_ptr-hdbc,
-   (UWORD)SQL_COMMIT);
+   (SQLUSMALLINT) SQL_COMMIT);
 #endif
rc = SQLFreeStmt(res-stmt,SQL_DROP);
/* We don't want the connection to be closed after the 
last statment has been closed
@@ -861,10 +861,10 @@
 /* {{{ odbc_sql_error */
 void odbc_sql_error(ODBC_SQL_ERROR_PARAMS)
 {
-   charstate[6];
-   SDWORD  error;/* Not used */
-   charerrormsg[SQL_MAX_MESSAGE_LENGTH];
-   SWORD   errormsgsize; /* Not used */
+   charstate[6];
+   SQLINTEGER  error;/* Not used */
+   charerrormsg[SQL_MAX_MESSAGE_LENGTH];
+   SQLSMALLINT errormsgsize; /* Not used */
RETCODE rc;
ODBC_SQL_ENV_T henv;
ODBC_SQL_CONN_T conn;
@@ -940,8 +940,8 @@
 {
RETCODE rc;
int i;
-   SWORD   colnamelen; /* Not used */
-   SDWORD  displaysize;
+   SQLSMALLINT colnamelen; /* Not used */
+   SQLLEN  displaysize;
 
result-values = (odbc_result_value *) 
safe_emalloc(sizeof(odbc_result_value), result-numcols, 0);
 
@@ -949,9 +949,9 @@
result-binmode = ODBCG(defaultbinmode);
 
for(i = 0; i  result-numcols; i++) {
-   rc = SQLColAttributes(result-stmt, (UWORD)(i+1), 
SQL_COLUMN_NAME, 
+   rc = SQLColAttributes(result-stmt, (SQLUSMALLINT)(i+1), 
SQL_COLUMN_NAME, 
result-values[i].name, 
sizeof(result-values[i].name), colnamelen, 0);
-   rc = SQLColAttributes(result-stmt, (UWORD)(i+1), 
SQL_COLUMN_TYPE, 
+   rc = SQLColAttributes(result-stmt, (SQLUSMALLINT)(i+1), 
SQL_COLUMN_TYPE, 
NULL, 0, NULL, result-values[i].coltype);

/* Don't bind LONG / BINARY columns, so that fetch behaviour can
@@ -969,17 +969,17 @@
 #ifdef HAVE_ADABAS
case SQL_TIMESTAMP:
result-values[i].value = (char *)emalloc(27);
-   SQLBindCol(result-stmt, (UWORD)(i+1), 
SQL_C_CHAR, result-values[i].value,
+   SQLBindCol(result-stmt, (SQLUSMALLINT)(i+1), 
SQL_C_CHAR, result-values[i].value,
27, 
result-values[i].vallen);
break;
 #endif /* HAVE_ADABAS */
default:
-   rc = SQLColAttributes(result-stmt, 
(UWORD)(i+1), SQL_COLUMN_DISPLAY_SIZE,
+   rc = SQLColAttributes(result-stmt, 
(SQLUSMALLINT)(i+1), SQL_COLUMN_DISPLAY_SIZE,
NULL, 
0, NULL, displaysize);
displaysize = displaysize = 
result-longreadlen ? displaysize : 

result-longreadlen;
result-values[i].value = (char 
*)emalloc(displaysize + 1);
-   rc = SQLBindCol(result-stmt, (UWORD)(i+1), 
SQL_C_CHAR, result-values[i].value,
+   rc = SQLBindCol(result-stmt, 
(SQLUSMALLINT)(i+1), SQL_C_CHAR, result-values[i].value,
displaysize + 1, 
result-values[i].vallen);
break;
}
@@ -1001,7 +1001,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, 
ODBC-Link, le_conn, le_pconn);

-   rc = SQLTransact(conn-henv, conn-hdbc, 
(UWORD)((type)?SQL_COMMIT:SQL_ROLLBACK));
+   rc = SQLTransact(conn-henv, conn-hdbc,

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c php_odbc_includes.h

2008-08-29 Thread Patrick van Kleef 
iodbc   Fri Aug 29 19:15:39 2008 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c php_odbc_includes.h 
  Log:
  - Added odbc.default_cursortype to control the ODBC cursormodel (bug #43668)
  #[DOC]
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.210r2=1.211diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.210 php-src/ext/odbc/php_odbc.c:1.211
--- php-src/ext/odbc/php_odbc.c:1.210   Fri Aug 29 16:42:49 2008
+++ php-src/ext/odbc/php_odbc.c Fri Aug 29 19:15:39 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.210 2008/08/29 16:42:49 iodbc Exp $ */
+/* $Id: php_odbc.c,v 1.211 2008/08/29 19:15:39 iodbc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -677,6 +677,50 @@
 }
 /* }}} */
 
+
+/* {{{ PHP_INI_DISP(display_cursortype)
+ */
+static PHP_INI_DISP(display_cursortype)
+{
+   char *value;
+   TSRMLS_FETCH();
+
+   if (type == PHP_INI_DISPLAY_ORIG  ini_entry-modified) {
+   value = ini_entry-orig_value;
+   } else if (ini_entry-value) {
+   value = ini_entry-value;
+   } else {
+   value = NULL;
+   }
+
+   if (value) {
+   switch (atoi (value))
+ {
+   case SQL_CURSOR_FORWARD_ONLY:
+   PUTS (Forward Only cursor);
+   break;
+
+   case SQL_CURSOR_STATIC:
+   PUTS (Static cursor);
+   break;
+
+   case SQL_CURSOR_KEYSET_DRIVEN:
+   PUTS (Keyset driven cursor);
+   break;
+
+   case SQL_CURSOR_DYNAMIC:
+   PUTS (Dynamic cursor);
+   break;
+
+   default:
+   php_printf(Unknown cursor model %s, value);
+   break;
+ }
+   }
+}
+
+/* }}} */
+
 /* {{{ PHP_INI_BEGIN 
  */
 PHP_INI_BEGIN()
@@ -698,6 +742,8 @@
defaultbinmode, zend_odbc_globals, odbc_globals, 
display_binmode)
STD_PHP_INI_BOOLEAN(odbc.check_persistent, 1, PHP_INI_SYSTEM, 
OnUpdateLong,
check_persistent, zend_odbc_globals, odbc_globals)
+   STD_PHP_INI_ENTRY_EX(odbc.default_cursortype, 3, PHP_INI_ALL, 
OnUpdateLong, 
+   default_cursortype, zend_odbc_globals, odbc_globals, 
display_cursortype)
 PHP_INI_END()
 /* }}} */
 
@@ -1173,7 +1219,8 @@
/* Try to set CURSOR_TYPE to dynamic. Driver will 
replace this with other
   type if not possible.
*/
-   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
SQL_CURSOR_DYNAMIC) == SQL_ERROR) {
+   int cursortype = ODBCG(default_cursortype);
+   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
cursortype) == SQL_ERROR) {
odbc_sql_error(conn, result-stmt,  
SQLSetStmtOption);
SQLFreeStmt(result-stmt, SQL_DROP);
efree(result);
@@ -1561,7 +1608,8 @@
/* Try to set CURSOR_TYPE to dynamic. Driver will 
replace this with other
   type if not possible.
 */
-   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
SQL_CURSOR_DYNAMIC) == SQL_ERROR) {
+   int cursortype = ODBCG(default_cursortype);
+   if (SQLSetStmtOption(result-stmt, SQL_CURSOR_TYPE, 
cursortype) == SQL_ERROR) {
odbc_sql_error(conn, result-stmt,  
SQLSetStmtOption);
SQLFreeStmt(result-stmt, SQL_DROP);
efree(result);
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc_includes.h?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/odbc/php_odbc_includes.h
diff -u php-src/ext/odbc/php_odbc_includes.h:1.19 
php-src/ext/odbc/php_odbc_includes.h:1.20
--- php-src/ext/odbc/php_odbc_includes.h:1.19   Fri Aug 29 16:42:50 2008
+++ php-src/ext/odbc/php_odbc_includes.hFri Aug 29 19:15:39 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_odbc_includes.h,v 1.19 2008/08/29 16:42:50 iodbc Exp $ */
+/* $Id: php_odbc_includes.h,v 1.20 2008/08/29 19:15:39 iodbc Exp $ */
 
 #ifndef PHP_ODBC_INCLUDES_H
 #define PHP_ODBC_INCLUDES_H
@@ -265,6 +265,7 @@
int defConn;
 long defaultlrl;
 long defaultbinmode;
+long default_cursortype;
 char laststate[6];
 char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
HashTable *resource_list;



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2008-07-05 Thread Felipe Pena 
felipe  Sat Jul  5 22:36:55 2008 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFB:
  - Added arginfo
  - Removed #include zend_arg_defs.c
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.207r2=1.208diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.207 php-src/ext/odbc/php_odbc.c:1.208
--- php-src/ext/odbc/php_odbc.c:1.207   Thu Feb 28 14:16:13 2008
+++ php-src/ext/odbc/php_odbc.c Sat Jul  5 22:36:55 2008
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.207 2008/02/28 14:16:13 felipe Exp $ */
+/* $Id: php_odbc.c,v 1.208 2008/07/05 22:36:55 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -66,66 +66,366 @@
 
 #define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0))
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_odbc_close_all, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_binmode, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, mode)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_longreadlen, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, length)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_prepare, 0, 0, 2)
+   ZEND_ARG_INFO(0, connection_id)
+   ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_execute, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, parameters_array)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_cursor, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+#ifdef HAVE_SQLDATASOURCES
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_data_source, 0, 0, 2)
+   ZEND_ARG_INFO(0, connection_id)
+   ZEND_ARG_INFO(0, fetch_type)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_exec, 0, 0, 2)
+   ZEND_ARG_INFO(0, connection_id)
+   ZEND_ARG_INFO(0, query)
+   ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
+#ifdef PHP_ODBC_HAVE_FETCH_HASH
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_object, 0, 0, 1)
+   ZEND_ARG_INFO(0, result)
+   ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_array, 0, 0, 1)
+   ZEND_ARG_INFO(0, result)
+   ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_into, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, result_array)
+   ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_row, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, row_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result_all, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, format)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_free_result, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_connect, 0, 0, 3)
+   ZEND_ARG_INFO(0, dsn)
+   ZEND_ARG_INFO(0, user)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, cursor_option)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_pconnect, 0, 0, 3)
+   ZEND_ARG_INFO(0, dsn)
+   ZEND_ARG_INFO(0, user)
+   ZEND_ARG_INFO(0, password)
+   ZEND_ARG_INFO(0, cursor_option)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_close, 0, 0, 1)
+   ZEND_ARG_INFO(0, connection_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_rows, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+#if !defined(HAVE_SOLID)  !defined(HAVE_SOLID_30)
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_next_result, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_fields, 0, 0, 1)
+   ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_name, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_type, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_len, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_scale, 0, 0, 2)
+   ZEND_ARG_INFO(0, result_id)
+   ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_num, 0, 0, 2)
+

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2007-10-10 Thread Andrey Hristov 
andrey  Wed Oct 10 14:32:01 2007 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFB and unify code
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.204r2=1.205diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.204 php-src/ext/odbc/php_odbc.c:1.205
--- php-src/ext/odbc/php_odbc.c:1.204   Sun Oct  7 05:15:04 2007
+++ php-src/ext/odbc/php_odbc.c Wed Oct 10 14:32:01 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.204 2007/10/07 05:15:04 davidw Exp $ */
+/* $Id: php_odbc.c,v 1.205 2007/10/10 14:32:01 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1567,8 +1567,7 @@
result-fetched++;
 
for(i = 0; i  result-numcols; i++) {
-   ALLOC_ZVAL(tmp);
-   Z_SET_REFCOUNT_P(tmp, 1);
+   MAKE_STD_ZVAL(tmp);
Z_TYPE_P(tmp) = IS_STRING;
Z_STRLEN_P(tmp) = 0;
sql_c_type = SQL_C_CHAR;

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2007-02-19 Thread Antony Dovgal 
tony2001Mon Feb 19 20:22:29 2007 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  check SQLError() return value and output a meaningful errmsg when it fails
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.199r2=1.200diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.199 php-src/ext/odbc/php_odbc.c:1.200
--- php-src/ext/odbc/php_odbc.c:1.199   Tue Jan 16 18:56:55 2007
+++ php-src/ext/odbc/php_odbc.c Mon Feb 19 20:22:29 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.199 2007/01/16 18:56:55 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.200 2007/02/19 20:22:29 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -587,6 +587,10 @@
do {
 */
rc = SQLError(henv, conn, stmt, state, error, errormsg, 
sizeof(errormsg)-1, errormsgsize);
+   if (rc != SQL_SUCCESS  rc != SQL_SUCCESS_WITH_INFO) {
+   sprintf(state, HY000);
+   sprintf(errormsg, Failed to fetch error message);
+   }
if (conn_resource) {
memcpy(conn_resource-laststate, state, sizeof(state));
memcpy(conn_resource-lasterrormsg, errormsg, sizeof(errormsg));
@@ -1217,7 +1221,7 @@
 
if (rc != SQL_SUCCESS) {
/* ummm he did it */
-   odbc_sql_error(conn, NULL, SQLDataSources);
+   odbc_sql_error(conn, SQL_NULL_HSTMT, SQLDataSources);
RETURN_FALSE;
}
 

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2007-01-16 Thread Ilia Alshanetsky 
iliaa   Tue Jan 16 18:56:56 2007 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  
  MFB: Fixed output code inside odbc_result_all()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.198r2=1.199diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.198 php-src/ext/odbc/php_odbc.c:1.199
--- php-src/ext/odbc/php_odbc.c:1.198   Mon Jan  1 09:29:26 2007
+++ php-src/ext/odbc/php_odbc.c Tue Jan 16 18:56:55 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.198 2007/01/01 09:29:26 sebastian Exp $ */
+/* $Id: php_odbc.c,v 1.199 2007/01/16 18:56:55 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1977,12 +1977,12 @@
RETURN_FALSE;
}
if (rc == SQL_SUCCESS_WITH_INFO)
-   
php_printf(buf,result-longreadlen);
+   PHPWRITE(buf, 
result-longreadlen);
else if (result-values[i].vallen == 
SQL_NULL_DATA) {
php_printf(tdNULL/td);
break;
} else {
-   php_printf(buf, 
result-values[i].vallen);
+   PHPWRITE(buf, 
result-values[i].vallen);
}
php_printf(/td);
break;

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2006-12-28 Thread Antony Dovgal 
tony2001Thu Dec 28 14:26:30 2006 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  use strlcat()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.196r2=1.197diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.196 php-src/ext/odbc/php_odbc.c:1.197
--- php-src/ext/odbc/php_odbc.c:1.196   Wed Jun 14 05:51:16 2006
+++ php-src/ext/odbc/php_odbc.c Thu Dec 28 14:26:30 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.196 2006/06/14 05:51:16 dmitry Exp $ */
+/* $Id: php_odbc.c,v 1.197 2006/12/28 14:26:30 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2083,23 +2083,23 @@
 if (strstr(db, pwd) || strstr(db, PWD)) {
 pwd = NULL;
 }
-strncpy( lpszConnStr, db, CONNSTRSIZE);
+strlcpy( lpszConnStr, db, CONNSTRSIZE);
 }
 else {
 strcpy(lpszConnStr, DSN=);
-strcat(lpszConnStr, db);
+strlcat(lpszConnStr, db, CONNSTRSIZE);
 }
 if (uid) {
 if (uid[0]) {
-strcat(lpszConnStr, ;UID=);
-strcat(lpszConnStr, uid);
-strcat(lpszConnStr, ;);
+strlcat(lpszConnStr, ;UID=, CONNSTRSIZE);
+strlcat(lpszConnStr, uid, CONNSTRSIZE);
+strlcat(lpszConnStr, ;, CONNSTRSIZE);
 }
 if (pwd) {
 if (pwd[0]) {
-strcat(lpszConnStr, PWD=);
-strcat(lpszConnStr, pwd);
-strcat(lpszConnStr, ;);
+strlcat(lpszConnStr, PWD=, 
CONNSTRSIZE);
+strlcat(lpszConnStr, pwd, CONNSTRSIZE);
+strlcat(lpszConnStr, ;, CONNSTRSIZE);
 }
 }
 }

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c php_odbc_includes.h

2006-06-13 Thread Dmitry Stogov 
dmitry  Wed Jun 14 05:51:16 2006 UTC

  Modified files:  
/php-src/ext/odbc   php_odbc.c php_odbc_includes.h 
  Log:
  Fixed compilation (automatic module globals management).
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/odbc/php_odbc.c?r1=1.195r2=1.196diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.195 php-src/ext/odbc/php_odbc.c:1.196
--- php-src/ext/odbc/php_odbc.c:1.195   Tue Jun 13 13:12:19 2006
+++ php-src/ext/odbc/php_odbc.c Wed Jun 14 05:51:16 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.195 2006/06/13 13:12:19 dmitry Exp $ */
+/* $Id: php_odbc.c,v 1.196 2006/06/14 05:51:16 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -384,23 +384,23 @@
  */
 PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN(odbc.allow_persistent, 1, PHP_INI_SYSTEM, 
OnUpdateLong,
-   allow_persistent, php_odbc_globals, odbc_globals)
+   allow_persistent, zend_odbc_globals, odbc_globals)
STD_PHP_INI_ENTRY_EX(odbc.max_persistent,  -1, PHP_INI_SYSTEM, 
OnUpdateLong,
-   max_persistent, php_odbc_globals, odbc_globals, 
display_link_nums)
+   max_persistent, zend_odbc_globals, odbc_globals, 
display_link_nums)
STD_PHP_INI_ENTRY_EX(odbc.max_links, -1, PHP_INI_SYSTEM, 
OnUpdateLong,
-   max_links, php_odbc_globals, odbc_globals, 
display_link_nums)
+   max_links, zend_odbc_globals, odbc_globals, 
display_link_nums)
STD_PHP_INI_ENTRY(odbc.default_db, NULL, PHP_INI_ALL, OnUpdateString,
-   defDB, php_odbc_globals, odbc_globals)
+   defDB, zend_odbc_globals, odbc_globals)
STD_PHP_INI_ENTRY(odbc.default_user, NULL, PHP_INI_ALL, 
OnUpdateString,
-   defUser, php_odbc_globals, odbc_globals)
+   defUser, zend_odbc_globals, odbc_globals)
STD_PHP_INI_ENTRY_EX(odbc.default_pw, NULL, PHP_INI_ALL, 
OnUpdateString,
-   defPW, php_odbc_globals, odbc_globals, display_defPW)
+   defPW, zend_odbc_globals, odbc_globals, display_defPW)
STD_PHP_INI_ENTRY_EX(odbc.defaultlrl, 4096, PHP_INI_ALL, 
OnUpdateLong,
-   defaultlrl, php_odbc_globals, odbc_globals, display_lrl)
+   defaultlrl, zend_odbc_globals, odbc_globals, 
display_lrl)
STD_PHP_INI_ENTRY_EX(odbc.defaultbinmode, 1, PHP_INI_ALL, 
OnUpdateLong,
-   defaultbinmode, php_odbc_globals, odbc_globals, 
display_binmode)
+   defaultbinmode, zend_odbc_globals, odbc_globals, 
display_binmode)
STD_PHP_INI_BOOLEAN(odbc.check_persistent, 1, PHP_INI_SYSTEM, 
OnUpdateLong,
-   check_persistent, php_odbc_globals, odbc_globals)
+   check_persistent, zend_odbc_globals, odbc_globals)
 PHP_INI_END()
 /* }}} */
 
http://cvs.php.net/viewcvs.cgi/php-src/ext/odbc/php_odbc_includes.h?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/odbc/php_odbc_includes.h
diff -u php-src/ext/odbc/php_odbc_includes.h:1.13 
php-src/ext/odbc/php_odbc_includes.h:1.14
--- php-src/ext/odbc/php_odbc_includes.h:1.13   Sun Jan  1 13:09:52 2006
+++ php-src/ext/odbc/php_odbc_includes.hWed Jun 14 05:51:16 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: php_odbc_includes.h,v 1.13 2006/01/01 13:09:52 sniper Exp $ */
+/* $Id: php_odbc_includes.h,v 1.14 2006/06/14 05:51:16 dmitry Exp $ */
 
 #ifndef PHP_ODBC_INCLUDES_H
 #define PHP_ODBC_INCLUDES_H
@@ -249,7 +249,7 @@
odbc_connection *conn_ptr;
 } odbc_result;
 
-typedef struct {
+ZEND_BEGIN_MODULE_GLOBALS(odbc)
char *defDB;
char *defUser;
char *defPW;
@@ -266,7 +266,7 @@
 char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
HashTable *resource_list;
HashTable *resource_plist;
-} php_odbc_globals;
+ZEND_END_MODULE_GLOBALS(odbc)
 
 int odbc_add_result(HashTable *list, odbc_result *result);
 odbc_result *odbc_get_result(HashTable *list, int count);
@@ -284,7 +284,7 @@
 #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == 
SQL_LONGVARBINARY)
 
 #ifdef ZTS
-# define ODBCG(v) TSRMG(odbc_globals_id, php_odbc_globals *, v)
+# define ODBCG(v) TSRMG(odbc_globals_id, zend_odbc_globals *, v)
 #else
 # define ODBCG(v) (odbc_globals.v)
 extern ZEND_API php_odbc_globals odbc_globals;

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2005-12-05 Thread Jani Taskinen 
sniper  Mon Dec  5 20:00:16 2005 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  nuke php3 legacy
  http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.191r2=1.192ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.191 php-src/ext/odbc/php_odbc.c:1.192
--- php-src/ext/odbc/php_odbc.c:1.191   Mon Dec  5 18:31:06 2005
+++ php-src/ext/odbc/php_odbc.c Mon Dec  5 20:00:13 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.191 2005/12/05 23:31:06 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.192 2005/12/06 01:00:13 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -68,7 +68,7 @@
 
 /* {{{ odbc_functions[]
  */
-function_entry odbc_functions[] = {
+zend_function_entry odbc_functions[] = {
PHP_FE(odbc_autocommit, NULL)
PHP_FE(odbc_binmode, NULL)
PHP_FE(odbc_close, NULL)
@@ -616,7 +616,7 @@
 void php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
odbc_result *result;
-   pval **pv_res, **pv_flag;
+   zval **pv_res, **pv_flag;
 
if (zend_get_parameters_ex(2, pv_res, pv_flag) == FAILURE)
WRONG_PARAM_COUNT;
@@ -697,7 +697,7 @@
 {
odbc_connection *conn;
RETCODE rc;
-   pval **pv_conn;
+   zval **pv_conn;

if (zend_get_parameters_ex(1, pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -741,7 +741,7 @@
 #else
SQLINTEGER len;
 #endif
-   pval **pv_res, **pv_num;
+   zval **pv_res, **pv_num;
 
if (zend_get_parameters_ex(2, pv_res, pv_num) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -838,7 +838,7 @@
Prepares a statement for execution */
 PHP_FUNCTION(odbc_prepare)
 {
-   pval **pv_conn, **pv_query;
+   zval **pv_conn, **pv_query;
char *query;
odbc_result *result = NULL;
odbc_connection *conn;
@@ -934,7 +934,7 @@
Execute a prepared statement */
 PHP_FUNCTION(odbc_execute)
 { 
-   pval **pv_res, **pv_param_arr, **tmp;
+   zval **pv_res, **pv_param_arr, **tmp;
typedef struct params_t {
SDWORD vallen;
int fp;
@@ -1134,7 +1134,7 @@
Get cursor name */
 PHP_FUNCTION(odbc_cursor)
 {
-   pval **pv_res;
+   zval **pv_res;
SWORD len, max_len;
char *cursorname;
odbc_result *result;
@@ -1254,7 +1254,7 @@
 /* XXX Use flags */
 PHP_FUNCTION(odbc_exec)
 {
-   pval **pv_conn, **pv_query, **pv_flags;
+   zval **pv_conn, **pv_query, **pv_flags;
int numArgs;
char *query;
odbc_result *result = NULL;
@@ -1363,7 +1363,7 @@
UDWORD crow;
UWORD  RowStatus[1];
SDWORD rownum = -1;
-   pval **pv_res, **pv_row, *tmp;
+   zval **pv_res, **pv_row, *tmp;
 
switch(ZEND_NUM_ARGS()) {
case 1:
@@ -1383,7 +1383,7 @@
}
 
 #else
-   pval **pv_res, *tmp;
+   zval **pv_res, *tmp;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, pv_res) == 
FAILURE) {
WRONG_PARAM_COUNT;
@@ -1472,14 +1472,14 @@
}
 
if (result_type  ODBC_NUM) {
-   zend_hash_index_update(Z_ARRVAL_P(return_value), i, 
tmp, sizeof(pval *), NULL);
+   zend_hash_index_update(Z_ARRVAL_P(return_value), i, 
tmp, sizeof(zval *), NULL);
} else {
if (!*(result-values[i].name)) {
zend_hash_update(Z_ARRVAL_P(return_value), 
Z_STRVAL_P(tmp),
-   Z_STRLEN_P(tmp)+1, tmp, sizeof(pval 
*), NULL);
+   Z_STRLEN_P(tmp)+1, tmp, sizeof(zval 
*), NULL);
} else {
zend_hash_update(Z_ARRVAL_P(return_value), 
result-values[i].name, 
-   strlen(result-values[i].name)+1, tmp, 
sizeof(pval *), NULL);
+   strlen(result-values[i].name)+1, tmp, 
sizeof(zval *), NULL);
}
}
}
@@ -1517,9 +1517,9 @@
RETCODE rc;
SWORD sql_c_type;
char *buf = NULL;
-   pval **pv_res, **pv_res_arr, *tmp;
+   zval **pv_res, **pv_res_arr, *tmp;
 #ifdef HAVE_SQL_EXTENDED_FETCH
-   pval **pv_row;
+   zval **pv_row;
UDWORD crow;
UWORD  RowStatus[1];
SDWORD rownum = -1;
@@ -1629,7 +1629,7 @@
Z_STRVAL_P(tmp) = 
estrndup(result-values[i].value,Z_STRLEN_P(tmp));
break;
}
-   zend_hash_index_update(Z_ARRVAL_PP(pv_res_arr), i, tmp, 
sizeof(pval *), NULL);
+   zend_hash_index_update(Z_ARRVAL_PP(pv_res_arr), i, tmp, 
sizeof(zval *), NULL);
}
if (buf) efree(buf);
RETURN_LONG(result-numcols);   
@@ -1643,7 +1643,7 @@
 {

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2005-09-08 Thread Dmitry Stogov 
dmitry  Thu Sep  8 02:18:51 2005 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Fixed crash on AIX
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.189r2=1.190ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189 php-src/ext/odbc/php_odbc.c:1.190
--- php-src/ext/odbc/php_odbc.c:1.189   Fri Aug  5 18:37:48 2005
+++ php-src/ext/odbc/php_odbc.c Thu Sep  8 02:18:47 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.189 2005/08/05 22:37:48 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.190 2005/09/08 06:18:47 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -508,6 +508,12 @@
REGISTER_LONG_CONSTANT(SQL_QUICK, SQL_QUICK, CONST_PERSISTENT | 
CONST_CS);
 #endif
 
+#if defined(HAVE_IBMDB2)  defined(_AIX)
+   /* atexit() handler in the DB2/AIX library segfaults in PHP CLI */
+   /* DB2NOEXITLIST env variable prevents DB2 from invoking atexit() */
+   putenv(DB2NOEXITLIST=TRUE);
+#endif
+
return SUCCESS;
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2005-08-05 Thread Jani Taskinen 
sniper  Fri Aug  5 18:37:50 2005 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  No HTML output if html_errors is off (bug #34006)
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.188r2=1.189ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.188 php-src/ext/odbc/php_odbc.c:1.189
--- php-src/ext/odbc/php_odbc.c:1.188   Wed Aug  3 10:07:34 2005
+++ php-src/ext/odbc/php_odbc.c Fri Aug  5 18:37:48 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.188 2005/08/03 14:07:34 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.189 2005/08/05 22:37:48 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -314,7 +314,11 @@
PUTS();
 #endif
} else {
-   PUTS(ino value/i);
+   if (PG(html_errors)) {
+   PUTS(ino value/i);
+   } else {
+   PUTS(no value);
+   }
}
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2005-07-02 Thread Edin Kadribasic 
edink   Sat Jul  2 18:48:09 2005 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Don't crash on exit by destroying the same hash twice
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.186r2=1.187ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.186 php-src/ext/odbc/php_odbc.c:1.187
--- php-src/ext/odbc/php_odbc.c:1.186   Thu Jun  2 11:40:45 2005
+++ php-src/ext/odbc/php_odbc.c Sat Jul  2 18:48:06 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.186 2005/06/02 15:40:45 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.187 2005/07/02 22:48:06 edink Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -246,7 +246,7 @@
odbc_result *res;
odbc_connection *conn = (odbc_connection *)rsrc-ptr;
 
-   nument = zend_hash_next_free_element(EG(regular_list));
+   nument = zend_hash_next_free_element(EG(persistent_list));
for(i = 1; i  nument; i++) {
ptr = zend_list_find(i, type);
if (ptr  (type == le_result)) {

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2005-06-02 Thread Antony Dovgal 
tony2001Thu Jun  2 11:40:47 2005 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  fix bug #33214 (odbc_next_result does not signal SQL errors with 2-statement 
SQL batches). 
  Path by rich at kastle dot com.
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.185r2=1.186ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.185 php-src/ext/odbc/php_odbc.c:1.186
--- php-src/ext/odbc/php_odbc.c:1.185   Tue Jan 18 10:03:51 2005
+++ php-src/ext/odbc/php_odbc.c Thu Jun  2 11:40:45 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.185 2005/01/18 15:03:51 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.186 2005/06/02 15:40:45 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2479,8 +2479,10 @@
result-values = NULL;
}
RETURN_TRUE;
-   }
-   else {
+   } else if (rc == SQL_NO_DATA_FOUND) {
+   RETURN_FALSE;
+   } else {
+   odbc_sql_error(result-conn_ptr, result-stmt, 
SQLMoreResults);
RETURN_FALSE;
}
 }

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2005-01-17 Thread Antony Dovgal 
tony2001Mon Jan 17 10:05:13 2005 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  fix leak appearing when odbc_errormsg() got invalid resource 
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.182r2=1.183ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.182 php-src/ext/odbc/php_odbc.c:1.183
--- php-src/ext/odbc/php_odbc.c:1.182   Wed Jan 12 21:06:39 2005
+++ php-src/ext/odbc/php_odbc.c Mon Jan 17 10:05:11 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.182 2005/01/13 02:06:39 wez Exp $ */
+/* $Id: php_odbc.c,v 1.183 2005/01/17 15:05:11 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2712,15 +2712,17 @@
} else { /* last error message */
len = SQL_MAX_MESSAGE_LENGTH;
}
-   ptr = ecalloc(len + 1, 1);
+
if (argc == 1) {
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_handle, -1, 
ODBC-Link, le_conn, le_pconn);
+   ptr = ecalloc(len + 1, 1);
if (mode == 0) {
strlcpy(ptr, conn-laststate, len+1);
} else {
strlcpy(ptr, conn-lasterrormsg, len+1);
}
} else {
+   ptr = ecalloc(len + 1, 1);
if (mode == 0) {
strlcpy(ptr, ODBCG(laststate), len+1);
} else {

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2005-01-17 Thread Antony Dovgal 
tony2001Mon Jan 17 13:08:55 2005 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  fix weird DB2 issue:
  DB2's SQLDataSources() returns _max available_ length of result string 
instead of
  _real_ length and that results in strings a-la \0  
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.183r2=1.184ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.183 php-src/ext/odbc/php_odbc.c:1.184
--- php-src/ext/odbc/php_odbc.c:1.183   Mon Jan 17 10:05:11 2005
+++ php-src/ext/odbc/php_odbc.c Mon Jan 17 13:08:54 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.183 2005/01/17 15:05:11 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.184 2005/01/17 18:08:54 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1232,8 +1232,8 @@
 
array_init(return_value);
 
-   add_assoc_stringl_ex(return_value, server, sizeof(server), 
server_name, len1, 1);
-   add_assoc_stringl_ex(return_value, description, 
sizeof(description), desc, len2, 1);
+   add_assoc_string_ex(return_value, server, sizeof(server), 
server_name, 1);
+   add_assoc_string_ex(return_value, description, sizeof(description), 
desc, 1);
 
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2004-08-13 Thread Dan Kalowsky 
kalowskyFri Aug 13 15:33:25 2004 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Checking in a patch by Dave Lawson ([EMAIL PROTECTED]) to correct 
  some of the behavior found in the odbc_fetch_*() functions.  This patch 
  NEEDS to be tested on MS Access before a release is done with it.  This 
  submission is to get it into the daily builds for testing.  
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.180r2=1.181ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.180 php-src/ext/odbc/php_odbc.c:1.181
--- php-src/ext/odbc/php_odbc.c:1.180   Mon Jul 19 03:19:41 2004
+++ php-src/ext/odbc/php_odbc.c Fri Aug 13 15:33:24 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.180 2004/07/19 07:19:41 andi Exp $ */
+/* $Id: php_odbc.c,v 1.181 2004/08/13 19:33:24 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -846,7 +846,7 @@
convert_to_string_ex(pv_query);
query = Z_STRVAL_PP(pv_query);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

result-numparams = 0;

@@ -1269,7 +1269,7 @@
convert_to_string_ex(pv_query);
query = Z_STRVAL_PP(pv_query);

-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
 
rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -2797,7 +2797,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -2881,7 +2881,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -2961,7 +2961,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3038,7 +3038,7 @@
fschema = Z_STRVAL_PP(pv_fschema);
convert_to_string_ex(pv_ftable);
ftable = Z_STRVAL_PP(pv_ftable);
-#if defined(HAVE_DBMAKER) || defined (HAVE_IBMDB2)
+#if defined(HAVE_DBMAKER) || defined(HAVE_IBMDB2)
 #define EMPTY_TO_NULL(xstr) \
if ((int)strlen((xstr)) == 0) (xstr) = NULL
 
@@ -3055,7 +3055,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3130,7 +3130,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3198,7 +3198,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3276,7 +3276,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3354,7 +3354,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+   result = (odbc_result *)ecalloc(1, sizeof(odbc_result));

rc = SQLAllocStmt(conn-hdbc, (result-stmt));
if (rc == SQL_INVALID_HANDLE) {
@@ -3436,7 +3436,7 @@
 
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, ODBC-Link, 
le_conn, le_pconn);
 
-   result = (odbc_result *)emalloc(sizeof(odbc_result));
+

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2004-07-15 Thread Dan Kalowsky 
kalowskyThu Jul 15 11:09:12 2004 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Bug 29058 (patch submitted by bug reporter)
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.178r2=1.179ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.178 php-src/ext/odbc/php_odbc.c:1.179
--- php-src/ext/odbc/php_odbc.c:1.178   Thu Jun 17 20:44:35 2004
+++ php-src/ext/odbc/php_odbc.c Thu Jul 15 11:09:12 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.178 2004/06/18 00:44:35 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.179 2004/07/15 15:09:12 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -3038,7 +3038,7 @@
fschema = Z_STRVAL_PP(pv_fschema);
convert_to_string_ex(pv_ftable);
ftable = Z_STRVAL_PP(pv_ftable);
-#ifdef HAVE_DBMAKER
+#if defined(HAVE_DBMAKER) || defined (HAVE_IBMDB2)
 #define EMPTY_TO_NULL(xstr) \
if ((int)strlen((xstr)) == 0) (xstr) = NULL
 

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2004-06-17 Thread Ilia Alshanetsky 
iliaa   Thu Jun 17 20:44:35 2004 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Fixed possible memory leak.
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.177r2=1.178ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.177 php-src/ext/odbc/php_odbc.c:1.178
--- php-src/ext/odbc/php_odbc.c:1.177   Thu Jan  8 03:16:37 2004
+++ php-src/ext/odbc/php_odbc.c Thu Jun 17 20:44:35 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.177 2004/01/08 08:16:37 andi Exp $ */
+/* $Id: php_odbc.c,v 1.178 2004/06/18 00:44:35 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1009,11 +1009,15 @@
 
/* Check for safe mode. */
if (PG(safe_mode)  (!php_checkuid(filename, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
-   RETURN_FALSE;
-   }
+   efree(filename);
+   efree(params);
+   RETURN_FALSE;
+   }
 
/* Check the basedir */
if (php_check_open_basedir(filename TSRMLS_CC)) {
+   efree(filename);
+   efree(params);
RETURN_FALSE;
}
 

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c /ext/snmp snmp.c /sapi/cgi cgi_main.c

2003-10-16 Thread Ilia Alshanetsky 
iliaa   Thu Oct 16 22:21:28 2003 EDT

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
/php-src/ext/odbc   php_odbc.c 
/php-src/ext/snmp   snmp.c 
  Log:
  Fixed formatting issues (patch by: Joe Orton)
  
  
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.241 php-src/sapi/cgi/cgi_main.c:1.242
--- php-src/sapi/cgi/cgi_main.c:1.241   Wed Sep  3 04:15:09 2003
+++ php-src/sapi/cgi/cgi_main.c Thu Oct 16 22:21:26 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.241 2003/09/03 08:15:09 sas Exp $ */
+/* $Id: cgi_main.c,v 1.242 2003/10/17 02:21:26 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -923,7 +923,7 @@
char *script_file=NULL;
zend_llist global_vars;
 #if FORCE_CGI_REDIRECT
-   int force_redirect = 1;
+   long force_redirect = 1;
char *redirect_status_env = NULL;
 #endif
 
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.175 php-src/ext/odbc/php_odbc.c:1.176
--- php-src/ext/odbc/php_odbc.c:1.175   Sun Aug 31 08:41:41 2003
+++ php-src/ext/odbc/php_odbc.c Thu Oct 16 22:21:26 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.175 2003/08/31 12:41:41 zeev Exp $ */
+/* $Id: php_odbc.c,v 1.176 2003/10/17 02:21:26 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2225,12 +2225,12 @@
list_entry new_le;

if (ODBCG(max_links) != -1  ODBCG(num_links) = 
ODBCG(max_links)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Too many 
open links (%d), ODBCG(num_links));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Too many 
open links (%ld), ODBCG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
if (ODBCG(max_persistent) != -1  ODBCG(num_persistent) = 
ODBCG(max_persistent)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many 
open persistent links (%d), ODBCG(num_persistent));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many 
open persistent links (%ld), ODBCG(num_persistent));
efree(hashed_details);
RETURN_FALSE;
}
@@ -2309,7 +2309,7 @@
}
}
if (ODBCG(max_links) != -1  ODBCG(num_links) = ODBCG(max_links)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many open 
connections (%d),ODBCG(num_links));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many open 
connections (%ld),ODBCG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.87 php-src/ext/snmp/snmp.c:1.88
--- php-src/ext/snmp/snmp.c:1.87Tue Sep 23 14:26:02 2003
+++ php-src/ext/snmp/snmp.c Thu Oct 16 22:21:27 2003
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: snmp.c,v 1.87 2003/09/23 18:26:02 iliaa Exp $ */
+/* $Id: snmp.c,v 1.88 2003/10/17 02:21:27 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -277,13 +277,13 @@
/* ASN_UNSIGNED is the same as ASN_GAUGE */
case ASN_TIMETICKS: /* 0x43, snmp_impl.h */
case ASN_UINTEGER:  /* 0x47, snmp_impl.h */
-   snprintf(buf, sizeof(buf)-1, %u, *vars-val.integer);
+   snprintf(buf, sizeof(buf)-1, %lu, *vars-val.integer);
buf[sizeof(buf)-1]=0;
ZVAL_STRING(val, buf, 1);
break;
 
case ASN_INTEGER:   /* 0x02, asn1.h */
-   snprintf(buf, sizeof(buf)-1, %d, *vars-val.integer);
+   snprintf(buf, sizeof(buf)-1, %ld, *vars-val.integer);
buf[sizeof(buf)-1]=0;
ZVAL_STRING(val, buf, 1);
break;
@@ -920,7 +920,7 @@
/* Setting the security level. */
convert_to_string_ex(a3);
if (netsnmp_session_set_sec_level(session, Z_STRVAL_PP(a3) TSRMLS_CC)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid security level: 
%s, a3);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid security level: 
%s, Z_STRVAL_PP(a3));
RETURN_FALSE;
}
 

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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c php_odbc_includes.h

2003-08-28 Thread Jani Taskinen 
sniper  Thu Aug 28 12:35:33 2003 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c php_odbc_includes.h 
  Log:
  Revert the patch per Dan\´s request
  
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.173 php-src/ext/odbc/php_odbc.c:1.174
--- php-src/ext/odbc/php_odbc.c:1.173   Thu Aug 28 05:55:11 2003
+++ php-src/ext/odbc/php_odbc.c Thu Aug 28 12:35:32 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.173 2003/08/28 09:55:11 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.174 2003/08/28 16:35:32 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -460,7 +460,6 @@
REGISTER_LONG_CONSTANT(SQL_CHAR, SQL_CHAR, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(SQL_VARCHAR, SQL_VARCHAR, CONST_PERSISTENT | 
CONST_CS);
REGISTER_LONG_CONSTANT(SQL_LONGVARCHAR, SQL_LONGVARCHAR, CONST_PERSISTENT | 
CONST_CS);
-   REGISTER_LONG_CONSTANT(SQL_BLOB, SQL_LONGVARBINARY, CONST_PERSISTENT | 
CONST_CS);
REGISTER_LONG_CONSTANT(SQL_DECIMAL, SQL_DECIMAL, CONST_PERSISTENT | 
CONST_CS);
REGISTER_LONG_CONSTANT(SQL_NUMERIC, SQL_NUMERIC, CONST_PERSISTENT | 
CONST_CS);
REGISTER_LONG_CONSTANT(SQL_BIT, SQL_BIT, CONST_PERSISTENT | CONST_CS);
@@ -654,7 +653,6 @@
case SQL_BINARY:
case SQL_VARBINARY:
case SQL_LONGVARBINARY:
-   case SQL_BLOB:
case SQL_LONGVARCHAR:
result-values[i].value = NULL;
break;
@@ -669,7 +667,7 @@
default:
rc = SQLColAttributes(result-stmt, (UWORD)(i+1), 
SQL_COLUMN_DISPLAY_SIZE,
NULL, 0, NULL, 
displaysize);
-   displaysize = displaysize = result-longreadlen ? 
displaysize :
+   displaysize = displaysize = result-longreadlen ? 
displaysize : 
result-longreadlen;
result-values[i].value = (char *)emalloc(displaysize 
+ 1);
rc = SQLBindCol(result-stmt, (UWORD)(i+1), 
SQL_C_CHAR, result-values[i].value,
@@ -1419,19 +1417,7 @@
Z_STRVAL_P(tmp) = empty_string;
break;
}
-
-   if (result-binmode == 1) {
-   sql_c_type = SQL_C_BINARY;
-   }
-   case SQL_BLOB:
-   if (result-binmode = 0) {
-   Z_STRVAL_P(tmp) = empty_string;
-   break;
-   }
-
-   if (result-binmode == 1) {
-   sql_c_type = SQL_C_BINARY;
-   }
+   if (result-binmode == 1) sql_c_type = SQL_C_BINARY;
case SQL_LONGVARCHAR:
if (IS_SQL_LONG(result-values[i].coltype)  
result-longreadlen = 0) {
Z_STRVAL_P(tmp) = empty_string;
@@ -1590,19 +1576,7 @@
Z_STRVAL_P(tmp) = empty_string;
break;
}
-
-   if (result-binmode == 1) {
-   sql_c_type = SQL_C_BINARY; 
-   }
-   case SQL_BLOB:
-   if (result-binmode = 0) {
-   Z_STRVAL_P(tmp) = empty_string;
-   break;
-   }
-
-   if (result-binmode == 1) {
-   sql_c_type = SQL_C_BINARY;
-   }
+   if (result-binmode == 1) sql_c_type = SQL_C_BINARY; 
case SQL_LONGVARCHAR:
if (IS_SQL_LONG(result-values[i].coltype)  
result-longreadlen = 0) {
Z_STRVAL_P(tmp) = empty_string;
@@ -1820,15 +1794,8 @@
case SQL_BINARY:
case SQL_VARBINARY:
case SQL_LONGVARBINARY:
-   if (result-binmode = 1) 
-   sql_c_type = SQL_C_BINARY;
-   if (result-binmode = 0) 
-   break; 
-   case SQL_BLOB:
-   if (result-binmode = 1) 
-   sql_c_type = SQL_C_BINARY;
-

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2003-08-14 Thread Jani Taskinen 
sniper  Sun Aug 10 22:03:40 2003 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Fix compile warning
  
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.168 php-src/ext/odbc/php_odbc.c:1.169
--- php-src/ext/odbc/php_odbc.c:1.168   Sun Aug  3 13:44:37 2003
+++ php-src/ext/odbc/php_odbc.c Sun Aug 10 22:03:40 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.168 2003/08/03 17:44:37 zeev Exp $ */
+/* $Id: php_odbc.c,v 1.169 2003/08/11 02:03:40 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1230,7 +1230,7 @@
 
 }
 /* }}} */
-#endif /* HAVE_SQLDATASOURCES *
+#endif /* HAVE_SQLDATASOURCES */
 
 /* {{{ proto resource odbc_exec(resource connection_id, string query [, int flags])
Prepare and execute an SQL statement */



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

[PHP-CVS] cvs: php-src /ext/odbc php_odbc.c

2003-07-11 Thread Dan Kalowsky 
kalowskyFri Jul 11 09:13:32 2003 EDT

  Modified files:  
/php-src/ext/odbc   php_odbc.c 
  Log:
  Fix for bug #22897
  
  
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.166 php-src/ext/odbc/php_odbc.c:1.167
--- php-src/ext/odbc/php_odbc.c:1.166   Mon Jun 16 12:36:41 2003
+++ php-src/ext/odbc/php_odbc.c Fri Jul 11 09:13:32 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.166 2003/06/16 16:36:41 andrey Exp $ */
+/* $Id: php_odbc.c,v 1.167 2003/07/11 13:13:32 kalowsky Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2065,7 +2065,7 @@
 #endif
 #ifdef HAVE_OPENLINK
{
-   char dsnbuf[300];
+   char dsnbuf[1024];
short dsnbuflen;
 
rc = SQLDriverConnect((*conn)-hdbc, NULL, db, SQL_NTS,
@@ -2107,8 +2107,8 @@
}
 
if (direct) {
-   rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb), 
dsnbuf, sizeof(dsnbuf),
-   dsnbuflen, 
SQL_DRIVER_NOPROMPT);
+   rc = SQLDriverConnect((*conn)-hdbc, NULL, ldb, strlen(ldb), 
dsnbuf, 
+ sizeof(dsnbuf) - 1, dsnbuflen, 
SQL_DRIVER_NOPROMPT);
} else {
rc = SQLConnect((*conn)-hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, 
SQL_NTS);
}



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