commit 1350b030c146486e58ab3bc0ca825650eaf0ab97
author drh <drh@noemail.net> Wed Feb 27 19:00:20 2002 +0000
committer drh <drh@noemail.net> Wed Feb 27 19:00:20 2002 +0000
tree 50ac025f19fcd6306851b5023e11f1f716210819
parent 4e0f995347be40b66bdd8ab14c52367d891173df

Revise the API for user-defined functions. (CVS 398)

FossilOrigin-Name: 633951f0fa11c91f93aa2862df84691750c01e73

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 4be07e5..563291c 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.47 2002/02/27 01:53:13 drh Exp $
+** $Id: expr.c,v 1.48 2002/02/27 19:00:21 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1003,7 +1003,7 @@
             sqliteExprCode(pParse, pList->a[i].pExpr);
           }
           sqliteVdbeAddOp(v, OP_UserFunc, pList->nExpr, 0);
-          sqliteVdbeChangeP3(v, -1, (char*)pUser->xFunc, P3_POINTER);
+          sqliteVdbeChangeP3(v, -1, (char*)pUser, P3_POINTER);
           break;
         }
         default: {
@@ -1396,8 +1396,7 @@
 ){
   UserFunc *pFirst, *p, *pMaybe;
   pFirst = p = (UserFunc*)sqliteHashFind(&db->userFunc, zName, nName);
-  if( p==0 ) return 0;
-  if( !createFlag && nArg<0 ){
+  if( p && !createFlag && nArg<0 ){
     while( p && p->xFunc==0 && p->xStep==0 ){ p = p->pNext; }
     return p;
   }