Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Compiler warning (MSVC) in timeline.c, found by Kevin, reported on fossil-users list |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
fe3d30fc60e2eafcd9a21269df7fa932 |
| User & Date: | jan.nijtmans 2016-10-29 16:50:50.319 |
Context
|
2016-10-31
| ||
| 10:55 | Omit deleted unversioned files from the /uvlist page unless the showdel=1 query parameter is used. check-in: a3608700ad user: drh tags: trunk | |
|
2016-10-29
| ||
| 16:50 | Compiler warning (MSVC) in timeline.c, found by Kevin, reported on fossil-users list check-in: fe3d30fc60 user: jan.nijtmans tags: trunk | |
|
2016-10-28
| ||
| 22:51 | merge fork. check-in: cf2adc71e8 user: mgagnon tags: trunk | |
Changes
Changes to src/graph.c.
| ︙ | ︙ | |||
345 346 347 348 349 350 351 |
*/
void graph_finish(GraphContext *p, int omitDescenders){
GraphRow *pRow, *pDesc, *pDup, *pLoop, *pParent;
int i, j;
u64 mask;
int hasDup = 0; /* True if one or more isDup entries */
const char *zTrunk;
| | | 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 |
*/
void graph_finish(GraphContext *p, int omitDescenders){
GraphRow *pRow, *pDesc, *pDup, *pLoop, *pParent;
int i, j;
u64 mask;
int hasDup = 0; /* True if one or more isDup entries */
const char *zTrunk;
int railRid[GR_MAX_RAIL]; /* Maps rails to rids for lines
that enter from bottom of screen */
if( p==0 || p->pFirst==0 || p->nErr ) return;
p->nErr = 1; /* Assume an error until proven otherwise */
/* Initialize all rows */
p->nHash = p->nRow*2 + 1;
|
| ︙ | ︙ |
Changes to src/mkindex.c.
| ︙ | ︙ | |||
221 222 223 224 225 226 227 |
aEntry[nUsed].eType |= CMDFLAG_TEST;
}else{
fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
zFile, nLine, j, &zLine[i]);
nErr++;
}
}
| | | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 |
aEntry[nUsed].eType |= CMDFLAG_TEST;
}else{
fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
zFile, nLine, j, &zLine[i]);
nErr++;
}
}
nUsed++;
}
/*
** Check to see if the current line is an #if and if it is, add it to
** the zIf[] string. If the current line is an #endif or #else or #elif
** then cancel the current zIf[] string.
|
| ︙ | ︙ |
Changes to src/search.c.
| ︙ | ︙ | |||
405 406 407 408 409 410 411 | } } /* search_match(TEXT, TEXT, ....) ** ** Using the full-scan search engine created by the most recent call ** to search_init(), match the input the TEXT arguments. | | | 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 |
}
}
/* search_match(TEXT, TEXT, ....)
**
** Using the full-scan search engine created by the most recent call
** to search_init(), match the input the TEXT arguments.
** Remember the results global full-scan search object.
** Return non-zero on a match and zero on a miss.
*/
static void search_match_sqlfunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
|
| ︙ | ︙ |
Changes to src/setup.c.
| ︙ | ︙ | |||
1535 1536 1537 1538 1539 1540 1541 | @ </td></tr></table> @ </div></form> @ <p>Settings marked with (v) are 'versionable' and will be overridden @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt> @ in the check-out root. @ If such a file is present, the corresponding field above is not @ editable.</p><hr /><p> | | | 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 | @ </td></tr></table> @ </div></form> @ <p>Settings marked with (v) are 'versionable' and will be overridden @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt> @ in the check-out root. @ If such a file is present, the corresponding field above is not @ editable.</p><hr /><p> @ These settings work the same as the @ <a href='%R/help?cmd=settings'>fossil set</a> command. db_end_transaction(0); style_footer(); } /* ** WEBPAGE: setup_config |
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
755 756 757 758 759 760 761 |
}
/* mi */
cgi_printf("mi:");
cSep = '[';
for(i=0; i<GR_MAX_RAIL; i++){
if( pRow->mergeIn[i] ){
int mi = i;
| | | 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 |
}
/* mi */
cgi_printf("mi:");
cSep = '[';
for(i=0; i<GR_MAX_RAIL; i++){
if( pRow->mergeIn[i] ){
int mi = i;
if( (pRow->mergeDown >> i) & 1 ) mi = -mi;
cgi_printf("%c%d", cSep, mi);
cSep = ',';
}
}
if( cSep=='[' ) cgi_printf("[");
cgi_printf("],h:\"%!S\"}%s", pRow->zUuid, pRow->pNext ? ",\n" : "];\n");
}
|
| ︙ | ︙ |
Changes to src/xfer.c.
| ︙ | ︙ | |||
2138 2139 2140 2141 2142 2143 2144 |
if( iStatus==4 ) iStatus = 2;
if( iStatus==5 ) iStatus = 1;
}
if( syncFlags & (SYNC_UV_TRACE|SYNC_UV_DRYRUN) ){
const char *zMsg = 0;
switch( iStatus ){
case 0:
| | | 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 |
if( iStatus==4 ) iStatus = 2;
if( iStatus==5 ) iStatus = 1;
}
if( syncFlags & (SYNC_UV_TRACE|SYNC_UV_DRYRUN) ){
const char *zMsg = 0;
switch( iStatus ){
case 0:
case 1: zMsg = "UV-PULL"; break;
case 2: zMsg = "UV-PULL-MTIME-ONLY"; break;
case 4: zMsg = "UV-PUSH-MTIME-ONLY"; break;
case 5: zMsg = "UV-PUSH"; break;
}
if( zMsg ) fossil_print("\r%s: %s\n", zMsg, zName);
if( syncFlags & SYNC_UV_DRYRUN ){
iStatus = 99; /* Prevent any changes or reply messages */
|
| ︙ | ︙ |