Fossil SCM

Remove extra newlines from calls to fossil_fatal()

andygoth 2016-10-20 16:48 trunk
Commit 2c42b217e5c4f4044ed617562cb68ed1e0c4eb80
Parent 48ecfe6645a86d1…
12 files changed +1 -1 +1 -1 +8 -8 +1 -1 +1 -1 +3 -3 +1 -1 +1 -1 +4 -4 +1 -1 +1 -1 +2 -2
~ src/branch.c ~ src/checkin.c ~ src/deltacmd.c ~ src/export.c ~ src/file.c ~ src/import.c ~ src/info.c ~ src/json_branch.c ~ src/merge3.c ~ src/th_main.c ~ src/tkt.c ~ src/vfile.c
M src/branch.c
+1 -1
--- src/branch.c
+++ src/branch.c
@@ -154,11 +154,11 @@
154154
 if( brid==0 ){
155155
 fossil_fatal("trouble committing manifest: %s", g.zErrMsg);
156156
 }
157157
 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
158158
 if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
159
- fossil_fatal("%s\n", g.zErrMsg);
159
+ fossil_fatal("%s", g.zErrMsg);
160160
 }
161161
 assert( blob_is_reset(&branch) );
162162
 content_deltify(rootid, brid, 0);
163163
 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid);
164164
 fossil_print("New branch: %s\n", zUuid);
165165
--- src/branch.c
+++ src/branch.c
@@ -154,11 +154,11 @@
154 if( brid==0 ){
155 fossil_fatal("trouble committing manifest: %s", g.zErrMsg);
156 }
157 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
158 if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
159 fossil_fatal("%s\n", g.zErrMsg);
160 }
161 assert( blob_is_reset(&branch) );
162 content_deltify(rootid, brid, 0);
163 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid);
164 fossil_print("New branch: %s\n", zUuid);
165
--- src/branch.c
+++ src/branch.c
@@ -154,11 +154,11 @@
154 if( brid==0 ){
155 fossil_fatal("trouble committing manifest: %s", g.zErrMsg);
156 }
157 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
158 if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
159 fossil_fatal("%s", g.zErrMsg);
160 }
161 assert( blob_is_reset(&branch) );
162 content_deltify(rootid, brid, 0);
163 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid);
164 fossil_print("New branch: %s\n", zUuid);
165
M src/checkin.c
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -2245,11 +2245,11 @@
22452245
 fossil_fatal("trouble committing manifest: %s", g.zErrMsg);
22462246
 }
22472247
 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid);
22482248
 if( manifest_crosslink(nvid, &manifest,
22492249
 dryRunFlag ? MC_NONE : MC_PERMIT_HOOKS)==0 ){
2250
- fossil_fatal("%s\n", g.zErrMsg);
2250
+ fossil_fatal("%s", g.zErrMsg);
22512251
 }
22522252
 assert( blob_is_reset(&manifest) );
22532253
 content_deltify(vid, nvid, 0);
22542254
 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid);
22552255
22562256
--- src/checkin.c
+++ src/checkin.c
@@ -2245,11 +2245,11 @@
2245 fossil_fatal("trouble committing manifest: %s", g.zErrMsg);
2246 }
2247 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid);
2248 if( manifest_crosslink(nvid, &manifest,
2249 dryRunFlag ? MC_NONE : MC_PERMIT_HOOKS)==0 ){
2250 fossil_fatal("%s\n", g.zErrMsg);
2251 }
2252 assert( blob_is_reset(&manifest) );
2253 content_deltify(vid, nvid, 0);
2254 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid);
2255
2256
--- src/checkin.c
+++ src/checkin.c
@@ -2245,11 +2245,11 @@
2245 fossil_fatal("trouble committing manifest: %s", g.zErrMsg);
2246 }
2247 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid);
2248 if( manifest_crosslink(nvid, &manifest,
2249 dryRunFlag ? MC_NONE : MC_PERMIT_HOOKS)==0 ){
2250 fossil_fatal("%s", g.zErrMsg);
2251 }
2252 assert( blob_is_reset(&manifest) );
2253 content_deltify(vid, nvid, 0);
2254 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid);
2255
2256
M src/deltacmd.c
+8 -8
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -54,18 +54,18 @@
5454
 Blob orig, target, delta;
