/ Check-in [2777ca78]
Login

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

Overview
Comment:One additional intptr_t conversion (in the same vein as check-in 4824) (CVS 4859)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:2777ca788204c37ae5607f7acabe78f414255fa2
User & Date: mlcreech 2008-03-13 23:34:38
Context
2008-03-14
04:11
Allow the testfixture to be built even when using the amalgamation (CVS 4860) check-in: 8a726e37 user: mlcreech tags: trunk
2008-03-13
23:34
One additional intptr_t conversion (in the same vein as check-in 4824) (CVS 4859) check-in: 2777ca78 user: mlcreech tags: trunk
23:28
Apply patch for #2915 to add target extension for executables (CVS 4858) check-in: 63fc7b72 user: mlcreech tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/vdbemem.c.

928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
        return 0;
      }
    }
    sqlite3VdbeMemNulTerminate(pVal);
  }else{
    assert( (pVal->flags&MEM_Blob)==0 );
    sqlite3VdbeMemStringify(pVal, enc);
    assert( 0==(1&(int)pVal->z) );
  }
  assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || pVal->db==0
              || pVal->db->mallocFailed );
  if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){
    return pVal->z;
  }else{
    return 0;







|







928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
        return 0;
      }
    }
    sqlite3VdbeMemNulTerminate(pVal);
  }else{
    assert( (pVal->flags&MEM_Blob)==0 );
    sqlite3VdbeMemStringify(pVal, enc);
    assert( 0==(1&(intptr_t)pVal->z) );
  }
  assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || pVal->db==0
              || pVal->db->mallocFailed );
  if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){
    return pVal->z;
  }else{
    return 0;