ISAR/rusqlite
2
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-11-23 08:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jgallagher/master' into vtab

Browse Source
This commit is contained in:
gwenn
2016-02-01 20:35:30 +01:00
parent e17678b173 4149389318
commit eab16402be
6 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/functions.rs
View File

@@ -509,9 +509,10 @@ impl InnerConnection {
where D: Aggregate<A, T>,
T: ToResult
{
unsafe fn aggregate_context<A>(ctx: *mut sqlite3_context) -> Option<*mut *mut A> {
let pac = ffi::sqlite3_aggregate_context(ctx, ::std::mem::size_of::<*mut A>() as c_int)
as *mut *mut A;
unsafe fn aggregate_context<A>(ctx: *mut sqlite3_context,
bytes: usize)
-> Option<*mut *mut A> {
let pac = ffi::sqlite3_aggregate_context(ctx, bytes as c_int) as *mut *mut A;
if pac.is_null() {
return None;
}
@@ -545,7 +546,7 @@ impl InnerConnection {
assert!(!boxed_aggr.is_null(),
"Internal error - null aggregate pointer");
let pac = match aggregate_context(ctx) {
let pac = match aggregate_context(ctx, ::std::mem::size_of::<*mut A>()) {
Some(pac) => pac,
None => {
ffi::sqlite3_result_error_nomem(ctx);
@@ -576,19 +577,18 @@ impl InnerConnection {
assert!(!boxed_aggr.is_null(),
"Internal error - null aggregate pointer");
let pac = match aggregate_context(ctx) {
Some(pac) => pac,
None => {
ffi::sqlite3_result_error_nomem(ctx);
return;
// Within the xFinal callback, it is customary to set N=0 in calls to
// sqlite3_aggregate_context(C,N) so that no pointless memory allocations occur.
let a: Option<A> = match aggregate_context(ctx, 0) {
Some(pac) => {
if (*pac).is_null() {
None
} else {
let a = Box::from_raw(*pac);
Some(*a)
}
}
};
let a: Option<A> = if (*pac).is_null() {
None
} else {
let a = Box::from_raw(*pac);
Some(*a)
None => None,
};
match (*boxed_aggr).finalize(a) {