Fossil: Check-in [420244cbd3]

Fossil SCM

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

Overview
Comment:Fix harmless compiler warning.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:420244cbd37be65dd3968c9e5b304fa38f7956f9a208426059578bf93b2983c6
User & Date: mistachkin 2019-05-18 00:19:00
Context
2019-05-18
21:05
Back out check-in [344a3331d34d896] because it does not work with openssl-1.0.1. check-in: f08b93daa5 user: drh tags: trunk
20:50
Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now. (Added:) The content is correct, but this check-in shows an unexpected merge. I don't know yet if the extra merge is a bug in fossil or a PBKAC. This check-in was originally to trunk but is now moved to a branch. check-in: 8ac66ef33b user: drh tags: bad-merge
00:19
Fix harmless compiler warning. check-in: 420244cbd3 user: mistachkin tags: trunk
2019-05-17
23:47
Updates to the change log. check-in: 75867c972e user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/timeline.c. 

1992
1993
1994
1995
1996
1997
1998

1999
2000
2001
2002
2003
2004
2005
2006
2007

    }
    if( zYearMonth ){
      zYearMonth = timeline_expand_datetime(zYearMonth);
      blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
                      zYearMonth);
    }
    else if( zYearWeek ){

      zYearWeek = timeline_expand_datetime(zYearWeek);
      char *z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
      if( z && z[0] ){
        zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
                                 zYearWeek);
        zYearWeek = z;
      }else{
        if( strlen(zYearWeek)==7 ){       
          zYearWeekStart = db_text(0,








>

|








1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008

    }
    if( zYearMonth ){
      zYearMonth = timeline_expand_datetime(zYearMonth);
      blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
                      zYearMonth);
    }
    else if( zYearWeek ){
      char *z;
      zYearWeek = timeline_expand_datetime(zYearWeek);
      z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
      if( z && z[0] ){
        zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
                                 zYearWeek);
        zYearWeek = z;
      }else{
        if( strlen(zYearWeek)==7 ){       
          zYearWeekStart = db_text(0,