Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 490084 - Add support for arrays in variantToSQLiteT

Browse Source 
This adds support for blobs in variantToSQLiteT which means that functions can
no return blobs, as well as future consumers of variantToSQLiteT.
r=asuth
This commit is contained in:
Shawn Wilsher 2009-05-08 20:29:57 -04:00
parent ec0d4b9cfb
commit 1d46153736
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/src/mozStorageConnection.cpp
View File

@ -227,6 +227,16 @@ sqlite3_T_null(sqlite3_context *aCtx)
return SQLITE_OK;
}
template < >
int
sqlite3_T_blob(sqlite3_context *aCtx,
const void *aData,
int aSize)
{
::sqlite3_result_blob(aCtx, aData, aSize, NS_Free);
return SQLITE_OK;
}
////////////////////////////////////////////////////////////////////////////////
//// Connection

28
storage/src/variantToSQLiteT_impl.h
View File

@ -53,6 +53,8 @@ template <typename T>
int sqlite3_T_text16(T aObj, nsString aValue);
template <typename T>
int sqlite3_T_null(T aObj);
template <typename T>
int sqlite3_T_blob(T aObj, const void *aBlob, int aSize);
////////////////////////////////////////////////////////////////////////////////
//// variantToSQLiteT Implementation
@ -126,14 +128,36 @@ variantToSQLiteT(T aObj,
}
case nsIDataType::VTYPE_VOID:
case nsIDataType::VTYPE_EMPTY:
case nsIDataType::VTYPE_EMPTY_ARRAY:
return sqlite3_T_null(aObj);
case nsIDataType::VTYPE_ARRAY:
{
PRUint16 type;
nsIID iid;
PRUint32 count;
void *data;
nsresult rv = aValue->GetAsArray(&type, &iid, &count, &data);
NS_ENSURE_SUCCESS(rv, SQLITE_MISMATCH);
// Check to make sure it's a supported type.
NS_ASSERTION(type == nsIDataType::VTYPE_UINT8,
"Invalid type passed! You may leak!");
if (type != nsIDataType::VTYPE_UINT8) {
// Technically this could leak with certain data types, but somebody was
// being stupid passing us this anyway.
NS_Free(data);
return SQLITE_MISMATCH;
}
// Finally do our thing. The function should free the array accordingly!
int rc = sqlite3_T_blob(aObj, data, count);
return rc;
}
// Maybe, it'll be possible to convert these
// in future too.
case nsIDataType::VTYPE_ID:
case nsIDataType::VTYPE_INTERFACE:
case nsIDataType::VTYPE_INTERFACE_IS:
case nsIDataType::VTYPE_ARRAY:
case nsIDataType::VTYPE_EMPTY_ARRAY:
default:
return SQLITE_MISMATCH;
}