5555
 if( g.argc!=5 ){
5656
 usage("ORIGIN TARGET DELTA");
5757
 }
5858
 if( blob_read_from_file(&orig, g.argv[2])<0 ){
59
- fossil_fatal("cannot read %s\n", g.argv[2]);
59
+ fossil_fatal("cannot read %s", g.argv[2]);
6060
 }
6161
 if( blob_read_from_file(&target, g.argv[3])<0 ){
62
- fossil_fatal("cannot read %s\n", g.argv[3]);
62
+ fossil_fatal("cannot read %s", g.argv[3]);
6363
 }
6464
 blob_delta_create(&orig, &target, &delta);
6565
 if( blob_write_to_file(&delta, g.argv[4])<blob_size(&delta) ){
66
- fossil_fatal("cannot write %s\n", g.argv[4]);
66
+ fossil_fatal("cannot write %s", g.argv[4]);
6767
 }
6868
 blob_reset(&orig);
6969
 blob_reset(&target);
7070
 blob_reset(&delta);
7171
 }
@@ -85,14 +85,14 @@
8585
 int sz1, sz2, sz3;
8686
 if( g.argc!=4 ){
8787
 usage("ORIGIN TARGET");
8888
 }
8989
 if( blob_read_from_file(&orig, g.argv[2])<0 ){
90
- fossil_fatal("cannot read %s\n", g.argv[2]);
90
+ fossil_fatal("cannot read %s", g.argv[2]);
9191
 }
9292
 if( blob_read_from_file(&target, g.argv[3])<0 ){
93
- fossil_fatal("cannot read %s\n", g.argv[3]);
93
+ fossil_fatal("cannot read %s", g.argv[3]);
9494
 }
9595
 blob_delta_create(&orig, &target, &delta);
9696
 delta_analyze(blob_buffer(&delta), blob_size(&delta), &nCopy, &nInsert);
9797
 sz1 = blob_size(&orig);
9898
 sz2 = blob_size(&target);
@@ -153,18 +153,18 @@
153153
 Blob orig, target, delta;
154154
 if( g.argc!=5 ){
155155
 usage("ORIGIN DELTA TARGET");
156156
 }
157157
 if( blob_read_from_file(&orig, g.argv[2])<0 ){
158
- fossil_fatal("cannot read %s\n", g.argv[2]);
158
+ fossil_fatal("cannot read %s", g.argv[2]);
159159
 }
160160
 if( blob_read_from_file(&delta, g.argv[3])<0 ){
161
- fossil_fatal("cannot read %s\n", g.argv[3]);
161
+ fossil_fatal("cannot read %s", g.argv[3]);
162162
 }
163163
 blob_delta_apply(&orig, &delta, &target);
164164
 if( blob_write_to_file(&target, g.argv[4])<blob_size(&target) ){
165
- fossil_fatal("cannot write %s\n", g.argv[4]);
165
+ fossil_fatal("cannot write %s", g.argv[4]);
166166
 }
167167
 blob_reset(&orig);
168168
 blob_reset(&target);
169169
 blob_reset(&delta);
170170
 }
