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

2007-08-10 Thread Jani Taskinen 
janiFri Aug 10 13:24:59 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/sybase php_sybase_db.c 
  Log:
  No dots in error messages!
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.6&r2=1.66.2.5.2.7&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.6 
php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.7
--- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.6 Fri Aug 10 00:43:50 2007
+++ php-src/ext/sybase/php_sybase_db.c  Fri Aug 10 13:24:59 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: php_sybase_db.c,v 1.66.2.5.2.6 2007/08/10 00:43:50 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.66.2.5.2.7 2007/08/10 13:24:59 jani Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -928,7 +928,7 @@
/* Check assumption that dbnextrow returns NO_MORE_ROWS */
retvalue = dbnextrow(sybase_ptr->link);
if (retvalue != NO_MORE_ROWS) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING,"Expected 
dbnextrow() to return NO_MORE_ROWS.");
+   php_error_docref(NULL TSRMLS_CC, E_WARNING,"Expected 
dbnextrow() to return NO_MORE_ROWS");
}
}
 }

-- 
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/sybase php_sybase_db.c

2007-03-16 Thread Stanislav Malyshev 
stasFri Mar 16 21:59:17 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/sybase php_sybase_db.c 
  Log:
  fix spprintf usage
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.4&r2=1.66.2.5.2.5&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.4 
php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.5
--- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.4 Tue Mar  6 02:03:27 2007
+++ php-src/ext/sybase/php_sybase_db.c  Fri Mar 16 21:59:17 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: php_sybase_db.c,v 1.66.2.5.2.4 2007/03/06 02:03:27 stas Exp $ */
+/* $Id: php_sybase_db.c,v 1.66.2.5.2.5 2007/03/16 21:59:17 stas Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -391,7 +391,7 @@
passwd = Z_STRVAL_PP(yypasswd);
charset = Z_STRVAL_PP(yycharset);
appname = Z_STRVAL_PP(yyappname);
-   hashed_details_length = 
spprintf(hashed_details, 0, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_PP(yyhost), 
Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset), 
Z_STRVAL_PP(yyappname));
+   hashed_details_length = 
spprintf(&hashed_details, 0, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_PP(yyhost), 
Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset), 
Z_STRVAL_PP(yyappname));
}
break;
default:

-- 
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/sybase php_sybase_db.c

2007-03-05 Thread Stanislav Malyshev 
stasTue Mar  6 02:03:27 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/sybase php_sybase_db.c 
  Log:
  use safe_erealloc
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.3&r2=1.66.2.5.2.4&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.3 
php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.4
--- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.3 Sat Feb 24 02:59:57 2007
+++ php-src/ext/sybase/php_sybase_db.c  Tue Mar  6 02:03:27 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: php_sybase_db.c,v 1.66.2.5.2.3 2007/02/24 02:59:57 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.66.2.5.2.4 2007/03/06 02:03:27 stas Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -839,7 +839,7 @@
while (retvalue!=FAIL && retvalue!=NO_MORE_ROWS) {
result->num_rows++;
if (result->num_rows > blocks_initialized*SYBASE_ROWS_BLOCK) {
-   result->data = (zval ***) 
erealloc(result->data,sizeof(zval **)*SYBASE_ROWS_BLOCK*(++blocks_initialized));
+   result->data = (zval ***) safe_erealloc(result->data, 
SYBASE_ROWS_BLOCK*(++blocks_initialized), sizeof(zval **), 0);
}
result->data[i] = (zval **) safe_emalloc(sizeof(zval *), 
num_fields, 0);
for (j=1; j<=num_fields; j++) {

-- 
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/sybase php_sybase_db.c

2007-02-23 Thread Ilia Alshanetsky 
iliaa   Sat Feb 24 02:59:58 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/sybase php_sybase_db.c 
  Log:
  
  Fixed a typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.2&r2=1.66.2.5.2.3&diff_format=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.2 
php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.3
--- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.2 Fri Feb 23 00:37:35 2007
+++ php-src/ext/sybase/php_sybase_db.c  Sat Feb 24 02:59:57 2007
@@ -20,7 +20,7 @@
+--+
  */
  
-/* $Id: php_sybase_db.c,v 1.66.2.5.2.2 2007/02/23 00:37:35 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.66.2.5.2.3 2007/02/24 02:59:57 iliaa Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -340,7 +340,7 @@
convert_to_string_ex(yyuser);
host = Z_STRVAL_PP(yyhost);
user = Z_STRVAL_PP(yyuser);
-   hashed_details_length = 
sprintf(&hashed_details, 0, "sybase_%s_%s___", Z_STRVAL_PP(yyhost), 
Z_STRVAL_PP(yyuser));
+   hashed_details_length = 
spprintf(&hashed_details, 0, "sybase_%s_%s___", Z_STRVAL_PP(yyhost), 
Z_STRVAL_PP(yyuser));
}
break;
case 3: {

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