SQLite: Check-in [d49639c2]

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

Overview

Comment:	Fix another harmless compiler warning. Get the MSVC makefile working with unionvtab.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA3-256:	d49639c208ac366f6c675ac5671accc2a597558b62a51520194276c61f32d406
User & Date:	drh 2017-07-18 20:28:34

Context

2017-07-18
20:30		Fix duplicate test name. No changes to code. (check-in: 47b80ecc user: mistachkin tags: trunk)
20:28		Fix another harmless compiler warning. Get the MSVC makefile working with unionvtab. (check-in: d49639c2 user: drh tags: trunk)
20:22		Suppress harmless compiler warnings in union-vtab. (check-in: 4d147a1e user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

  1414   1414     $(TOP)\ext\misc\nextchar.c \
  1415   1415     $(TOP)\ext\misc\percentile.c \
  1416   1416     $(TOP)\ext\misc\regexp.c \
  1417   1417     $(TOP)\ext\misc\remember.c \
  1418   1418     $(TOP)\ext\misc\series.c \
  1419   1419     $(TOP)\ext\misc\spellfix.c \
  1420   1420     $(TOP)\ext\misc\totype.c \
         1421  +  $(TOP)\ext\misc\unionvtab.c \
  1421   1422     $(TOP)\ext\misc\wholenumber.c
  1422   1423   
  1423   1424   # Source code to the library files needed by the test fixture
  1424   1425   # (non-amalgamation)
  1425   1426   #
  1426   1427   TESTSRC2 = \
  1427   1428     $(SRC00) \

Changes to ext/misc/unionvtab.c.

   129    129   ** a copy of the nul-terminated string passed as the second argument.
   130    130   ** If the allocation is attempted but fails, NULL is returned and *pRc is 
   131    131   ** set to SQLITE_NOMEM.
   132    132   */
   133    133   static char *unionStrdup(int *pRc, const char *zIn){
   134    134     char *zRet = 0;
   135    135     if( zIn ){
   136         -    int nByte = strlen(zIn) + 1;
          136  +    int nByte = (int)strlen(zIn) + 1;
   137    137       zRet = unionMalloc(pRc, nByte);
   138    138       if( zRet ){
   139    139         memcpy(zRet, zIn, nByte);
   140    140       }
   141    141     }
   142    142     return zRet;
   143    143   }