171171
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -54,18 +54,18 @@
54 Blob orig, target, delta;
55 if( g.argc!=5 ){
56 usage("ORIGIN TARGET DELTA");
57 }
58 if( blob_read_from_file(&orig, g.argv[2])<0 ){
59 fossil_fatal("cannot read %s\n", g.argv[2]);
60 }
61 if( blob_read_from_file(&target, g.argv[3])<0 ){
62 fossil_fatal("cannot read %s\n", g.argv[3]);
63 }
64 blob_delta_create(&orig, &target, &delta);
65 if( blob_write_to_file(&delta, g.argv[4])<blob_size(&delta) ){
66 fossil_fatal("cannot write %s\n", g.argv[4]);
67 }
68 blob_reset(&orig);
69 blob_reset(&target);
70 blob_reset(&delta);
71 }
@@ -85,14 +85,14 @@
85 int sz1, sz2, sz3;
86 if( g.argc!=4 ){
87 usage("ORIGIN TARGET");
88 }
89 if( blob_read_from_file(&orig, g.argv[2])<0 ){
90 fossil_fatal("cannot read %s\n", g.argv[2]);
91 }
92 if( blob_read_from_file(&target, g.argv[3])<0 ){
93 fossil_fatal("cannot read %s\n", g.argv[3]);
94 }
95 blob_delta_create(&orig, &target, &delta);
96 delta_analyze(blob_buffer(&delta), blob_size(&delta), &nCopy, &nInsert);
97 sz1 = blob_size(&orig);
98 sz2 = blob_size(&target);
@@ -153,18 +153,18 @@
153 Blob orig, target, delta;
154 if( g.argc!=5 ){
155 usage("ORIGIN DELTA TARGET");
156 }
157 if( blob_read_from_file(&orig, g.argv[2])<0 ){
158 fossil_fatal("cannot read %s\n", g.argv[2]);
159 }
160 if( blob_read_from_file(&delta, g.argv[3])<0 ){
161 fossil_fatal("cannot read %s\n", g.argv[3]);
162 }
163 blob_delta_apply(&orig, &delta, &target);
164 if( blob_write_to_file(&target, g.argv[4])<blob_size(&target) ){
165 fossil_fatal("cannot write %s\n", g.argv[4]);
166 }
167 blob_reset(&orig);
168 blob_reset(&target);
169 blob_reset(&delta);
170 }
171
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -54,18 +54,18 @@
54 Blob orig, target, delta;
55 if( g.argc!=5 ){
56 usage("ORIGIN TARGET DELTA");
57 }
58 if( blob_read_from_file(&orig, g.argv[2])<0 ){
59 fossil_fatal("cannot read %s", g.argv[2]);
60 }
61 if( blob_read_from_file(&target, g.argv[3])<0 ){
62 fossil_fatal("cannot read %s", g.argv[3]);
63 }
64 blob_delta_create(&orig, &target, &delta);
65 if( blob_write_to_file(&delta, g.argv[4])<blob_size(&delta) ){
66 fossil_fatal("cannot write %s", g.argv[4]);
67 }
68 blob_reset(&orig);
69 blob_reset(&target);
70 blob_reset(&delta);
71 }
@@ -85,14 +85,14 @@
85 int sz1, sz2, sz3;
86 if( g.argc!=4 ){
87 usage("ORIGIN TARGET");
88 }
89 if( blob_read_from_file(&orig, g.argv[2])<0 ){
90 fossil_fatal("cannot read %s", g.argv[2]);
91 }
92 if( blob_read_from_file(&target, g.argv[3])<0 ){
93 fossil_fatal("cannot read %s", g.argv[3]);
94 }
95 blob_delta_create(&orig, &target, &delta);
96 delta_analyze(blob_buffer(&delta), blob_size(&delta), &nCopy, &nInsert);
97 sz1 = blob_size(&orig);
98 sz2 = blob_size(&target);
@@ -153,18 +153,18 @@
153 Blob orig, target, delta;
154 if( g.argc!=5 ){
155 usage("ORIGIN DELTA TARGET");
156 }
157 if( blob_read_from_file(&orig, g.argv[2])<0 ){
158 fossil_fatal("cannot read %s", g.argv[2]);
159 }
160 if( blob_read_from_file(&delta, g.argv[3])<0 ){
161 fossil_fatal("cannot read %s", g.argv[3]);
162 }
163 blob_delta_apply(&orig, &delta, &target);
164 if( blob_write_to_file(&target, g.argv[4])<blob_size(&target) ){
165 fossil_fatal("cannot write %s", g.argv[4]);
166 }
167 blob_reset(&orig);
168 blob_reset(&target);
169 blob_reset(&delta);
170 }
171
M src/export.c
+1 -1
--- src/export.c
+++ src/export.c
@@ -363,11 +363,11 @@
363363
 f = fossil_fopen(markfile_in, "r");
364364
 if( f==0 ){
365365
 fossil_fatal("cannot open %s for reading", markfile_in);
366366
 }
367367
 if(import_marks(f, &blobs, &vers)<0){
368
- fossil_fatal("error importing marks from file: %s\n", markfile_in);
368
+ fossil_fatal("error importing marks from file: %s", markfile_in);
369369
 }
370370
 db_prepare(&qb, "INSERT OR IGNORE INTO oldblob VALUES (:rid)");
371371
 db_prepare(&qc, "INSERT OR IGNORE INTO oldcommit VALUES (:rid)");
372372
 rid = bag_first(&blobs);
