summaryrefslogtreecommitdiff
path: root/ext/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'ext/rpc')
-rw-r--r--ext/rpc/com/com_wrapper.c44
-rw-r--r--ext/rpc/com/conversion.c18
-rw-r--r--ext/rpc/dotnet/dotnet.cpp4
-rw-r--r--ext/rpc/java/java.c14
4 files changed, 40 insertions, 40 deletions
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 9d6648044b..ee1fbc8c6c 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -544,7 +544,7 @@ PHP_FUNCTION(com_load)
{
efree(obj);
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Invalid ProgID or Moniker: %s\n", error_message);
+ php_error(E_WARNING, "Invalid ProgID or Moniker: %s\n", error_message);
LocalFree(error_message);
RETURN_FALSE;
}
@@ -583,7 +583,7 @@ PHP_FUNCTION(com_load)
{
error_message = php_COM_error_message(hr);
clsid_str = php_string_from_clsid(&clsid);
- php_error(E_WARNING,"Unable to obtain IDispatch interface for CLSID %s: %s",clsid_str,error_message);
+ php_error(E_WARNING, "Unable to obtain IDispatch interface for CLSID %s: %s", clsid_str, error_message);
LocalFree(error_message);
efree(clsid_str);
efree(obj);
@@ -668,7 +668,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
default:
/* TODO: complain about wrong arg count */
- php_error(E_WARNING,"Wrong argument count to IEnumVariant::Next()\n");
+ php_error(E_WARNING, "Wrong argument count to IEnumVariant::Next()\n");
return FAILURE;
}
@@ -690,7 +690,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
if(FAILED(hr = C_ENUMVARIANT_VT(obj)->Next(C_ENUMVARIANT(obj), count, pSA->pvData, &count)))
{
char *error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"IEnumVariant::Next() failed: %s\n", error_message);
+ php_error(E_WARNING, "IEnumVariant::Next() failed: %s\n", error_message);
efree(error_message);
SafeArrayDestroy(pSA);
VariantInit(var_result);
@@ -703,7 +703,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
if(FAILED(SafeArrayRedim(pSA, rgsabound)))
{
char *error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"IEnumVariant::Next() failed: %s\n", error_message);
+ php_error(E_WARNING, "IEnumVariant::Next() failed: %s\n", error_message);
efree(error_message);
SafeArrayDestroy(pSA);
VariantInit(var_result);
@@ -718,7 +718,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
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\n", error_message);
+ php_error(E_WARNING, "IEnumVariant::Next() failed: %s\n", error_message);
efree(error_message);
return FAILURE;
}
@@ -740,13 +740,13 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
break;
default:
- php_error(E_WARNING,"Wrong argument count to IEnumVariant::Skip()\n");
+ php_error(E_WARNING, "Wrong argument count to IEnumVariant::Skip()\n");
return FAILURE;
}
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\n", error_message);
+ php_error(E_WARNING, "IEnumVariant::Next() failed: %s\n", error_message);
efree(error_message);
return FAILURE;
}
@@ -762,7 +762,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
if(FAILED(hr))
{
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Unable to lookup %s: %s\n", Z_STRVAL_P(function_name), error_message);
+ php_error(E_WARNING, "Unable to lookup %s: %s\n", Z_STRVAL_P(function_name), error_message);
LocalFree(error_message);
efree(funcname);
return FAILURE;
@@ -789,7 +789,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
if(FAILED(hr))
{
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Invoke() failed: %s\n", error_message);
+ php_error(E_WARNING, "Invoke() failed: %s\n", error_message);
LocalFree(error_message);
return FAILURE;
}
@@ -827,7 +827,7 @@ PHP_FUNCTION(com_invoke)
obj = (comval *)zend_list_find(Z_LVAL_P(object), &type);
if(!obj || (type != IS_COM))
{
- php_error(E_WARNING,"%d is not a COM object handler", Z_STRVAL_P(function_name));
+ php_error(E_WARNING, "%d is not a COM object handler", Z_STRVAL_P(function_name));
RETURN_FALSE;
}
@@ -868,7 +868,7 @@ PHP_FUNCTION(com_release)
obj = (comval *)zend_list_find(Z_LVAL_P(object), &type);
if(!obj || (type != IS_COM))
{
- php_error(E_WARNING,"%d is not a COM object handler");
+ php_error(E_WARNING, "%d is not a COM object handler");
RETURN_FALSE;
}
@@ -900,7 +900,7 @@ PHP_FUNCTION(com_addref)
obj = (comval *)zend_list_find(Z_LVAL_P(object), &type);
if(!obj || (type != IS_COM))
{
- php_error(E_WARNING,"%d is not a COM object handler");
+ php_error(E_WARNING, "%d is not a COM object handler");
RETURN_FALSE;
}
@@ -941,7 +941,7 @@ static int do_COM_propget(VARIANT *var_result, comval *obj, pval *arg_property,
if(FAILED(hr))
{
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Unable to lookup %s: %s\n", Z_STRVAL_P(arg_property), error_message);
+ php_error(E_WARNING, "Unable to lookup %s: %s\n", Z_STRVAL_P(arg_property), error_message);
LocalFree(error_message);
efree(propname);
if(cleanup)
@@ -959,7 +959,7 @@ static int do_COM_propget(VARIANT *var_result, comval *obj, pval *arg_property,
if(FAILED(hr))
{
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"PropGet() failed: %s\n", error_message);
+ php_error(E_WARNING, "PropGet() failed: %s\n", error_message);
LocalFree(error_message);
efree(propname);
if(cleanup)
@@ -1000,7 +1000,7 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
if(FAILED(hr))
{
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Unable to lookup %s: %s\n", Z_STRVAL_P(arg_property), error_message);
+ php_error(E_WARNING, "Unable to lookup %s: %s\n", Z_STRVAL_P(arg_property), error_message);
LocalFree(error_message);
efree(propname);
RETURN_FALSE;
@@ -1017,7 +1017,7 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
if(FAILED(hr))
{
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"PropPut() failed: %s\n", error_message);
+ php_error(E_WARNING, "PropPut() failed: %s\n", error_message);
LocalFree(error_message);
efree(propname);
RETURN_FALSE;
@@ -1062,7 +1062,7 @@ PHP_FUNCTION(com_propget)
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
if(!obj || (type != IS_COM))
{
- php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+ php_error(E_WARNING, "%d is not a COM object handler", Z_LVAL_P(arg_comval));
}
convert_to_string_ex(&arg_property);
@@ -1094,7 +1094,7 @@ PHP_FUNCTION(com_propput)
obj = (comval *)zend_list_find(Z_LVAL_P(arg_comval), &type);
if(!obj || (type != IS_COM))
{
- php_error(E_WARNING,"%d is not a COM object handler", Z_LVAL_P(arg_comval));
+ php_error(E_WARNING, "%d is not a COM object handler", Z_LVAL_P(arg_comval));
}
convert_to_string_ex(&arg_property);
@@ -1483,7 +1483,7 @@ static ITypeLib *php_COM_find_typelib(char *search_string, int mode)
/* at each version for a string match to the */
/* supplied argument */
- if(ERROR_SUCCESS != RegOpenKey(HKEY_CLASSES_ROOT, "TypeLib",&hkey))
+ if(ERROR_SUCCESS != RegOpenKey(HKEY_CLASSES_ROOT, "TypeLib", &hkey))
{
/* This is pretty bad - better bail */
return NULL;
@@ -1634,7 +1634,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
/* 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(E_WARNING, "Type library value %s is already defined and has a different value", c.name);
}
free(ids);
j++;
@@ -1678,7 +1678,7 @@ PHP_FUNCTION(com_isenum)
obj = (comval *) zend_list_find(Z_LVAL_PP(comval_handle), &type);
if(!obj || (type != IS_COM))
{
- php_error(E_WARNING,"%s is not a COM object handler", "");
+ php_error(E_WARNING, "%s is not a COM object handler", "");
RETURN_FALSE;
}
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index 8f7e80a9c6..cd05ccdb23 100644
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -141,7 +141,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
if(NULL == safeArray)
{
- php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
+ php_error( E_WARNING, "Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
ZVAL_FALSE(pval_arg);
}
else
@@ -171,7 +171,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
}
else
{
- php_error( E_WARNING,"phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
+ php_error( E_WARNING, "phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
}
}
zend_hash_move_forward(ht);
@@ -180,7 +180,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
}
else
{
- php_error( E_WARNING,"phpArrayToSafeArray() - Unable to lock safeArray");
+ php_error( E_WARNING, "phpArrayToSafeArray() - Unable to lock safeArray");
}
}
}
@@ -488,7 +488,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
/* 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(E_WARNING, "Unsupported: multi-dimensional (%d) SafeArrays", Dims);
ZVAL_NULL(pval_arg);
return FAILURE;
}
@@ -740,7 +740,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
char *error_message;
error_message = php_COM_error_message(hr);
- php_error(E_WARNING,"Unable to obtain IDispatch interface: %s", error_message);
+ php_error(E_WARNING, "Unable to obtain IDispatch interface: %s", error_message);
LocalFree(error_message);
V_DISPATCH(var_arg) = NULL;
@@ -822,7 +822,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
break;
default:
- php_error(E_WARNING,"Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
+ php_error(E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
ZVAL_NULL(pval_arg);
ret = FAILURE;
break;
@@ -852,10 +852,10 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage)
switch(GetLastError())
{
case ERROR_NO_UNICODE_TRANSLATION:
- php_error(E_WARNING,"No unicode translation available for the specified string");
+ php_error(E_WARNING, "No unicode translation available for the specified string");
break;
default:
- php_error(E_WARNING,"Error in php_char_to_OLECHAR()");
+ php_error(E_WARNING, "Error in php_char_to_OLECHAR()");
}
}
@@ -882,7 +882,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
C_str = (char *) pemalloc(sizeof(char), persistent);
*C_str = 0;
- php_error(E_WARNING,"Error in php_OLECHAR_to_char()");
+ php_error(E_WARNING, "Error in php_OLECHAR_to_char()");
}
if(out_length)
diff --git a/ext/rpc/dotnet/dotnet.cpp b/ext/rpc/dotnet/dotnet.cpp
index d0376bd87f..b9af5a6d83 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(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(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 896388162c..adc33578d2 100644
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -157,7 +157,7 @@ static int jvm_create(TSRMLS_D)
jobject local_php_reflect;
jthrowable error;
- jint (JNICALL *JNI_CreateVM)(const void*,const void*,void*);
+ jint (JNICALL *JNI_CreateVM)(const void*, const void*, void*);
#ifndef JNI_12
jint (JNICALL *JNI_DefaultArgs)(void*);
#endif
@@ -189,7 +189,7 @@ static int jvm_create(TSRMLS_D)
else
#endif
- JNI_CreateVM = (jint (JNICALL *)(const void*,const void*,void*))
+ JNI_CreateVM = (jint (JNICALL *)(const void*, const void*, void*))
DL_FETCH_SYMBOL(dl_handle, "JNI_CreateJavaVM");
if (!JNI_CreateVM) {
@@ -282,8 +282,8 @@ static jobject _java_makeObject(pval* arg TSRMLS_DC)
switch (arg->type) {
case IS_STRING:
- result=(*jenv)->NewByteArray(jenv,arg->value.str.len);
- (*jenv)->SetByteArrayRegion(jenv,(jbyteArray)result,0,
+ result=(*jenv)->NewByteArray(jenv, arg->value.str.len);
+ (*jenv)->SetByteArrayRegion(jenv, (jbyteArray)result, 0,
arg->value.str.len, arg->value.str.val);
break;
@@ -422,7 +422,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
if (!JG(jenv)) return;
jenv = JG(jenv);
- if (!strcmp("java",function_name->element.value.str.val)) {
+ if (!strcmp("java", function_name->element.value.str.val)) {
/* construct a Java object:
First argument is the class name. Any additional arguments will
@@ -531,7 +531,7 @@ static pval _java_getset_property
/* get the object */
zend_hash_index_find(property_reference->object->value.obj.properties,
0, (void **) &pobject);
- obj = zend_list_find((*pobject)->value.lval,&type);
+ obj = zend_list_find((*pobject)->value.lval, &type);
result = (jlong)(long) &presult;
presult.type = IS_NULL;
@@ -702,7 +702,7 @@ JNIEXPORT void JNICALL Java_net_php_reflect_setResultFromObject
ALLOC_ZVAL(handle);
handle->type = IS_LONG;
handle->value.lval =
- zend_list_insert((*jenv)->NewGlobalRef(jenv,value), le_jobject);
+ zend_list_insert((*jenv)->NewGlobalRef(jenv, value), le_jobject);
pval_copy_constructor(handle);
INIT_PZVAL(handle);
zend_hash_index_update(presult->value.obj.properties, 0,
View Lorry Controller Status