backout bug 547190 due to test failure
authorMarco Bonardo <mbonardo@mozilla.com>
Tue, 22 Jun 2010 03:49:47 +0200
changeset 43944 d688a915d1d461337f5cd8401248d6afd1a22ff0
parent 43943 1cec9ed81981c8ae0b6a51f73e1be1ebd5fa3eda
child 43945 82a21d443b5edfe52842d93d5fc0617ae9f27ff6
child 44113 a6a0eeaa7f0f2a0e9b688dbd1cbd130c7d1101a5
push idunknown
push userunknown
push dateunknown
bugs547190
milestone1.9.3a6pre
backout bug 547190 due to test failure
storage/public/mozIStorageStatement.idl
storage/public/mozIStorageValueArray.idl
--- a/storage/public/mozIStorageStatement.idl
+++ b/storage/public/mozIStorageStatement.idl
@@ -259,58 +259,51 @@ interface mozIStorageStatement : mozISto
   /**
    * Getters for native code that return their values as
    * the return type, for convenience and sanity.
    *
    * Not virtual; no vtable bloat.
    */
 
   inline PRInt32 AsInt32(PRUint32 idx) {
-    PRInt32 v = 0;
-    nsresult rv = GetInt32(idx, &v);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    PRInt32 v;
+    GetInt32(idx, &v);
     return v;
   }
 
   inline PRInt64 AsInt64(PRUint32 idx) {
-    PRInt64 v = 0;
-    nsresult rv = GetInt64(idx, &v);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    PRInt64 v;
+    GetInt64(idx, &v);
     return v;
   }
 
   inline double AsDouble(PRUint32 idx) {
-    double v = 0.0;
-    nsresult rv = GetDouble(idx, &v);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    double v;
+    GetDouble(idx, &v);
     return v;
   }
 
   inline const char* AsSharedUTF8String(PRUint32 idx, PRUint32 *len) {
     const char *str = nsnull;
-    nsresult rv = GetSharedUTF8String(idx, len, &str);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetSharedUTF8String(idx, len, &str);
     return str;
   }
 
   inline const PRUnichar* AsSharedWString(PRUint32 idx, PRUint32 *len) {
     const PRUnichar *str = nsnull;
-    nsresult rv = GetSharedString(idx, len, &str);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetSharedString(idx, len, &str);
     return str;
   }
 
   inline const PRUint8* AsSharedBlob(PRUint32 idx, PRUint32 *len) {
     const PRUint8 *blob = nsnull;
-    nsresult rv = GetSharedBlob(idx, len, &blob);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetSharedBlob(idx, len, &blob);
     return blob;
   }
 
   inline PRBool IsNull(PRUint32 idx) {
     PRBool b = PR_FALSE;
-    nsresult rv = GetIsNull(idx, &b);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetIsNull(idx, &b);
     return b;
   }
 
 %}
 };
--- a/storage/public/mozIStorageValueArray.idl
+++ b/storage/public/mozIStorageValueArray.idl
@@ -105,59 +105,52 @@ interface mozIStorageValueArray : nsISup
   /**
    * Getters for native code that return their values as
    * the return type, for convenience and sanity.
    *
    * Not virtual; no vtable bloat.
    */
 
   inline PRInt32 AsInt32(PRUint32 idx) {
-    PRInt32 v = 0;
-    nsresult rv = GetInt32(idx, &v);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    PRInt32 v;
+    GetInt32(idx, &v);
     return v;
   }
 
   inline PRInt64 AsInt64(PRUint32 idx) {
-    PRInt64 v = 0;
-    nsresult rv = GetInt64(idx, &v);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    PRInt64 v;
+    GetInt64(idx, &v);
     return v;
   }
 
   inline double AsDouble(PRUint32 idx) {
-    double v = 0.0;
-    nsresult rv = GetDouble(idx, &v);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    double v;
+    GetDouble(idx, &v);
     return v;
   }
 
   inline const char* AsSharedUTF8String(PRUint32 idx, PRUint32 *len) {
     const char *str = nsnull;
-    nsresult rv = GetSharedUTF8String(idx, len, &str);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetSharedUTF8String(idx, len, &str);
     return str;
   }
 
   inline const PRUnichar* AsSharedWString(PRUint32 idx, PRUint32 *len) {
     const PRUnichar *str = nsnull;
-    nsresult rv = GetSharedString(idx, len, &str);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetSharedString(idx, len, &str);
     return str;
   }
 
   inline const PRUint8* AsSharedBlob(PRUint32 idx, PRUint32 *len) {
     const PRUint8 *blob = nsnull;
-    nsresult rv = GetSharedBlob(idx, len, &blob);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetSharedBlob(idx, len, &blob);
     return blob;
   }
 
   inline PRBool IsNull(PRUint32 idx) {
     PRBool b = PR_FALSE;
-    nsresult rv = GetIsNull(idx, &b);
-    NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv), "Getting value failed, wrong column index?");
+    GetIsNull(idx, &b);
     return b;
   }
 
 %}
 
 };