373373
 if(rid!=0){
374374
--- src/export.c
+++ src/export.c
@@ -363,11 +363,11 @@
363 f = fossil_fopen(markfile_in, "r");
364 if( f==0 ){
365 fossil_fatal("cannot open %s for reading", markfile_in);
366 }
367 if(import_marks(f, &blobs, &vers)<0){
368 fossil_fatal("error importing marks from file: %s\n", markfile_in);
369 }
370 db_prepare(&qb, "INSERT OR IGNORE INTO oldblob VALUES (:rid)");
371 db_prepare(&qc, "INSERT OR IGNORE INTO oldcommit VALUES (:rid)");
372 rid = bag_first(&blobs);
373 if(rid!=0){
374
--- src/export.c
+++ src/export.c
@@ -363,11 +363,11 @@
363 f = fossil_fopen(markfile_in, "r");
364 if( f==0 ){
365 fossil_fatal("cannot open %s for reading", markfile_in);
366 }
367 if(import_marks(f, &blobs, &vers)<0){
368 fossil_fatal("error importing marks from file: %s", markfile_in);
369 }
370 db_prepare(&qb, "INSERT OR IGNORE INTO oldblob VALUES (:rid)");
371 db_prepare(&qc, "INSERT OR IGNORE INTO oldcommit VALUES (:rid)");
372 rid = bag_first(&blobs);
373 if(rid!=0){
374
M src/file.c
+1 -1
--- src/file.c
+++ src/file.c
@@ -863,11 +863,11 @@
863863
 #ifdef _WIN32
864864
 win32_getcwd(zBuf, nBuf);
865865
 #else
866866
 if( getcwd(zBuf, nBuf-1)==0 ){
867867
 if( errno==ERANGE ){
868
- fossil_fatal("pwd too big: max %d\n", nBuf-1);
868
+ fossil_fatal("pwd too big: max %d", nBuf-1);
869869
 }else{
870870
 fossil_fatal("cannot find current working directory; %s",
871871
 strerror(errno));
872872
 }
873873
 }
874874
--- src/file.c
+++ src/file.c
@@ -863,11 +863,11 @@
863 #ifdef _WIN32
864 win32_getcwd(zBuf, nBuf);
865 #else
866 if( getcwd(zBuf, nBuf-1)==0 ){
867 if( errno==ERANGE ){
868 fossil_fatal("pwd too big: max %d\n", nBuf-1);
869 }else{
870 fossil_fatal("cannot find current working directory; %s",
871 strerror(errno));
872 }
873 }
874
--- src/file.c
+++ src/file.c
@@ -863,11 +863,11 @@
863 #ifdef _WIN32
864 win32_getcwd(zBuf, nBuf);
865 #else
866 if( getcwd(zBuf, nBuf-1)==0 ){
867 if( errno==ERANGE ){
868 fossil_fatal("pwd too big: max %d", nBuf-1);
869 }else{
870 fossil_fatal("cannot find current working directory; %s",
871 strerror(errno));
872 }
873 }
874
M src/import.c
+3 -3
--- src/import.c
+++ src/import.c
@@ -1768,14 +1768,14 @@
17681768
 );
17691769
17701770
 if( markfile_in ){
17711771
 FILE *f = fossil_fopen(markfile_in, "r");
17721772
 if( !f ){
1773
- fossil_fatal("cannot open %s for reading\n", markfile_in);
1773
+ fossil_fatal("cannot open %s for reading", markfile_in);
17741774
 }
17751775
 if(import_marks(f, &blobs, NULL)<0){
1776
- fossil_fatal("error importing marks from file: %s\n", markfile_in);
1776
+ fossil_fatal("error importing marks from file: %s", markfile_in);
17771777
 }
17781778
 fclose(f);
17791779
 }
17801780
17811781
 manifest_crosslink_begin();
@@ -1805,11 +1805,11 @@
18051805
 }
18061806
 }
18071807
 db_finalize(&q_marks);
18081808
 f = fossil_fopen(markfile_out, "w");
18091809
 if( !f ){
1810
- fossil_fatal("cannot open %s for writing\n", markfile_out);
1810
+ fossil_fatal("cannot open %s for writing", markfile_out);
18111811
 }
18121812
 export_marks(f, &blobs, &vers);
18131813
 fclose(f);
18141814
 bag_clear(&blobs);
