diff options
author | drh <drh@noemail.net> | 2016-01-14 22:19:58 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2016-01-14 22:19:58 +0000 |
commit | 2d80151f324fc8b4ba93c96bfc7547ce62a8a80f (patch) | |
tree | 87f448eb2c28bc3fceb46c5ffdc967a68dac3a0c /src/vtab.c | |
parent | 2cfe049f40d61a17ababf57e0575a12f761a7841 (diff) | |
download | sqlite-2d80151f324fc8b4ba93c96bfc7547ce62a8a80f.tar.gz sqlite-2d80151f324fc8b4ba93c96bfc7547ce62a8a80f.zip |
Combine the xFunc and xStep pointers of the FuncDef object into a single
pointer xSFunc.
FossilOrigin-Name: 0d1b3d7d3ca66cb0b97493f1aeade1703af3c9f4
Diffstat (limited to 'src/vtab.c')
-rw-r--r-- | src/vtab.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vtab.c b/src/vtab.c index 6054df3d7..ea79cd8ce 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -1016,7 +1016,7 @@ FuncDef *sqlite3VtabOverloadFunction( Table *pTab; sqlite3_vtab *pVtab; sqlite3_module *pMod; - void (*xFunc)(sqlite3_context*,int,sqlite3_value**) = 0; + void (*xSFunc)(sqlite3_context*,int,sqlite3_value**) = 0; void *pArg = 0; FuncDef *pNew; int rc = 0; @@ -1044,7 +1044,7 @@ FuncDef *sqlite3VtabOverloadFunction( for(z=(unsigned char*)zLowerName; *z; z++){ *z = sqlite3UpperToLower[*z]; } - rc = pMod->xFindFunction(pVtab, nArg, zLowerName, &xFunc, &pArg); + rc = pMod->xFindFunction(pVtab, nArg, zLowerName, &xSFunc, &pArg); sqlite3DbFree(db, zLowerName); } if( rc==0 ){ @@ -1061,7 +1061,7 @@ FuncDef *sqlite3VtabOverloadFunction( *pNew = *pDef; pNew->zName = (char *)&pNew[1]; memcpy(pNew->zName, pDef->zName, sqlite3Strlen30(pDef->zName)+1); - pNew->xFunc = xFunc; + pNew->xSFunc = xSFunc; pNew->pUserData = pArg; pNew->funcFlags |= SQLITE_FUNC_EPHEM; return pNew; |