Fossil SCM

Compiler warning (MSVC) in timeline.c, found by Kevin, reported on fossil-users list

jan.nijtmans 2016-10-29 16:50 trunk
Commit fe3d30fc60e2eafcd9a21269df7fa932338da7ac
Parent cf2adc71e8e362b…
6 files changed +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1
~ src/graph.c ~ src/mkindex.c ~ src/search.c ~ src/setup.c ~ src/timeline.c ~ src/xfer.c
M src/graph.c
+1 -1
--- src/graph.c
+++ src/graph.c
@@ -347,11 +347,11 @@
347347
 GraphRow *pRow, *pDesc, *pDup, *pLoop, *pParent;
348348
 int i, j;
349349
 u64 mask;
350350
 int hasDup = 0; /* True if one or more isDup entries */
351351
 const char *zTrunk;
352
- int railRid[GR_MAX_RAIL]; /* Maps rails to rids for lines
352
+ int railRid[GR_MAX_RAIL]; /* Maps rails to rids for lines
353353
 that enter from bottom of screen */
354354
355355
 if( p==0 || p->pFirst==0 || p->nErr ) return;
356356
 p->nErr = 1; /* Assume an error until proven otherwise */
357357
358358
--- src/graph.c
+++ src/graph.c
@@ -347,11 +347,11 @@
347 GraphRow *pRow, *pDesc, *pDup, *pLoop, *pParent;
348 int i, j;
349 u64 mask;
350 int hasDup = 0; /* True if one or more isDup entries */
351 const char *zTrunk;
352 int railRid[GR_MAX_RAIL]; /* Maps rails to rids for lines
353 that enter from bottom of screen */
354
355 if( p==0 || p->pFirst==0 || p->nErr ) return;
356 p->nErr = 1; /* Assume an error until proven otherwise */
357
358
--- src/graph.c
+++ src/graph.c
@@ -347,11 +347,11 @@
347 GraphRow *pRow, *pDesc, *pDup, *pLoop, *pParent;
348 int i, j;
349 u64 mask;
350 int hasDup = 0; /* True if one or more isDup entries */
351 const char *zTrunk;
352 int railRid[GR_MAX_RAIL]; /* Maps rails to rids for lines
353 that enter from bottom of screen */
354
355 if( p==0 || p->pFirst==0 || p->nErr ) return;
356 p->nErr = 1; /* Assume an error until proven otherwise */
357
358
M src/mkindex.c
+1 -1
--- src/mkindex.c
+++ src/mkindex.c
@@ -223,11 +223,11 @@
223223
 fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
224224
 zFile, nLine, j, &zLine[i]);
225225
 nErr++;
226226
 }
227227
 }
228
-
228
+
229229
 nUsed++;
230230
 }
231231
232232
 /*
233233
 ** Check to see if the current line is an #if and if it is, add it to
234234
--- src/mkindex.c
+++ src/mkindex.c
@@ -223,11 +223,11 @@
223 fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
224 zFile, nLine, j, &zLine[i]);
225 nErr++;
226 }
227 }
228
229 nUsed++;
230 }
231
232 /*
233 ** Check to see if the current line is an #if and if it is, add it to
234
--- src/mkindex.c
+++ src/mkindex.c
@@ -223,11 +223,11 @@
223 fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
224 zFile, nLine, j, &zLine[i]);
225 nErr++;
226 }
227 }
228
229 nUsed++;
230 }
231
232 /*
233 ** Check to see if the current line is an #if and if it is, add it to
234
M src/search.c
+1 -1
--- src/search.c
+++ src/search.c
@@ -407,11 +407,11 @@
407407
408408
 /* search_match(TEXT, TEXT, ....)
409409
 **
410410
 ** Using the full-scan search engine created by the most recent call
411411
 ** to search_init(), match the input the TEXT arguments.
412
-** Remember the results global full-scan search object.
412
+** Remember the results global full-scan search object.
413413
 ** Return non-zero on a match and zero on a miss.
414414
 */