18151815
 bag_clear(&vers);
18161816
--- src/import.c
+++ src/import.c
@@ -1768,14 +1768,14 @@
1768 );
1769
1770 if( markfile_in ){
1771 FILE *f = fossil_fopen(markfile_in, "r");
1772 if( !f ){
1773 fossil_fatal("cannot open %s for reading\n", markfile_in);
1774 }
1775 if(import_marks(f, &blobs, NULL)<0){
1776 fossil_fatal("error importing marks from file: %s\n", markfile_in);
1777 }
1778 fclose(f);
1779 }
1780
1781 manifest_crosslink_begin();
@@ -1805,11 +1805,11 @@
1805 }
1806 }
1807 db_finalize(&q_marks);
1808 f = fossil_fopen(markfile_out, "w");
1809 if( !f ){
1810 fossil_fatal("cannot open %s for writing\n", markfile_out);
1811 }
1812 export_marks(f, &blobs, &vers);
1813 fclose(f);
1814 bag_clear(&blobs);
1815 bag_clear(&vers);
1816
--- src/import.c
+++ src/import.c
@@ -1768,14 +1768,14 @@
1768 );
1769
1770 if( markfile_in ){
1771 FILE *f = fossil_fopen(markfile_in, "r");
1772 if( !f ){
1773 fossil_fatal("cannot open %s for reading", markfile_in);
1774 }
1775 if(import_marks(f, &blobs, NULL)<0){
1776 fossil_fatal("error importing marks from file: %s", markfile_in);
1777 }
1778 fclose(f);
1779 }
1780
1781 manifest_crosslink_begin();
@@ -1805,11 +1805,11 @@
1805 }
1806 }
1807 db_finalize(&q_marks);
1808 f = fossil_fopen(markfile_out, "w");
1809 if( !f ){
1810 fossil_fatal("cannot open %s for writing", markfile_out);
1811 }
1812 export_marks(f, &blobs, &vers);
1813 fclose(f);
1814 bag_clear(&blobs);
1815 bag_clear(&vers);
1816
M src/info.c
+1 -1
--- src/info.c
+++ src/info.c
@@ -231,11 +231,11 @@
231231
 db_int(-1, "SELECT count(*) FROM event WHERE type='ci' /*scan*/"));
232232
 }else{
233233
 int rid;
234234
 rid = name_to_rid(g.argv[2]);
235235
 if( rid==0 ){
236
- fossil_fatal("no such object: %s\n", g.argv[2]);
236
+ fossil_fatal("no such object: %s", g.argv[2]);
237237
 }
238238
 show_common_info(rid, "uuid:", 1, 1);
239239
 }
240240
 }
241241
242242
--- src/info.c
+++ src/info.c
@@ -231,11 +231,11 @@
231 db_int(-1, "SELECT count(*) FROM event WHERE type='ci' /*scan*/"));
232 }else{
233 int rid;
234 rid = name_to_rid(g.argv[2]);
235 if( rid==0 ){
236 fossil_fatal("no such object: %s\n", g.argv[2]);
237 }
238 show_common_info(rid, "uuid:", 1, 1);
239 }
240 }
241
242
--- src/info.c
+++ src/info.c
@@ -231,11 +231,11 @@
231 db_int(-1, "SELECT count(*) FROM event WHERE type='ci' /*scan*/"));
232 }else{
233 int rid;
234 rid = name_to_rid(g.argv[2]);
235 if( rid==0 ){
236 fossil_fatal("no such object: %s", g.argv[2]);
237 }
238 show_common_info(rid, "uuid:", 1, 1);
239 }
240 }
241
242
M src/json_branch.c
+1 -1
--- src/json_branch.c
+++ src/json_branch.c
@@ -292,11 +292,11 @@
292292
 if( brid==0 ){
293293
 fossil_fatal("Problem committing manifest: %s", g.zErrMsg);
294294
 }
295295
 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
296296
 if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
297
- fossil_fatal("%s\n", g.zErrMsg);
297
+ fossil_fatal("%s", g.zErrMsg);
298298
 }
299299
 assert( blob_is_reset(&branch) );
300300
 content_deltify(rootid, brid, 0);
