Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 8929: Kill NS_COMFALSE

Browse Source 
r=peterv sr=bz


git-svn-id: svn://10.0.0.236/trunk@134398 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sicking%bigfoot.com
2002-11-25 11:21:22 +00:00
parent 2c2d9b13e5
commit 6f8753e832
55 changed files with 267 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/extensions/python/xpcom/src/PyGBase.cpp
View File

@@ -517,7 +517,7 @@ static nsresult do_dispatch(
method = PyObject_GetAttrString(real_ob, (char *)szMethodName);
if ( !method ) {
PyErr_Clear();
ret = NS_COMFALSE;
ret = NS_PYXPCOM_NO_SUCH_METHOD;
goto done;
}
// Make the call
@@ -564,7 +564,7 @@ nsresult PyG_Base::InvokeNativeViaPolicy(
nsresult nr = InvokeNativeViaPolicyInternal(szMethodName, ppResult, szFormat, va);
va_end(va);
if (nr==NS_COMFALSE) {
if (nr == NS_PYXPCOM_NO_SUCH_METHOD) {
// Only problem was missing method.
PyErr_Format(PyExc_AttributeError, "The object does not have a '%s' function.", szMethodName);
}
@@ -587,7 +587,7 @@ nsresult PyG_Base::InvokeNativeGetViaPolicy(
strncat(buf, szPropertyName, sizeof(buf)*sizeof(buf[0])-strlen(buf)-1);
buf[sizeof(buf)/sizeof(buf[0])-1] = '\0';
ret = InvokeNativeViaPolicyInternal(buf, ppResult, nsnull, nsnull);
if (ret == NS_COMFALSE) {
if (ret == NS_PYXPCOM_NO_SUCH_METHOD) {
// No method of that name - just try a property.
// Bit to a hack here to maintain the use of a policy.
// We actually get the policies underlying object
@@ -637,7 +637,7 @@ nsresult PyG_Base::InvokeNativeSetViaPolicy(
va_start(va, szPropertyName);
ret = InvokeNativeViaPolicyInternal(buf, NULL, "O", va);
va_end(va);
if (ret == NS_COMFALSE) {
if (ret == NS_PYXPCOM_NO_SUCH_METHOD) {
// No method of that name - just try a property.
// Bit to a hack here to maintain the use of a policy.
// We actually get the policies underlying object

3
mozilla/extensions/python/xpcom/src/PyXPCOM.h
View File

@@ -60,6 +60,9 @@ extern nsIID Py_nsIID_NULL;
**************************************************************************
*************************************************************************/
#define NS_PYXPCOM_NO_SUCH_METHOD \
NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_PYXPCOM, 0)
// The exception object (loaded from the xpcom .py code)
extern PYXPCOM_EXPORT PyObject *PyXPCOM_Error;