/ Check-in [6de9c084]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove dead code. (CVS 5601)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:6de9c084fc533fbb22af6a4cd3e4e9a461b13876
User & Date: drh 2008-08-22 17:34:45
Context
2008-08-22
18:41
quieting compiler warning about pointer/int conversion size mismatch (CVS 5602) check-in: f8a70501 user: aswift tags: trunk
17:34
Remove dead code. (CVS 5601) check-in: 6de9c084 user: drh tags: trunk
17:28
add legacy.lo back (in alphabetical order) (CVS 5600) check-in: a861aa73 user: pweilbacher tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/btree.c.

     5      5   ** a legal notice, here is a blessing:
     6      6   **
     7      7   **    May you do good and not evil.
     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12         -** $Id: btree.c,v 1.500 2008/08/22 12:57:09 drh Exp $
           12  +** $Id: btree.c,v 1.501 2008/08/22 17:34:45 drh Exp $
    13     13   **
    14     14   ** This file implements a external (disk-based) database using BTrees.
    15     15   ** See the header comment on "btreeInt.h" for additional information.
    16     16   ** Including a description of file format and an overview of operation.
    17     17   */
    18     18   #include "btreeInt.h"
    19     19   
................................................................................
  1295   1295       }
  1296   1296       if( rc!=SQLITE_OK ){
  1297   1297         goto btree_open_out;
  1298   1298       }
  1299   1299       sqlite3PagerSetBusyhandler(pBt->pPager, &pBt->busyHdr);
  1300   1300       p->pBt = pBt;
  1301   1301     
  1302         -    /* sqlite3PagerSetDestructor(pBt->pPager, pageDestructor); */
  1303   1302       sqlite3PagerSetReiniter(pBt->pPager, pageReinit);
  1304   1303       pBt->pCursor = 0;
  1305   1304       pBt->pPage1 = 0;
  1306   1305       pBt->readOnly = sqlite3PagerIsreadonly(pBt->pPager);
  1307   1306       pBt->pageSize = get2byte(&zDbHeader[16]);
  1308   1307       if( pBt->pageSize<512 || pBt->pageSize>SQLITE_MAX_PAGE_SIZE
  1309   1308            || ((pBt->pageSize-1)&pBt->pageSize)!=0 ){

Changes to src/expr.c.

     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** This file contains routines used for analyzing expressions and
    13     13   ** for generating VDBE code that evaluates expressions in SQLite.
    14     14   **
    15         -** $Id: expr.c,v 1.390 2008/08/22 16:29:51 drh Exp $
           15  +** $Id: expr.c,v 1.391 2008/08/22 17:34:45 drh Exp $
    16     16   */
    17     17   #include "sqliteInt.h"
    18     18   #include <ctype.h>
    19     19   
    20     20   /*
    21     21   ** Return the 'affinity' of the expression pExpr if any.
    22     22   **
................................................................................
   916    916         testcase( pExpr->op==TK_ID );
   917    917         testcase( pExpr->op==TK_COLUMN );
   918    918         testcase( pExpr->op==TK_DOT );
   919    919         testcase( pExpr->op==TK_AGG_FUNCTION );
   920    920         testcase( pExpr->op==TK_AGG_COLUMN );
   921    921         pWalker->u.i = 0;
   922    922         return WRC_Abort;
   923         -    case TK_IN:
   924         -      if( pExpr->pSelect ){
   925         -        pWalker->u.i = 0;
   926         -        return WRC_Abort;
   927         -      }
   928    923       default:
   929    924         return WRC_Continue;
   930    925     }
   931    926   }
   932    927   static int selectNodeIsConstant(Walker *pWalker, Select *pSelect){
   933    928     pWalker->u.i = 0;
   934    929     return WRC_Abort;

Changes to src/pager.c.

    14     14   ** The pager is used to access a database disk file.  It implements
    15     15   ** atomic commit and rollback through the use of a journal file that
    16     16   ** is separate from the database file.  The pager also implements file
    17     17   ** locking to prevent two processes from writing the same database
    18     18   ** file simultaneously, or one process from reading the database while
    19     19   ** another is writing.
    20     20   **
    21         -** @(#) $Id: pager.c,v 1.475 2008/08/22 16:22:17 danielk1977 Exp $
           21  +** @(#) $Id: pager.c,v 1.476 2008/08/22 17:34:45 drh Exp $
    22     22   */
    23     23   #ifndef SQLITE_OMIT_DISKIO
    24     24   #include "sqliteInt.h"
    25     25   
    26     26   /*
    27     27   ** Macros for troubleshooting.  Normally turned off
    28     28   */
................................................................................
  1932   1932   /*
  1933   1933   ** Set the busy handler function.
  1934   1934   */
  1935   1935   void sqlite3PagerSetBusyhandler(Pager *pPager, BusyHandler *pBusyHandler){
  1936   1936     pPager->pBusyHandler = pBusyHandler;
  1937   1937   }
  1938   1938   
  1939         -/*
  1940         -** Set the destructor for this pager.  If not NULL, the destructor is called
  1941         -** when the reference count on each page reaches zero.  The destructor can
  1942         -** be used to clean up information in the extra segment appended to each page.
  1943         -**
  1944         -** The destructor is not called as a result sqlite3PagerClose().  
  1945         -** Destructors are only called by sqlite3PagerUnref().
  1946         -*/
  1947         -void sqlite3PagerSetDestructor(Pager *pPager, void (*xDesc)(DbPage*,int)){
  1948         -  pPager->xDestructor = xDesc;
  1949         -}
  1950         -
  1951   1939   /*
  1952   1940   ** Set the reinitializer for this pager.  If not NULL, the reinitializer
  1953   1941   ** is called when the content of a page in cache is restored to its original
  1954   1942   ** value as a result of a rollback.  The callback gives higher-level code
  1955   1943   ** an opportunity to restore the EXTRA section to agree with the restored
  1956   1944   ** page data.
  1957   1945   */

Changes to src/pager.h.

     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** This header file defines the interface that the sqlite page cache
    13     13   ** subsystem.  The page cache subsystem reads and writes a file a page
    14     14   ** at a time and provides a journal for rollback.
    15     15   **
    16         -** @(#) $Id: pager.h,v 1.79 2008/08/21 12:19:44 danielk1977 Exp $
           16  +** @(#) $Id: pager.h,v 1.80 2008/08/22 17:34:45 drh Exp $
    17     17   */
    18     18   
    19     19   #ifndef _PAGER_H_
    20     20   #define _PAGER_H_
    21     21   
    22     22   /*
    23     23   ** If defined as non-zero, auto-vacuum is enabled by default. Otherwise
................................................................................
    68     68   
    69     69   /*
    70     70   ** See source code comments for a detailed description of the following
    71     71   ** routines:
    72     72   */
    73     73   int sqlite3PagerOpen(sqlite3_vfs *, Pager **ppPager, const char*, void(*)(DbPage*), int,int,int);
    74     74   void sqlite3PagerSetBusyhandler(Pager*, BusyHandler *pBusyHandler);
    75         -void sqlite3PagerSetDestructor(Pager*, void(*)(DbPage*,int));
    76     75   void sqlite3PagerSetReiniter(Pager*, void(*)(DbPage*,int));
    77     76   int sqlite3PagerSetPagesize(Pager*, u16*);
    78     77   int sqlite3PagerMaxPageCount(Pager*, int);
    79     78   int sqlite3PagerReadFileheader(Pager*, int, unsigned char*);
    80     79   void sqlite3PagerSetCachesize(Pager*, int);
    81     80   int sqlite3PagerClose(Pager *pPager);
    82     81   int sqlite3PagerAcquire(Pager *pPager, Pgno pgno, DbPage **ppPage, int clrFlag);

Changes to src/pcache.c.

     7      7   **    May you do good and not evil.
     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** This file implements that page cache.
    13     13   **
    14         -** @(#) $Id: pcache.c,v 1.9 2008/08/22 17:09:50 danielk1977 Exp $
           14  +** @(#) $Id: pcache.c,v 1.10 2008/08/22 17:34:45 drh Exp $
    15     15   */
    16     16   #include "sqliteInt.h"
    17     17   
    18     18   /*
    19     19   ** A complete page cache is an instance of this structure.
    20     20   */
    21     21   struct PCache {
................................................................................
   436    436       pcache.nPurgeable--;
   437    437     }
   438    438     pcacheFree(p->apSave[0]);
   439    439     pcacheFree(p->apSave[1]);
   440    440     pcacheFree(p);
   441    441   }
   442    442   
          443  +#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
   443    444   /*
   444    445   ** Return the number of bytes that will be returned to the heap when
   445    446   ** the argument is passed to pcachePageFree().
   446    447   */
   447    448   static int pcachePageSize(PgHdr *p){
   448    449     assert( sqlite3_mutex_held(pcache.mutex_lru) );
   449    450     assert( !pcache.pStart );
   450    451     assert( p->apSave[0]==0 );
   451    452     assert( p->apSave[1]==0 );
   452    453     assert( p && p->pCache );
   453    454     return sqlite3MallocSize(p);
   454    455   }
          456  +#endif
   455    457   
   456    458   /*
   457    459   ** Recycle a page from the global LRU list. If no page can be recycled, 
   458    460   ** return NULL. Otherwise, the pointer returned points to a PgHdr 
   459    461   ** object that has been removed from all lists and hash tables in
   460    462   ** which is was referenced. The caller may reuse the allocation directly
   461    463   ** or may pass it to pcachePageFree() to return the memory to the heap

Changes to src/resolve.c.

    10     10   **
    11     11   *************************************************************************
    12     12   **
    13     13   ** This file contains routines used for walking the parser tree and
    14     14   ** resolve all identifiers by associating them with a particular
    15     15   ** table and column.
    16     16   **
    17         -** $Id: resolve.c,v 1.1 2008/08/20 16:35:10 drh Exp $
           17  +** $Id: resolve.c,v 1.2 2008/08/22 17:34:45 drh Exp $
    18     18   */
    19     19   #include "sqliteInt.h"
    20     20   #include <stdlib.h>
    21     21   #include <string.h>
    22     22   
    23     23   /*
    24     24   ** Given the name of a column of the form X.Y.Z or Y.Z or just Z, look up
................................................................................
  1078   1078     if( pNC->hasAgg ){
  1079   1079       ExprSetProperty(pExpr, EP_Agg);
  1080   1080     }else if( savedHasAgg ){
  1081   1081       pNC->hasAgg = 1;
  1082   1082     }
  1083   1083     return ExprHasProperty(pExpr, EP_Error);
  1084   1084   }
  1085         -int sqlite3ResolveExprListNames( 
  1086         -  NameContext *pNC,       /* Namespace to resolve expressions in. */
  1087         -  ExprList *pList         /* List of expressions to be analyzed. */
  1088         -){
  1089         -  int i;
  1090         -  struct ExprList_item *pItem;
  1091         -  if( pList==0 ) return 0;
  1092         -  for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
  1093         -    if( sqlite3ResolveExprNames(pNC, pItem->pExpr) ) return 1;
  1094         -  }
  1095         -  return 0;
  1096         -}
  1097   1085   
  1098   1086   
  1099   1087   /*
  1100   1088   ** Resolve all names in all expressions of a SELECT and in all
  1101   1089   ** decendents of the SELECT, including compounds off of p->pPrior,
  1102   1090   ** subqueries in expressions, and subqueries used as FROM clause
  1103   1091   ** terms.

Changes to src/sqliteInt.h.

     7      7   **    May you do good and not evil.
     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** Internal interface definitions for SQLite.
    13     13   **
    14         -** @(#) $Id: sqliteInt.h,v 1.760 2008/08/22 12:30:52 drh Exp $
           14  +** @(#) $Id: sqliteInt.h,v 1.761 2008/08/22 17:34:45 drh Exp $
    15     15   */
    16     16   #ifndef _SQLITEINT_H_
    17     17   #define _SQLITEINT_H_
    18     18   
    19     19   /*
    20     20   ** Include the configuration header output by 'configure' if we're using the
    21     21   ** autoconf-based build
................................................................................
  2323   2323   void sqlite3AlterRenameTable(Parse*, SrcList*, Token*);
  2324   2324   int sqlite3GetToken(const unsigned char *, int *);
  2325   2325   void sqlite3NestedParse(Parse*, const char*, ...);
  2326   2326   void sqlite3ExpirePreparedStatements(sqlite3*);
  2327   2327   void sqlite3CodeSubselect(Parse *, Expr *, int);
  2328   2328   void sqlite3SelectPrep(Parse*, Select*, NameContext*);
  2329   2329   int sqlite3ResolveExprNames(NameContext*, Expr*);
  2330         -int sqlite3ResolveExprListNames(NameContext*, ExprList*);
  2331   2330   void sqlite3ResolveSelectNames(Parse*, Select*, NameContext*);
  2332   2331   int sqlite3ResolveOrderGroupBy(Parse*, Select*, ExprList*, const char*);
  2333   2332   void sqlite3ColumnDefault(Vdbe *, Table *, int);
  2334   2333   void sqlite3AlterFinishAddColumn(Parse *, Token *);
  2335   2334   void sqlite3AlterBeginAddColumn(Parse *, SrcList *);
  2336   2335   CollSeq *sqlite3GetCollSeq(sqlite3*, CollSeq *, const char *, int);
  2337   2336   char sqlite3AffinityType(const Token*);