301301
 if( zNewRid ){
302302
 *zNewRid = brid;
303303
--- src/json_branch.c
+++ src/json_branch.c
@@ -292,11 +292,11 @@
292 if( brid==0 ){
293 fossil_fatal("Problem committing manifest: %s", g.zErrMsg);
294 }
295 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
296 if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
297 fossil_fatal("%s\n", g.zErrMsg);
298 }
299 assert( blob_is_reset(&branch) );
300 content_deltify(rootid, brid, 0);
301 if( zNewRid ){
302 *zNewRid = brid;
303
--- src/json_branch.c
+++ src/json_branch.c
@@ -292,11 +292,11 @@
292 if( brid==0 ){
293 fossil_fatal("Problem committing manifest: %s", g.zErrMsg);
294 }
295 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
296 if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){
297 fossil_fatal("%s", g.zErrMsg);
298 }
299 assert( blob_is_reset(&branch) );
300 content_deltify(rootid, brid, 0);
301 if( zNewRid ){
302 *zNewRid = brid;
303
M src/merge3.c
+4 -4
--- src/merge3.c
+++ src/merge3.c
@@ -376,21 +376,21 @@
376376
377377
 if( g.argc!=6 ){
378378
 usage("PIVOT V1 V2 MERGED");
379379
 }
380380
 if( blob_read_from_file(&pivot, g.argv[2])<0 ){
381
- fossil_fatal("cannot read %s\n", g.argv[2]);
381
+ fossil_fatal("cannot read %s", g.argv[2]);
382382
 }
383383
 if( blob_read_from_file(&v1, g.argv[3])<0 ){
384
- fossil_fatal("cannot read %s\n", g.argv[3]);
384
+ fossil_fatal("cannot read %s", g.argv[3]);
385385
 }
386386
 if( blob_read_from_file(&v2, g.argv[4])<0 ){
387
- fossil_fatal("cannot read %s\n", g.argv[4]);
387
+ fossil_fatal("cannot read %s", g.argv[4]);
388388
 }
389389
 blob_merge(&pivot, &v1, &v2, &merged);
390390
 if( blob_write_to_file(&merged, g.argv[5])<blob_size(&merged) ){
391
- fossil_fatal("cannot write %s\n", g.argv[4]);
391
+ fossil_fatal("cannot write %s", g.argv[4]);
392392
 }
393393
 blob_reset(&pivot);
394394
 blob_reset(&v1);
395395
 blob_reset(&v2);
396396
 blob_reset(&merged);
397397
--- src/merge3.c
+++ src/merge3.c
@@ -376,21 +376,21 @@
376
377 if( g.argc!=6 ){
378 usage("PIVOT V1 V2 MERGED");
379 }
380 if( blob_read_from_file(&pivot, g.argv[2])<0 ){
381 fossil_fatal("cannot read %s\n", g.argv[2]);
382 }
383 if( blob_read_from_file(&v1, g.argv[3])<0 ){
384 fossil_fatal("cannot read %s\n", g.argv[3]);
385 }
386 if( blob_read_from_file(&v2, g.argv[4])<0 ){
387 fossil_fatal("cannot read %s\n", g.argv[4]);
388 }
389 blob_merge(&pivot, &v1, &v2, &merged);
390 if( blob_write_to_file(&merged, g.argv[5])<blob_size(&merged) ){
391 fossil_fatal("cannot write %s\n", g.argv[4]);
392 }
393 blob_reset(&pivot);
394 blob_reset(&v1);
395 blob_reset(&v2);
396 blob_reset(&merged);
397
--- src/merge3.c
+++ src/merge3.c
@@ -376,21 +376,21 @@
376
377 if( g.argc!=6 ){
378 usage("PIVOT V1 V2 MERGED");
379 }
380 if( blob_read_from_file(&pivot, g.argv[2])<0 ){
381 fossil_fatal("cannot read %s", g.argv[2]);
382 }
383 if( blob_read_from_file(&v1, g.argv[3])<0 ){
384 fossil_fatal("cannot read %s", g.argv[3]);
385 }
386 if( blob_read_from_file(&v2, g.argv[4])<0 ){
387 fossil_fatal("cannot read %s", g.argv[4]);
388 }
389 blob_merge(&pivot, &v1, &v2, &merged);
390 if( blob_write_to_file(&merged, g.argv[5])<blob_size(&merged) ){
391 fossil_fatal("cannot write %s", g.argv[4]);
392 }
393 blob_reset(&pivot);
394 blob_reset(&v1);
395 blob_reset(&v2);
396 blob_reset(&merged);
397
M src/th_main.c
+1 -1
--- src/th_main.c
+++ src/th_main.c
@@ -2593,11 +2593,11 @@
25932593
 }else if( fossil_stricmp(g.argv[2], "webhook")==0 ){
25942594
 rc = Th_WebpageHook(g.argv[3], (unsigned int)atoi(g.argv[4]));
25952595
 }else if( fossil_stricmp(g.argv[2], "webnotify")==0 ){
25962596
 rc = Th_WebpageNotify(g.argv[3], (unsigned int)atoi(g.argv[4]));
25972597
 }else{
2598
- fossil_fatal("Unknown TH1 hook %s\n", g.argv[2]);
2598
+ fossil_fatal("Unknown TH1 hook %s", g.argv[2]);
25992599
 }
