[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mssql php_mssql.c

2008-12-11 Thread Pierre-Alain Joye 
pajoye  Thu Dec 11 15:30:18 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mssql  php_mssql.c 
  Log:
  - fix build (all platforms)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.9&r2=1.152.2.13.2.10&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.9 
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.10
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.9Wed Dec 10 20:54:47 2008
+++ php-src/ext/mssql/php_mssql.c   Thu Dec 11 15:30:18 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.152.2.13.2.9 2008/12/10 20:54:47 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.10 2008/12/11 15:30:18 pajoye Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -885,6 +885,7 @@
res_buf[res_length] = '\0';
ZVAL_STRINGL(result, res_buf, res_length, 0);
}
+   }
break;
case SQLNUMERIC:
default: {
@@ -937,7 +938,7 @@
}
 }
 
-static void php_mssql_get_column_content_without_type(mssql_link 
*mssql_ptr,int offset,zval *result, int column_type TSRMLS_DC)
+static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr, 
int offset,zval *result, int column_type TSRMLS_DC)
 {
if (dbdatlen(mssql_ptr->link,offset) == 0) {
ZVAL_NULL(result);



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mssql php_mssql.c

2007-02-04 Thread Frank M. Kromann 
fmk Sun Feb  4 21:19:38 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mssql  php_mssql.c 
  Log:
  #39213
  Fix for '' returned as ' '.
  This only works with FreeTDS as microsofts library returns a length of 1 for 
an empty string!
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.2&r2=1.152.2.13.2.3&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.2 
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.3
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.2Mon Jan  1 09:36:03 2007
+++ php-src/ext/mssql/php_mssql.c   Sun Feb  4 21:19:37 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.152.2.13.2.2 2007/01/01 09:36:03 sebastian Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.3 2007/02/04 21:19:37 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -821,7 +821,7 @@
 
 static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int 
offset,zval *result, int column_type  TSRMLS_DC)
 {
-   if (dbdatlen(mssql_ptr->link,offset) == 0) {
+   if (dbdata(mssql_ptr->link,offset) == NULL && 
dbdatlen(mssql_ptr->link,offset) == 0) {
ZVAL_NULL(result);
return;
}

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