summaryrefslogtreecommitdiff
path: root/ext/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'ext/rpc')
-rw-r--r--ext/rpc/com/com.c18
-rw-r--r--ext/rpc/com/com_wrapper.c2
-rw-r--r--ext/rpc/com/conversion.c26
-rw-r--r--ext/rpc/com/variant.c4
-rw-r--r--ext/rpc/dotnet/dotnet.cpp4
-rw-r--r--ext/rpc/java/java.c18
6 files changed, 35 insertions, 37 deletions
diff --git a/ext/rpc/com/com.c b/ext/rpc/com/com.c
index ae678909c2..dc5d41af32 100644
--- a/ext/rpc/com/com.c
+++ b/ext/rpc/com/com.c
@@ -503,7 +503,7 @@ static int com_call(rpc_string method_name, void **data, zval *return_value, int
char *error_message;
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Unable to lookup %s: %s", method_name.str, error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unable to lookup %s: %s", method_name.str, error_message);
LocalFree(error_message);
efree(funcname);
@@ -544,10 +544,10 @@ static int com_call(rpc_string method_name, void **data, zval *return_value, int
efree(result);
error_message = php_COM_error_message(hr);
if (ErrString) {
- php_error(E_WARNING,"Invoke() failed: %s %s", error_message, ErrString);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Invoke() failed: %s %s", error_message, ErrString);
efree(ErrString);
} else {
- php_error(E_WARNING,"Invoke() failed: %s", error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Invoke() failed: %s", error_message);
}
LocalFree(error_message);
return FAILURE;
@@ -625,7 +625,7 @@ static int com_set(rpc_string property_name, zval *value, void **data)
if (FAILED(hr = php_COM_get_ids_of_names((comval *) *data, propname, &dispid))) {
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Unable to lookup %s: %s", property_name.str, error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unable to lookup %s: %s", property_name.str, error_message);
LocalFree(error_message);
efree(propname);
@@ -646,10 +646,10 @@ static int com_set(rpc_string property_name, zval *value, void **data)
if (FAILED(hr = php_COM_invoke((comval *) *data, dispid, DISPATCH_PROPERTYPUT, &dispparams, NULL, &ErrString))) {
error_message = php_COM_error_message(hr);
if (ErrString) {
- php_error(E_WARNING,"PropPut() failed: %s %s", error_message, ErrString);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"PropPut() failed: %s %s", error_message, ErrString);
efree(ErrString);
} else {
- php_error(E_WARNING,"PropPut() failed: %s", error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"PropPut() failed: %s", error_message);
}
LocalFree(error_message);
VariantClear(var);
@@ -794,7 +794,7 @@ PHP_FUNCTION(com_next)
efree(result);
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"IEnumVariant::Next() failed: %s", error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"IEnumVariant::Next() failed: %s", error_message);
efree(error_message);
RETURN_NULL();
@@ -862,7 +862,7 @@ PHP_FUNCTION(com_reset)
if (FAILED(hr = C_ENUMVARIANT_VT(obj)->Reset(C_ENUMVARIANT(obj)))) {
char *error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"IEnumVariant::Next() failed: %s", error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"IEnumVariant::Next() failed: %s", error_message);
efree(error_message);
RETURN_FALSE;
@@ -899,7 +899,7 @@ PHP_FUNCTION(com_skip)
if (FAILED(hr = C_ENUMVARIANT_VT(obj)->Skip(C_ENUMVARIANT(obj), count))) {
char *error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"IEnumVariant::Next() failed: %s", error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"IEnumVariant::Next() failed: %s", error_message);
efree(error_message);
RETURN_FALSE;
}
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 3106640676..4c9f3180ca 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -876,7 +876,7 @@ ZEND_API int php_COM_load_typelib(ITypeLib *TypeLib, int mode)
/* Oops, it already exists. No problem if it is defined as the same value */
/* Check to see if they are the same */
if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose")) {
- php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type library value %s is already defined and has a different value", c.name);
}
free(c.name);
j++;
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index 35c90fed73..d64666f627 100644
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -124,7 +124,7 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
safeArray = SafeArrayCreate(VT_VARIANT, 1, bounds);
if (NULL == safeArray) {
- php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
ZVAL_FALSE(zval_arg);
} else {
V_ARRAY(var_arg) = safeArray;
@@ -143,14 +143,14 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
php_zval_to_variant(*entry, v, codepage); /* Do the required conversion */
}
} else {
- php_error( E_WARNING,"phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
}
}
zend_hash_move_forward(ht);
}
SafeArrayUnlock( safeArray);
} else {
- php_error( E_WARNING,"phpArrayToSafeArray() - Unable to lock safeArray");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "phpArrayToSafeArray() - Unable to lock safeArray");
}
}
} else {
@@ -365,7 +365,7 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
break;
case VT_VARIANT:
- php_error(E_WARNING,"VT_VARIANT is invalid. Use VT_VARIANT|VT_BYREF instead.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "VT_VARIANT is invalid. Use VT_VARIANT|VT_BYREF instead.");
/* break missing intentionally */
case VT_VARIANT|VT_BYREF: {
variantval *var;
@@ -430,7 +430,7 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
break;
default:
- php_error(E_WARNING,"Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
}
if (unicode_str != NULL) {
@@ -463,7 +463,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
/* TODO: Add support for multi-dimensional SafeArrays */
/* For now just validate that the SafeArray has one dimension */
if (1 != (Dims = SafeArrayGetDim(array))) {
- php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported: multi-dimensional (%d) SafeArrays", Dims);
ZVAL_NULL(zval_arg);
return FAILURE;
}
@@ -584,7 +584,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
default:
ZVAL_NULL(zval_arg);
ret = FAILURE;
- php_error(E_WARNING, "Error converting DECIMAL value to PHP string");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error converting DECIMAL value to PHP string");
break;
}
}
@@ -687,7 +687,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
char *error_message;
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Unable to obtain IDispatch interface: %s", error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to obtain IDispatch interface: %s", error_message);
LocalFree(error_message);
V_DISPATCH(var_arg) = NULL;
@@ -752,7 +752,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
break;
default:
- php_error(E_WARNING,"Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
ZVAL_NULL(zval_arg);
ret = FAILURE;
break;
@@ -790,13 +790,13 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage, int
if (error) {
switch (GetLastError()) {
case ERROR_NO_UNICODE_TRANSLATION:
- php_error(E_WARNING, "No unicode translation available for the specified string");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "No unicode translation available for the specified string");
break;
case ERROR_INSUFFICIENT_BUFFER:
- php_error(E_WARNING, "Internal Error: Insufficient Buffer");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Internal Error: Insufficient Buffer");
break;
default:
- php_error(E_WARNING, "Unknown error in php_char_to_OLECHAR()");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error in php_char_to_OLECHAR()");
}
}
@@ -821,7 +821,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int cod
C_str = (char *) pemalloc(sizeof(char), persist);
*C_str = 0;
- php_error(E_WARNING,"Error in php_OLECHAR_to_char()");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in php_OLECHAR_to_char()");
}
if (out_length) {
diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index 98726b9385..915f58683d 100644
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -260,7 +260,7 @@ static zval* variant_read(zval *object, zval *member, int type TSRMLS_DC)
ZVAL_LONG(result, V_VT(var->var));
} else {
ZVAL_FALSE(result);
- php_error(E_WARNING, "Unknown member.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown member.");
}
return result;
@@ -280,7 +280,7 @@ static void variant_write(zval *object, zval *member, zval *value TSRMLS_DC)
} else if (zend_hash_find(&types, Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, (void **) &type) == SUCCESS) {
php_zval_to_variant_ex(value, var->var, *type, var->codepage);
} else {
- php_error(E_WARNING, "Unknown member.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown member.");
}
}
diff --git a/ext/rpc/dotnet/dotnet.cpp b/ext/rpc/dotnet/dotnet.cpp
index 46aa055f73..75fed831e5 100644
--- a/ext/rpc/dotnet/dotnet.cpp
+++ b/ext/rpc/dotnet/dotnet.cpp
@@ -143,13 +143,13 @@ PHP_FUNCTION(dotnet_load)
if (FAILED(hr)) {
char *error_message;
error_message = php_COM_error_message(hr TSRMLS_CC);
- php_error(E_WARNING, "Error obtaining .Net class for %s in assembly %s: %s", datatype_name->value.str.val, assembly_name->value.str.val, error_message);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error obtaining .Net class for %s in assembly %s: %s", datatype_name->value.str.val, assembly_name->value.str.val, error_message);
LocalFree(error_message);
efree(obj);
RETURN_FALSE;
}
if (C_DISPATCH(obj) == NULL) {
- php_error(E_WARNING, "Unable to locate %s in assembly %s", datatype_name->value.str.val, assembly_name->value.str.val);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate %s in assembly %s", datatype_name->value.str.val, assembly_name->value.str.val);
efree(obj);
RETURN_FALSE;
}
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index eacd46f165..3203bd3afb 100644
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -192,8 +192,7 @@ static int jvm_create(TSRMLS_D)
dl_handle = DL_LOAD(javalib);
if (!dl_handle) {
- php_error(E_ERROR, "Unable to load Java Library %s, error: %s",
- javalib, DL_ERROR());
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to load Java Library %s, error: %s", javalib, DL_ERROR());
return -1;
}
}
@@ -208,7 +207,7 @@ static int jvm_create(TSRMLS_D)
DL_FETCH_SYMBOL(dl_handle, "JNI_CreateJavaVM");
if (!JNI_CreateVM) {
- php_error(E_ERROR, "Unable to locate CreateJavaVM function");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to locate CreateJavaVM function");
return -1;
}
@@ -235,7 +234,7 @@ static int jvm_create(TSRMLS_D)
DL_FETCH_SYMBOL(dl_handle, "JNI_GetDefaultJavaVMInitArgs");
if (!JNI_DefaultArgs) {
- php_error(E_ERROR, "Unable to locate GetDefaultJavaVMInitArgs function");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to locate GetDefaultJavaVMInitArgs function");
return -1;
}
@@ -254,7 +253,7 @@ static int jvm_create(TSRMLS_D)
rc = (*JNI_CreateVM)(&JG(jvm), &JG(jenv), &vm_args);
if (rc) {
- php_error(E_ERROR, "Unable to create Java Virtual Machine");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to create Java Virtual Machine");
return rc;
}
@@ -273,7 +272,7 @@ static int jvm_create(TSRMLS_D)
"()Ljava/lang/String;");
errString = (*jenv)->CallObjectMethod(jenv, error, toString);
errAsUTF = (*jenv)->GetStringUTFChars(jenv, errString, &isCopy);
- php_error(E_ERROR, "%s", errAsUTF);
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "%s", errAsUTF);
if (isCopy) (*jenv)->ReleaseStringUTFChars(jenv, error, errAsUTF);
jvm_destroy(TSRMLS_C);
return -1;
@@ -411,7 +410,7 @@ static jobjectArray _java_makeArray(int argc, pval** argv TSRMLS_DC)
static int checkError(pval *value)
{
if (Z_TYPE_P(value) == IS_EXCEPTION) {
- php_error(E_WARNING, "%s", Z_STRVAL_P(value));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", Z_STRVAL_P(value));
efree(Z_STRVAL_P(value));
ZVAL_FALSE(value);
return 1;
@@ -458,7 +457,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
result = (jlong)(long)object;
if (ZEND_NUM_ARGS() < 1) {
- php_error(E_ERROR, "Missing classname in new Java() call");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Missing classname in new Java() call");
return;
}
@@ -571,8 +570,7 @@ static pval _java_getset_property
Z_TYPE(presult) = IS_NULL;
if (!obj || (type!=le_jobject)) {
- php_error(E_ERROR,
- "Attempt to access a Java property on a non-Java object");
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Attempt to access a Java property on a non-Java object");
} else {
/* invoke the method */
jmethodID gsp = (*jenv)->GetMethodID(jenv, JG(reflect_class), "GetSetProp",
View Lorry Controller Status