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

2008-10-06 Thread Felipe Pena 
felipe  Mon Oct  6 15:14:18 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/interbase  ibase_service.c 
  Log:
  - MFH: Fixed compiler warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_service.c?r1=1.11.2.2.2.6r2=1.11.2.2.2.7diff_format=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.11.2.2.2.6 
php-src/ext/interbase/ibase_service.c:1.11.2.2.2.7
--- php-src/ext/interbase/ibase_service.c:1.11.2.2.2.6  Mon Dec 31 07:20:07 2007
+++ php-src/ext/interbase/ibase_service.c   Mon Oct  6 15:14:17 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_service.c,v 1.11.2.2.2.6 2007/12/31 07:20:07 sebastian Exp $ */
+/* $Id: ibase_service.c,v 1.11.2.2.2.7 2008/10/06 15:14:17 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -229,8 +229,7 @@
user, isc_spb_password, (char)plen, pass, host);
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -451,8 +450,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len = 0) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -560,8 +558,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 



-- 
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/interbase ibase_service.c

2007-03-05 Thread Stanislav Malyshev 
stasTue Mar  6 00:24:01 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/interbase  ibase_service.c 
  Log:
  fix broken snprintf code
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_service.c?r1=1.11.2.2.2.4r2=1.11.2.2.2.5diff_format=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.11.2.2.2.4 
php-src/ext/interbase/ibase_service.c:1.11.2.2.2.5
--- php-src/ext/interbase/ibase_service.c:1.11.2.2.2.4  Tue Feb 27 03:04:40 2007
+++ php-src/ext/interbase/ibase_service.c   Tue Mar  6 00:24:00 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_service.c,v 1.11.2.2.2.4 2007/02/27 03:04:40 iliaa Exp $ */
+/* $Id: ibase_service.c,v 1.11.2.2.2.5 2007/03/06 00:24:00 stas Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -322,7 +322,7 @@
heap_p = heap_buf + res_size;
}
result += 2;
-   snprintf(heap_p, sizeof(heap_buf_size), %s\n, 
result);
+   snprintf(heap_p, heap_buf_size - (heap_buf - 
heap_p), %s\n, result);
heap_p += line_len +2;
goto query_loop; /* repeat until result is 
exhausted */
 


-- 
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/interbase ibase_service.c

2007-01-22 Thread Antony Dovgal 
tony2001Mon Jan 22 09:05:27 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/interbase  ibase_service.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_service.c?r1=1.11.2.2.2.1r2=1.11.2.2.2.2diff_format=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.11.2.2.2.1 
php-src/ext/interbase/ibase_service.c:1.11.2.2.2.2
--- php-src/ext/interbase/ibase_service.c:1.11.2.2.2.1  Mon Jan  1 09:36:02 2007
+++ php-src/ext/interbase/ibase_service.c   Mon Jan 22 09:05:27 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_service.c,v 1.11.2.2.2.1 2007/01/01 09:36:02 sebastian Exp $ */
+/* $Id: ibase_service.c,v 1.11.2.2.2.2 2007/01/22 09:05:27 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -425,7 +425,8 @@
 */
zval *res;
char *db, *bk, buf[200];
-   long dblen, bklen, spb_len, opts = 0;
+   int dblen, bklen, spb_len;
+   long opts = 0;
zend_bool verbose = 0;
ibase_service *svm;
 
@@ -489,7 +490,8 @@
 {
zval *res;
char buf[128], *db;
-   long action, spb_len, dblen, argument = 0;
+   int dblen, spb_len;
+   long action, argument = 0;
ibase_service *svm;
 
RESET_ERRMSG;

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