Fossil SCM
Avoid using the %lld printf conversion since windows does not support it.
Commit
be467e93287897e23a2d00f004bbd7d2b7a2f1ac
Parent
2a8ff5bff4e66a0…
1 file changed
+4
-4
+4
-4
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -139,11 +139,11 @@ | ||
| 139 | 139 | " WHERE type='ci'" |
| 140 | 140 | " ORDER BY mtime ASC", |
| 141 | 141 | TAG_BRANCH |
| 142 | 142 | ); |
| 143 | 143 | while( db_step(&q)==SQLITE_ROW ){ |
| 144 | - sqlite3_int64 secondsSince1970 = db_column_int64(&q, 0); | |
| 144 | + const char *zSecondsSince1970 = db_column_text(&q, 0); | |
| 145 | 145 | int ckinId = db_column_int(&q, 1); |
| 146 | 146 | const char *zComment = db_column_text(&q, 2); |
| 147 | 147 | const char *zUser = db_column_text(&q, 3); |
| 148 | 148 | const char *zBranch = db_column_text(&q, 4); |
| 149 | 149 | char *zBr; |
| @@ -159,11 +159,11 @@ | ||
| 159 | 159 | } |
| 160 | 160 | printf("commit refs/heads/%s\nmark :%d\n", zBr, ckinId+firstCkin); |
| 161 | 161 | free(zBr); |
| 162 | 162 | printf("committer"); |
| 163 | 163 | print_person(zUser); |
| 164 | - printf(" %lld +0000\n", secondsSince1970); | |
| 164 | + printf(" %s +0000\n", zSecondsSince1970); | |
| 165 | 165 | if( zComment==0 ) zComment = "null comment"; |
| 166 | 166 | printf("data %d\n%s\n", (int)strlen(zComment), zComment); |
| 167 | 167 | p = manifest_get(ckinId, CFTYPE_ANY); |
| 168 | 168 | zFromType = "from"; |
| 169 | 169 | for(i=0; i<p->nParent; i++){ |
| @@ -197,16 +197,16 @@ | ||
| 197 | 197 | " WHERE tagtype=1 AND tagname GLOB 'sym-*'" |
| 198 | 198 | ); |
| 199 | 199 | while( db_step(&q)==SQLITE_ROW ){ |
| 200 | 200 | const char *zTagname = db_column_text(&q, 0); |
| 201 | 201 | int rid = db_column_int(&q, 1); |
| 202 | - sqlite3_int64 secSince1970 = db_column_int64(&q, 2); | |
| 202 | + const char *zSecSince1970 = db_column_text(&q, 2); | |
| 203 | 203 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 204 | 204 | zTagname += 4; |
| 205 | 205 | printf("tag %s\n", zTagname); |
| 206 | 206 | printf("from :%d\n", rid+firstCkin); |
| 207 | - printf("tagger <tagger> %lld +0000\n", secSince1970); | |
| 207 | + printf("tagger <tagger> %s +0000\n", zSecSince1970); | |
| 208 | 208 | printf("data 0\n"); |
| 209 | 209 | } |
| 210 | 210 | db_finalize(&q); |
| 211 | 211 | bag_clear(&vers); |
| 212 | 212 | } |
| 213 | 213 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -139,11 +139,11 @@ | |
| 139 | " WHERE type='ci'" |
| 140 | " ORDER BY mtime ASC", |
| 141 | TAG_BRANCH |
| 142 | ); |
| 143 | while( db_step(&q)==SQLITE_ROW ){ |
| 144 | sqlite3_int64 secondsSince1970 = db_column_int64(&q, 0); |
| 145 | int ckinId = db_column_int(&q, 1); |
| 146 | const char *zComment = db_column_text(&q, 2); |
| 147 | const char *zUser = db_column_text(&q, 3); |
| 148 | const char *zBranch = db_column_text(&q, 4); |
| 149 | char *zBr; |
| @@ -159,11 +159,11 @@ | |
| 159 | } |
| 160 | printf("commit refs/heads/%s\nmark :%d\n", zBr, ckinId+firstCkin); |
| 161 | free(zBr); |
| 162 | printf("committer"); |
| 163 | print_person(zUser); |
| 164 | printf(" %lld +0000\n", secondsSince1970); |
| 165 | if( zComment==0 ) zComment = "null comment"; |
| 166 | printf("data %d\n%s\n", (int)strlen(zComment), zComment); |
| 167 | p = manifest_get(ckinId, CFTYPE_ANY); |
| 168 | zFromType = "from"; |
| 169 | for(i=0; i<p->nParent; i++){ |
| @@ -197,16 +197,16 @@ | |
| 197 | " WHERE tagtype=1 AND tagname GLOB 'sym-*'" |
| 198 | ); |
| 199 | while( db_step(&q)==SQLITE_ROW ){ |
| 200 | const char *zTagname = db_column_text(&q, 0); |
| 201 | int rid = db_column_int(&q, 1); |
| 202 | sqlite3_int64 secSince1970 = db_column_int64(&q, 2); |
| 203 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 204 | zTagname += 4; |
| 205 | printf("tag %s\n", zTagname); |
| 206 | printf("from :%d\n", rid+firstCkin); |
| 207 | printf("tagger <tagger> %lld +0000\n", secSince1970); |
| 208 | printf("data 0\n"); |
| 209 | } |
| 210 | db_finalize(&q); |
| 211 | bag_clear(&vers); |
| 212 | } |
| 213 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -139,11 +139,11 @@ | |
| 139 | " WHERE type='ci'" |
| 140 | " ORDER BY mtime ASC", |
| 141 | TAG_BRANCH |
| 142 | ); |
| 143 | while( db_step(&q)==SQLITE_ROW ){ |
| 144 | const char *zSecondsSince1970 = db_column_text(&q, 0); |
| 145 | int ckinId = db_column_int(&q, 1); |
| 146 | const char *zComment = db_column_text(&q, 2); |
| 147 | const char *zUser = db_column_text(&q, 3); |
| 148 | const char *zBranch = db_column_text(&q, 4); |
| 149 | char *zBr; |
| @@ -159,11 +159,11 @@ | |
| 159 | } |
| 160 | printf("commit refs/heads/%s\nmark :%d\n", zBr, ckinId+firstCkin); |
| 161 | free(zBr); |
| 162 | printf("committer"); |
| 163 | print_person(zUser); |
| 164 | printf(" %s +0000\n", zSecondsSince1970); |
| 165 | if( zComment==0 ) zComment = "null comment"; |
| 166 | printf("data %d\n%s\n", (int)strlen(zComment), zComment); |
| 167 | p = manifest_get(ckinId, CFTYPE_ANY); |
| 168 | zFromType = "from"; |
| 169 | for(i=0; i<p->nParent; i++){ |
| @@ -197,16 +197,16 @@ | |
| 197 | " WHERE tagtype=1 AND tagname GLOB 'sym-*'" |
| 198 | ); |
| 199 | while( db_step(&q)==SQLITE_ROW ){ |
| 200 | const char *zTagname = db_column_text(&q, 0); |
| 201 | int rid = db_column_int(&q, 1); |
| 202 | const char *zSecSince1970 = db_column_text(&q, 2); |
| 203 | if( rid==0 || !bag_find(&vers, rid) ) continue; |
| 204 | zTagname += 4; |
| 205 | printf("tag %s\n", zTagname); |
| 206 | printf("from :%d\n", rid+firstCkin); |
| 207 | printf("tagger <tagger> %s +0000\n", zSecSince1970); |
| 208 | printf("data 0\n"); |
| 209 | } |
| 210 | db_finalize(&q); |
| 211 | bag_clear(&vers); |
| 212 | } |
| 213 |