tony2001 Thu May 4 19:00:10 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/informix config.m4 ifx.ec
Log:
MFH: several minor fixes: nuke compile warnings etc.
http://cvs.php.net/viewcvs.cgi/php-src/ext/informix/config.m4?r1=1.34&r2=1.34.2.1&diff_format=u
Index: php-src/ext/informix/config.m4
diff -u php-src/ext/informix/config.m4:1.34
php-src/ext/informix/config.m4:1.34.2.1
--- php-src/ext/informix/config.m4:1.34 Fri Jul 29 19:41:00 2005
+++ php-src/ext/informix/config.m4 Thu May 4 19:00:10 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.34 2005/07/29 19:41:00 sniper Exp $
+dnl $Id: config.m4,v 1.34.2.1 2006/05/04 19:00:10 tony2001 Exp $
dnl
PHP_ARG_WITH(informix,for Informix support,
@@ -60,7 +60,7 @@
AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ])
- if test $IFX_VERSION -ge "900"; then
+ if test $IFX_VERSION -ge 900; then
AC_DEFINE(HAVE_IFX_IUS,1,[ ])
IFX_ESQL_FLAGS="$IFX_ESQL_FLAGS -EDHAVE_IFX_IUS"
else
http://cvs.php.net/viewcvs.cgi/php-src/ext/informix/ifx.ec?r1=1.109.2.5&r2=1.109.2.6&diff_format=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.109.2.5
php-src/ext/informix/ifx.ec:1.109.2.6
--- php-src/ext/informix/ifx.ec:1.109.2.5 Fri Jan 13 14:31:32 2006
+++ php-src/ext/informix/ifx.ec Thu May 4 19:00:10 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ifx.ec,v 1.109.2.5 2006/01/13 14:31:32 sas Exp $ */
+/* $Id: ifx.ec,v 1.109.2.6 2006/05/04 19:00:10 tony2001 Exp $ */
/* -------------------------------------------------------------------
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -96,14 +96,14 @@
static long php_intifx_free_char(long id, HashTable *list TSRMLS_DC);
static long php_intifx_update_char(long bid, char* param, long len, HashTable
*list TSRMLS_DC);
static long php_intifx_get_char(long bid, HashTable *list, char** content
TSRMLS_DC);
-#if HAVE_IFX_IUS
+$ifdef HAVE_IFX_IUS;
static long php_intifxus_create_slob(long create_mode, HashTable *list
TSRMLS_DC);
static long php_intifxus_free_slob(long bid, HashTable *list TSRMLS_DC);
static long php_intifxus_close_slob(long bid, HashTable *list TSRMLS_DC);
static long php_intifxus_open_slob(long bid, long create_mode, HashTable *list
TSRMLS_DC);
static long php_intifxus_new_slob(HashTable *list TSRMLS_DC);
static ifx_lo_t *php_intifxus_get_slobloc(long bid, HashTable *list TSRMLS_DC);
-#endif
+$endif;
/* 7.10 on (at least) AIX is missing this */
#ifndef CLIENT_SQLI_VER
@@ -534,12 +534,12 @@
zend_rsrc_list_entry new_le;
if (IFXG(max_links) != -1 && IFXG(num_links) >=
IFXG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Too many open links (%d)", IFXG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Too many open links (%ld)", IFXG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
if (IFXG(max_persistent) != -1 && IFXG(num_persistent)
>= IFXG(max_persistent)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Too many open persistent links (%d)", IFXG(num_persistent));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Too many open persistent links (%ld)", IFXG(num_persistent));
efree(hashed_details);
RETURN_FALSE;
}
@@ -643,7 +643,7 @@
}
}
if (IFXG(max_links) != -1 && IFXG(num_links) >=
IFXG(max_links)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open links (%d)", IFXG(num_links));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many
open links (%ld)", IFXG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
@@ -972,7 +972,7 @@
EXEC SQL DEALLOCATE
DESCRIPTOR :i_descrpid;
EXEC SQL free :statemid;
efree(Ifx_Result);
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "%d is not an Informix blob-result index",
(int)((*tmp)->value.lval));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "%ld is not an Informix blob-result index",
(int)((*tmp)->value.lval));
RETURN_FALSE;
}
if (locator->loc_loctype ==
LOCFNAME) {
@@ -1398,7 +1398,7 @@
EXEC SQL DEALLOCATE
DESCRIPTOR :i_descrpid;
EXEC SQL free :statemid;
efree(Ifx_Result);
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "%d is not a Informix blob-result index",
(int)((*tmp)->value.lval));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "%ld is not a Informix blob-result index",
(*tmp)->value.lval);
RETURN_FALSE;
}
if (locator->loc_loctype ==
LOCFNAME) {
@@ -1564,7 +1564,7 @@
PHP_IFX_CHECK_CONNECTION(ifx);
if (Ifx_Result->iscursory < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Resultindex %d is
not a prepared query", Z_LVAL_PP(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Resultindex %ld is
not a prepared query", Z_LVAL_PP(result));
RETURN_FALSE;
}
@@ -3049,7 +3049,7 @@
Ifx_res = (IFX_IDRES *) zend_list_find(id, &type);
if (type != le_idresult) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix id-result index", id);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix id-result index", id);
return -1;
}
return Ifx_res->type;
@@ -3331,7 +3331,7 @@
Ifx_blob_orig = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult || !(Ifx_blob_orig->type == TYPE_BLBYTE ||
Ifx_blob_orig->type == TYPE_BLTEXT)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix blob-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix blob-result index", bid);
return -1;
}
@@ -3425,12 +3425,12 @@
Ifx_blob = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult && !(Ifx_blob->type == TYPE_BLTEXT ||
Ifx_blob->type == TYPE_BLBYTE)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix blob-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix blob-result index", bid);
return -1;
}
if (!(Ifx_blob->type == TYPE_BLTEXT || Ifx_blob->type == TYPE_BLBYTE)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix BYTE or TEXT type", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix BYTE or TEXT type", bid);
return -1;
}
@@ -3488,7 +3488,7 @@
Ifx_blob = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult && !(Ifx_blob->type == TYPE_BLTEXT ||
Ifx_blob->type == TYPE_BLBYTE)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix blob-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix blob-result index", bid);
return -1;
}
@@ -3517,7 +3517,7 @@
Ifx_blob = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult && !(Ifx_blob->type == TYPE_BLTEXT ||
Ifx_blob->type == TYPE_BLBYTE)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix blob-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix blob-result index", bid);
return NULL;
}
return &(Ifx_blob->BLOB.blob_data);
@@ -3572,7 +3572,7 @@
Ifx_blob = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult && !(Ifx_blob->type == TYPE_BLTEXT ||
Ifx_blob->type == TYPE_BLBYTE)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix blob-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix blob-result index", bid);
return -1;
}
@@ -4019,7 +4019,7 @@
Ifx_char = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult && !(Ifx_char->type == TYPE_CHAR)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix char-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix char-result index", bid);
return -1;
}
@@ -4072,7 +4072,7 @@
Ifx_char = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult && !(Ifx_char->type == TYPE_CHAR)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix char-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix char-result index", bid);
return -1;
}
@@ -4132,7 +4132,7 @@
Ifx_char = (IFX_IDRES *) zend_list_find(bid, &type);
if (type != le_idresult && !(Ifx_char->type == TYPE_CHAR)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%d is not a
Informix char-result index", bid);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a
Informix char-result index", bid);
return -1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
