X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/bac41a7b9a0a9254fa30f8bb6e6038ab71a483e2..ce0ac947b4708d0bc1c7e6789b3e1f3bfc80d6e9:/cdsa/cdsa_utilities/DbContext.cpp?ds=inline diff --git a/cdsa/cdsa_utilities/DbContext.cpp b/cdsa/cdsa_utilities/DbContext.cpp index ebe270bc..5633728a 100644 --- a/cdsa/cdsa_utilities/DbContext.cpp +++ b/cdsa/cdsa_utilities/DbContext.cpp @@ -43,86 +43,3 @@ DbContext::~DbContext () //delete mAccessCred; // XXX How do we delete these? } - -#if 0 -CSSM_HANDLE -DbContext::dataGetFirst(const DLQuery *inQuery, - CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR inoutAttributes, - CssmData *inoutData, - CSSM_DB_UNIQUE_RECORD_PTR &outUniqueRecord) -{ - auto_ptr aQuery(mDatabase.makeQuery(const DLQuery *inQuery)); - try - { - mDatabase.dataGetNext(*aQuery, inoutAttributes, inoutData, outUniqueRecord); - - StLock _(mDbQuerySet); - mDbQuerySet.insert(aQuery.get()); - } - catch(...) - { - mDatabase.dataAbortQuery(*aQuery); - throw; - } - - return reinterpret_cast(aQuery.release()); -} - -void -DbContext::dataGetNext(CSSM_HANDLE inResultsHandle, - CSSM_DB_RECORD_ATTRIBUTE_DATA_PTR inoutAttributes, - CssmData *inoutData, - CSSM_DB_UNIQUE_RECORD_PTR &outUniqueRecord) -{ - DbQuery *aQuery = reinterpret_cast(inResultsHandle); - { - StLock _(mDbQuerySet); - DbQuerySet::iterator it = mDbQuerySet.find(aQuery); - if (it == mDbContextMap.end()) - CssmError::throwMe(CSSMERR_DL_INVALID_RESULTS_HANDLE); - } - - try - { - mDatabase.dataGetNext(*aQuery, inoutAttributes, inoutData, outUniqueRecord); - } - catch(...) - { - { - StLock _(mDbQuerySet); - mDbQuerySet.erase(aQuery); - } - try - { - mDatabase.dataAbortQuery(*aQuery); - } - catch(...) {} - delete aQuery; - throw; - } -} - -void -DbContext::dataAbortQuery(CSSM_HANDLE inResultsHandle) -{ - DbQuery *aQuery = reinterpret_cast(inResultsHandle); - { - StLock _(mDbQuerySet); - DbQuerySet::iterator it = mDbQuerySet.find(aQuery); - if (it == mDbContextMap.end()) - CssmError::throwMe(CSSMERR_DL_INVALID_RESULTS_HANDLE); - mDbContextMap.erase(it); - } - - try - { - mDatabase.dataAbortQuery(*aQuery); - } - catch(...) - { - delete aQuery; - throw; - } - delete aQuery; -} -#endif