wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Future proof some key type checks

Browse Source
This commit is contained in:
Ben Turner 2010-06-02 18:05:23 -07:00
parent 311f732309
commit 171acc8c7e
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dom/indexedDB/IDBObjectStoreRequest.cpp
View File

@ -1031,7 +1031,7 @@ AddHelper::GetSuccessResult(nsIWritableVariant* aResult)
aResult->SetAsInt64(mKey.IntValue());
}
else {
NS_NOTREACHED("Bad key!");
NS_NOTREACHED("Unknown key type!");
}
return OK;
}
@ -1092,15 +1092,19 @@ GetHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
nsresult rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("osid"), mOSID);
NS_ENSURE_SUCCESS(rv, nsIIDBDatabaseException::UNKNOWN_ERR);
NS_ASSERTION(!mKey.IsUnset(), "Must have a key here!");
NS_ASSERTION(!mKey.IsUnset() && !mKey.IsNull(), "Must have a key here!");
NS_NAMED_LITERAL_CSTRING(id, "id");
rv = mKey.IsNull() ?
stmt->BindNullByName(id) :
mKey.IsInt() ?
stmt->BindInt64ByName(id, mKey.IntValue()) :
stmt->BindStringByName(id, mKey.StringValue());
if (mKey.IsInt()) {
rv = stmt->BindInt64ByName(id, mKey.IntValue());
}
else if (mKey.IsString()) {
rv = stmt->BindStringByName(id, mKey.StringValue());
}
else {
NS_NOTREACHED("Unknown key type!");
}
NS_ENSURE_SUCCESS(rv, nsIIDBDatabaseException::UNKNOWN_ERR);
// Search for it!
@ -1143,13 +1147,19 @@ RemoveHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
nsresult rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("osid"), mOSID);
NS_ENSURE_SUCCESS(rv, nsIIDBDatabaseException::UNKNOWN_ERR);
NS_ASSERTION(!mKey.IsUnset() && !mKey.IsNull(), "Must have a key here!");
NS_NAMED_LITERAL_CSTRING(key_value, "key_value");
rv = mKey.IsNull() ?
stmt->BindNullByName(key_value) :
mKey.IsInt() ?
stmt->BindInt64ByName(key_value, mKey.IntValue()) :
stmt->BindStringByName(key_value, mKey.StringValue());
if (mKey.IsInt()) {
rv = stmt->BindInt64ByName(key_value, mKey.IntValue());
}
else if (mKey.IsString()) {
rv = stmt->BindStringByName(key_value, mKey.StringValue());
}
else {
NS_NOTREACHED("Unknown key type!");
}
NS_ENSURE_SUCCESS(rv, nsIIDBDatabaseException::UNKNOWN_ERR);
// Search for it!