Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Eliminate some gcc (4.6) warnings on windows. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
1854d99041f6768d4da908c6bf3a1a38 |
| User & Date: | jan.nijtmans 2012-09-05 20:21:44.261 |
| Original Comment: | Eliminate some gcc (4.6) warnings: <br>src/checkin.c: In function ‘create_manifest’: <br>src/checkin.c:661:7: warning: variable \u2018n;Basename’ set but not used [-Wunused-but-set-variable] <br>src/info.c: In function ‘ci_page’: <br>src/info.c:484:17: warning: variable ‘zBranch’ set but not used [-Wunused-but-set-variable] |
Context
|
2012-09-05
| ||
| 20:45 | Enhancements to localtime processing and to the label resolution on the a=, b=, and c= query parameters to the timeline page. ... (check-in: 41c3c1900b user: drh tags: trunk) | |
| 20:21 | Eliminate some gcc (4.6) warnings on windows. ... (check-in: 1854d99041 user: jan.nijtmans tags: trunk) | |
| 19:07 | Make the 'localtime' modifier for SQLite date/time functions work inside the "fossil sql" command. ... (check-in: 16ab9f25ff user: drh tags: trunk) | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 |
const char *zBrClr, /* Persistent branch color. May be 0 */
const char **azTag, /* Tags to apply to this check-in */
int *pnFBcard /* Number of generated B- and F-cards */
){
char *zDate; /* Date of the check-in */
char *zParentUuid; /* UUID of parent check-in */
Blob filename; /* A single filename */
int nBasename; /* Size of base filename */
Stmt q; /* Query of files changed */
Stmt q2; /* Query of merge parents */
Blob mcksum; /* Manifest checksum */
ManifestFile *pFile; /* File from the baseline */
int nFBcard = 0; /* Number of B-cards and F-cards */
int i; /* Loop counter */
| > > | 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 |
const char *zBrClr, /* Persistent branch color. May be 0 */
const char **azTag, /* Tags to apply to this check-in */
int *pnFBcard /* Number of generated B- and F-cards */
){
char *zDate; /* Date of the check-in */
char *zParentUuid; /* UUID of parent check-in */
Blob filename; /* A single filename */
#if !defined(_WIN32)
int nBasename; /* Size of base filename */
#endif
Stmt q; /* Query of files changed */
Stmt q2; /* Query of merge parents */
Blob mcksum; /* Manifest checksum */
ManifestFile *pFile; /* File from the baseline */
int nFBcard = 0; /* Number of B-cards and F-cards */
int i; /* Loop counter */
|
| ︙ | ︙ | |||
688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 |
" FROM vfile JOIN blob ON vfile.mrid=blob.rid"
" WHERE (NOT deleted OR NOT is_selected(vfile.id))"
" AND vfile.vid=%d"
" ORDER BY if_selected(vfile.id, pathname, origname)",
vid);
blob_zero(&filename);
blob_appendf(&filename, "%s", g.zLocalRoot);
nBasename = blob_size(&filename);
while( db_step(&q)==SQLITE_ROW ){
const char *zName = db_column_text(&q, 0);
const char *zUuid = db_column_text(&q, 1);
const char *zOrig = db_column_text(&q, 2);
int frid = db_column_int(&q, 3);
int isExe = db_column_int(&q, 4);
int isLink = db_column_int(&q, 5);
| > > | 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 |
" FROM vfile JOIN blob ON vfile.mrid=blob.rid"
" WHERE (NOT deleted OR NOT is_selected(vfile.id))"
" AND vfile.vid=%d"
" ORDER BY if_selected(vfile.id, pathname, origname)",
vid);
blob_zero(&filename);
blob_appendf(&filename, "%s", g.zLocalRoot);
#if !defined(_WIN32)
nBasename = blob_size(&filename);
#endif
while( db_step(&q)==SQLITE_ROW ){
const char *zName = db_column_text(&q, 0);
const char *zUuid = db_column_text(&q, 1);
const char *zOrig = db_column_text(&q, 2);
int frid = db_column_int(&q, 3);
int isExe = db_column_int(&q, 4);
int isLink = db_column_int(&q, 5);
|
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 |
const char *zUuid = db_column_text(&q, 0);
char *zTitle = mprintf("Check-in [%.10s]", zUuid);
char *zEUser, *zEComment;
const char *zUser;
const char *zComment;
const char *zDate;
const char *zOrigDate;
const char *zBranch;
style_header(zTitle);
login_anonymous_available();
free(zTitle);
zEUser = db_text(0,
"SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
TAG_USER, rid);
zEComment = db_text(0,
"SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
TAG_COMMENT, rid);
zBranch = db_text("trunk",
"SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
TAG_BRANCH, rid);
zUser = db_column_text(&q, 2);
zComment = db_column_text(&q, 3);
zDate = db_column_text(&q,1);
zOrigDate = db_column_text(&q, 4);
@ <div class="section">Overview</div>
@ <table class="label-value">
@ <tr><th>SHA1 Hash:</th><td>%s(zUuid)
| > > > > | 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 |
const char *zUuid = db_column_text(&q, 0);
char *zTitle = mprintf("Check-in [%.10s]", zUuid);
char *zEUser, *zEComment;
const char *zUser;
const char *zComment;
const char *zDate;
const char *zOrigDate;
#if 0
const char *zBranch;
#endif
style_header(zTitle);
login_anonymous_available();
free(zTitle);
zEUser = db_text(0,
"SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
TAG_USER, rid);
zEComment = db_text(0,
"SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
TAG_COMMENT, rid);
#if 0
zBranch = db_text("trunk",
"SELECT value FROM tagxref WHERE tagid=%d AND rid=%d",
TAG_BRANCH, rid);
#endif
zUser = db_column_text(&q, 2);
zComment = db_column_text(&q, 3);
zDate = db_column_text(&q,1);
zOrigDate = db_column_text(&q, 4);
@ <div class="section">Overview</div>
@ <table class="label-value">
@ <tr><th>SHA1 Hash:</th><td>%s(zUuid)
|
| ︙ | ︙ |