26002600
 if( g.interp ){
26012601
 zResult = (char*)Th_GetResult(g.interp, &nResult);
26022602
 }
26032603
 sendText("RESULT (", -1, 0);
26042604
--- src/th_main.c
+++ src/th_main.c
@@ -2593,11 +2593,11 @@
2593 }else if( fossil_stricmp(g.argv[2], "webhook")==0 ){
2594 rc = Th_WebpageHook(g.argv[3], (unsigned int)atoi(g.argv[4]));
2595 }else if( fossil_stricmp(g.argv[2], "webnotify")==0 ){
2596 rc = Th_WebpageNotify(g.argv[3], (unsigned int)atoi(g.argv[4]));
2597 }else{
2598 fossil_fatal("Unknown TH1 hook %s\n", g.argv[2]);
2599 }
2600 if( g.interp ){
2601 zResult = (char*)Th_GetResult(g.interp, &nResult);
2602 }
2603 sendText("RESULT (", -1, 0);
2604
--- src/th_main.c
+++ src/th_main.c
@@ -2593,11 +2593,11 @@
2593 }else if( fossil_stricmp(g.argv[2], "webhook")==0 ){
2594 rc = Th_WebpageHook(g.argv[3], (unsigned int)atoi(g.argv[4]));
2595 }else if( fossil_stricmp(g.argv[2], "webnotify")==0 ){
2596 rc = Th_WebpageNotify(g.argv[3], (unsigned int)atoi(g.argv[4]));
2597 }else{
2598 fossil_fatal("Unknown TH1 hook %s", g.argv[2]);
2599 }
2600 if( g.interp ){
2601 zResult = (char*)Th_GetResult(g.interp, &nResult);
2602 }
2603 sendText("RESULT (", -1, 0);
2604
M src/tkt.c
+1 -1
--- src/tkt.c
+++ src/tkt.c
@@ -1386,11 +1386,11 @@
13861386
 blob_appendf(&tktchng, "K %s\n", zTktUuid);
13871387
 blob_appendf(&tktchng, "U %F\n", zUser);
13881388
 md5sum_blob(&tktchng, &cksum);
13891389
 blob_appendf(&tktchng, "Z %b\n", &cksum);
13901390
 if( ticket_put(&tktchng, zTktUuid, ticket_need_moderation(1)) ){
1391
- fossil_fatal("%s\n", g.zErrMsg);
1391
+ fossil_fatal("%s", g.zErrMsg);
13921392
 }else{
13931393
 fossil_print("ticket %s succeeded for %s\n",
13941394
 (eCmd==set?"set":"add"),zTktUuid);
13951395
 }
13961396
 }