415415
 static void search_match_sqlfunc(
416416
 sqlite3_context *context,
417417
 int argc,
418418
--- src/search.c
+++ src/search.c
@@ -407,11 +407,11 @@
407
408 /* search_match(TEXT, TEXT, ....)
409 **
410 ** Using the full-scan search engine created by the most recent call
411 ** to search_init(), match the input the TEXT arguments.
412 ** Remember the results global full-scan search object.
413 ** Return non-zero on a match and zero on a miss.
414 */
415 static void search_match_sqlfunc(
416 sqlite3_context *context,
417 int argc,
418
--- src/search.c
+++ src/search.c
@@ -407,11 +407,11 @@
407
408 /* search_match(TEXT, TEXT, ....)
409 **
410 ** Using the full-scan search engine created by the most recent call
411 ** to search_init(), match the input the TEXT arguments.
412 ** Remember the results global full-scan search object.
413 ** Return non-zero on a match and zero on a miss.
414 */
415 static void search_match_sqlfunc(
416 sqlite3_context *context,
417 int argc,
418
M src/setup.c
+1 -1
--- src/setup.c
+++ src/setup.c
@@ -1537,11 +1537,11 @@
15371537
 @ <p>Settings marked with (v) are 'versionable' and will be overridden
15381538
 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>
15391539
 @ in the check-out root.
15401540
 @ If such a file is present, the corresponding field above is not
15411541
 @ editable.</p><hr /><p>
1542
- @ These settings work the same as the
1542
+ @ These settings work the same as the
15431543
 @ <a href='%R/help?cmd=settings'>fossil set</a> command.
15441544
 db_end_transaction(0);
15451545
 style_footer();
15461546
 }
15471547
15481548
--- src/setup.c
+++ src/setup.c
@@ -1537,11 +1537,11 @@
1537 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1538 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>
1539 @ in the check-out root.
1540 @ If such a file is present, the corresponding field above is not
1541 @ editable.</p><hr /><p>
1542 @ These settings work the same as the
1543 @ <a href='%R/help?cmd=settings'>fossil set</a> command.
1544 db_end_transaction(0);
1545 style_footer();
1546 }
1547
1548
--- src/setup.c
+++ src/setup.c
@@ -1537,11 +1537,11 @@
1537 @ <p>Settings marked with (v) are 'versionable' and will be overridden
1538 @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>
1539 @ in the check-out root.
1540 @ If such a file is present, the corresponding field above is not
1541 @ editable.</p><hr /><p>
1542 @ These settings work the same as the
1543 @ <a href='%R/help?cmd=settings'>fossil set</a> command.
1544 db_end_transaction(0);
1545 style_footer();
1546 }
1547
1548
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -757,11 +757,11 @@
757757
 cgi_printf("mi:");
758758
 cSep = '[';
759759
 for(i=0; i<GR_MAX_RAIL; i++){
760760
 if( pRow->mergeIn[i] ){
761761
 int mi = i;
762
- if( pRow->mergeDown & (1<<i) ) mi = -mi;
762
+ if( (pRow->mergeDown >> i) & 1 ) mi = -mi;
763763
 cgi_printf("%c%d", cSep, mi);
764764
 cSep = ',';
765765
 }
766766
 }
767767
 if( cSep=='[' ) cgi_printf("[");
768768
--- src/timeline.c
+++ src/timeline.c
@@ -757,11 +757,11 @@
757 cgi_printf("mi:");
758 cSep = '[';
759 for(i=0; i<GR_MAX_RAIL; i++){
760 if( pRow->mergeIn[i] ){
761 int mi = i;
762 if( pRow->mergeDown & (1<<i) ) mi = -mi;
763 cgi_printf("%c%d", cSep, mi);
764 cSep = ',';
765 }
766 }
767 if( cSep=='[' ) cgi_printf("[");
768
--- src/timeline.c
+++ src/timeline.c
@@ -757,11 +757,11 @@
757 cgi_printf("mi:");
758 cSep = '[';
759 for(i=0; i<GR_MAX_RAIL; i++){
760 if( pRow->mergeIn[i] ){
761 int mi = i;
762 if( (pRow->mergeDown >> i) & 1 ) mi = -mi;
763 cgi_printf("%c%d", cSep, mi);
764 cSep = ',';
765 }
766 }
767 if( cSep=='[' ) cgi_printf("[");
768
M src/xfer.c
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -2140,11 +2140,11 @@
21402140
 }
21412141
 if( syncFlags & (SYNC_UV_TRACE|SYNC_UV_DRYRUN) ){
21422142
 const char *zMsg = 0;
21432143
 switch( iStatus ){
21442144
 case 0:
2145
- case 1: zMsg = "UV-PULL"; break;
2145
+ case 1: zMsg = "UV-PULL"; break;
21462146
 case 2: zMsg = "UV-PULL-MTIME-ONLY"; break;
21472147
 case 4: zMsg = "UV-PUSH-MTIME-ONLY"; break;
21482148
 case 5: zMsg = "UV-PUSH"; break;
21492149
 }
21502150
 if( zMsg ) fossil_print("\r%s: %s\n", zMsg, zName);
21512151
--- src/xfer.c
+++ src/xfer.c
@@ -2140,11 +2140,11 @@
2140 }
2141 if( syncFlags & (SYNC_UV_TRACE|SYNC_UV_DRYRUN) ){
2142 const char *zMsg = 0;
2143 switch( iStatus ){
2144 case 0:
2145 case 1: zMsg = "UV-PULL"; break;
2146 case 2: zMsg = "UV-PULL-MTIME-ONLY"; break;
2147 case 4: zMsg = "UV-PUSH-MTIME-ONLY"; break;
2148 case 5: zMsg = "UV-PUSH"; break;
2149 }
2150 if( zMsg ) fossil_print("\r%s: %s\n", zMsg, zName);
2151
--- src/xfer.c
+++ src/xfer.c
@@ -2140,11 +2140,11 @@
2140 }
2141 if( syncFlags & (SYNC_UV_TRACE|SYNC_UV_DRYRUN) ){
2142 const char *zMsg = 0;
2143 switch( iStatus ){
2144 case 0:
2145 case 1: zMsg = "UV-PULL"; break;
2146 case 2: zMsg = "UV-PULL-MTIME-ONLY"; break;
2147 case 4: zMsg = "UV-PUSH-MTIME-ONLY"; break;
2148 case 5: zMsg = "UV-PUSH"; break;
2149 }
2150 if( zMsg ) fossil_print("\r%s: %s\n", zMsg, zName);
2151

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button