13971397
--- src/tkt.c
+++ src/tkt.c
@@ -1386,11 +1386,11 @@
1386 blob_appendf(&tktchng, "K %s\n", zTktUuid);
1387 blob_appendf(&tktchng, "U %F\n", zUser);
1388 md5sum_blob(&tktchng, &cksum);
1389 blob_appendf(&tktchng, "Z %b\n", &cksum);
1390 if( ticket_put(&tktchng, zTktUuid, ticket_need_moderation(1)) ){
1391 fossil_fatal("%s\n", g.zErrMsg);
1392 }else{
1393 fossil_print("ticket %s succeeded for %s\n",
1394 (eCmd==set?"set":"add"),zTktUuid);
1395 }
1396 }
1397
--- src/tkt.c
+++ src/tkt.c
@@ -1386,11 +1386,11 @@
1386 blob_appendf(&tktchng, "K %s\n", zTktUuid);
1387 blob_appendf(&tktchng, "U %F\n", zUser);
1388 md5sum_blob(&tktchng, &cksum);
1389 blob_appendf(&tktchng, "Z %b\n", &cksum);
1390 if( ticket_put(&tktchng, zTktUuid, ticket_need_moderation(1)) ){
1391 fossil_fatal("%s", g.zErrMsg);
1392 }else{
1393 fossil_print("ticket %s succeeded for %s\n",
1394 (eCmd==set?"set":"add"),zTktUuid);
1395 }
1396 }
1397
M src/vfile.c
+2 -2
--- src/vfile.c
+++ src/vfile.c
@@ -350,11 +350,11 @@
350350
 }
351351
 }
352352
 if( verbose ) fossil_print("%s\n", &zName[nRepos]);
353353
 if( file_wd_isdir(zName)==1 ){
354354
 /*TODO(dchest): remove directories? */
355
- fossil_fatal("%s is directory, cannot overwrite\n", zName);
355
+ fossil_fatal("%s is directory, cannot overwrite", zName);
356356
 }
357357
 if( file_wd_size(zName)>=0 && (isLink || file_wd_islink(0)) ){
358358
 file_delete(zName);
359359
 }
360360
 if( isLink ){
@@ -918,11 +918,11 @@
918918
 blob_zero(pManOut);
919919
 }
920920
 db_must_be_within_tree();
921921
 pManifest = manifest_get(vid, CFTYPE_MANIFEST, &err);
922922
 if( pManifest==0 ){
923
- fossil_fatal("manifest file (%d) is malformed:\n%s\n",
923
+ fossil_fatal("manifest file (%d) is malformed:\n%s",
924924
 vid, blob_str(&err));
925925
 }
926926
 manifest_file_rewind(pManifest);
927927
 while( (pFile = manifest_file_next(pManifest,0))!=0 ){
928928
 if( pFile->zUuid==0 ) continue;
929929
--- src/vfile.c
+++ src/vfile.c
@@ -350,11 +350,11 @@
350 }
351 }
352 if( verbose ) fossil_print("%s\n", &zName[nRepos]);
353 if( file_wd_isdir(zName)==1 ){
354 /*TODO(dchest): remove directories? */
355 fossil_fatal("%s is directory, cannot overwrite\n", zName);
356 }
357 if( file_wd_size(zName)>=0 && (isLink || file_wd_islink(0)) ){
358 file_delete(zName);
359 }
360 if( isLink ){
@@ -918,11 +918,11 @@
918 blob_zero(pManOut);
919 }
920 db_must_be_within_tree();
921 pManifest = manifest_get(vid, CFTYPE_MANIFEST, &err);
922 if( pManifest==0 ){
923 fossil_fatal("manifest file (%d) is malformed:\n%s\n",
924 vid, blob_str(&err));
925 }
926 manifest_file_rewind(pManifest);
927 while( (pFile = manifest_file_next(pManifest,0))!=0 ){
928 if( pFile->zUuid==0 ) continue;
929
--- src/vfile.c
+++ src/vfile.c
@@ -350,11 +350,11 @@
350 }
351 }
352 if( verbose ) fossil_print("%s\n", &zName[nRepos]);
353 if( file_wd_isdir(zName)==1 ){
354 /*TODO(dchest): remove directories? */
355 fossil_fatal("%s is directory, cannot overwrite", zName);
356 }
357 if( file_wd_size(zName)>=0 && (isLink || file_wd_islink(0)) ){
358 file_delete(zName);
359 }
360 if( isLink ){
@@ -918,11 +918,11 @@
918 blob_zero(pManOut);
919 }
920 db_must_be_within_tree();
921 pManifest = manifest_get(vid, CFTYPE_MANIFEST, &err);
922 if( pManifest==0 ){
923 fossil_fatal("manifest file (%d) is malformed:\n%s",
924 vid, blob_str(&err));
925 }
926 manifest_file_rewind(pManifest);
927 while( (pFile = manifest_file_next(pManifest,0))!=0 ){
928 if( pFile->zUuid==0 ) continue;
929

Keyboard Shortcuts

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