Fossil SCM

Remove unnecessary variable determination in src/descendants.c, and some unnecessary end-of-line spacing.

jan.nijtmans 2015-04-16 08:53 trunk
Commit 10f5fc698679b598874c460127a091dd59c3f24f
Parent e1ee31a95416d98…
7 files changed +1 -1 +1 -1 +6 -6 +1 -1 +1 -1 +1 -1 +1 -1
~ src/allrepo.c ~ src/clone.c ~ src/descendants.c ~ src/sitemap.c ~ src/skins.c ~ src/utf8.c ~ src/zip.c
M src/allrepo.c
+1 -1
--- src/allrepo.c
+++ src/allrepo.c
@@ -275,11 +275,11 @@
275275
 useCheckouts = find_option("ckout","c",0)!=0;
276276
 verify_all_options();
277277
 db_begin_transaction();
278278
 for(j=3; j<g.argc; j++, blob_reset(&sql), blob_reset(&fn)){
279279
 file_canonical_name(g.argv[j], &fn, 0);
280
- blob_append_sql(&sql,
280
+ blob_append_sql(&sql,
281281
 "DELETE FROM global_config WHERE name GLOB '%s:%q'",
282282
 useCheckouts?"ckout":"repo", blob_str(&fn)
283283
 );
284284
 if( dryRunFlag ){
285285
 fossil_print("%s\n", blob_sql_text(&sql));
286286
--- src/allrepo.c
+++ src/allrepo.c
@@ -275,11 +275,11 @@
275 useCheckouts = find_option("ckout","c",0)!=0;
276 verify_all_options();
277 db_begin_transaction();
278 for(j=3; j<g.argc; j++, blob_reset(&sql), blob_reset(&fn)){
279 file_canonical_name(g.argv[j], &fn, 0);
280 blob_append_sql(&sql,
281 "DELETE FROM global_config WHERE name GLOB '%s:%q'",
282 useCheckouts?"ckout":"repo", blob_str(&fn)
283 );
284 if( dryRunFlag ){
285 fossil_print("%s\n", blob_sql_text(&sql));
286
--- src/allrepo.c
+++ src/allrepo.c
@@ -275,11 +275,11 @@
275 useCheckouts = find_option("ckout","c",0)!=0;
276 verify_all_options();
277 db_begin_transaction();
278 for(j=3; j<g.argc; j++, blob_reset(&sql), blob_reset(&fn)){
279 file_canonical_name(g.argv[j], &fn, 0);
280 blob_append_sql(&sql,
281 "DELETE FROM global_config WHERE name GLOB '%s:%q'",
282 useCheckouts?"ckout":"repo", blob_str(&fn)
283 );
284 if( dryRunFlag ){
285 fossil_print("%s\n", blob_sql_text(&sql));
286
M src/clone.c
+1 -1
--- src/clone.c
+++ src/clone.c
@@ -206,11 +206,11 @@
206206
 rebuild_db(0, 1, 0);
207207
 fossil_print("Extra delta compression... "); fflush(stdout);
208208
 extra_deltification();
209209
 db_end_transaction(0);
210210
 fossil_print("\nVacuuming the database... "); fflush(stdout);
211
- if( db_int(0, "PRAGMA page_count")>1000
211
+ if( db_int(0, "PRAGMA page_count")>1000
212212
 && db_int(0, "PRAGMA page_size")<8192 ){
213213
 db_multi_exec("PRAGMA page_size=8192;");
214214
 }
215215
 db_multi_exec("VACUUM");
216216
 fossil_print("\nproject-id: %s\n", db_get("project-code", 0));
217217
--- src/clone.c
+++ src/clone.c
@@ -206,11 +206,11 @@
206 rebuild_db(0, 1, 0);
207 fossil_print("Extra delta compression... "); fflush(stdout);
208 extra_deltification();
209 db_end_transaction(0);
210 fossil_print("\nVacuuming the database... "); fflush(stdout);
211 if( db_int(0, "PRAGMA page_count")>1000
212 && db_int(0, "PRAGMA page_size")<8192 ){
213 db_multi_exec("PRAGMA page_size=8192;");
214 }
215 db_multi_exec("VACUUM");
216 fossil_print("\nproject-id: %s\n", db_get("project-code", 0));
217
--- src/clone.c
+++ src/clone.c
@@ -206,11 +206,11 @@
206 rebuild_db(0, 1, 0);
207 fossil_print("Extra delta compression... "); fflush(stdout);
208 extra_deltification();
209 db_end_transaction(0);
210 fossil_print("\nVacuuming the database... "); fflush(stdout);
211 if( db_int(0, "PRAGMA page_count")>1000
212 && db_int(0, "PRAGMA page_size")<8192 ){
213 db_multi_exec("PRAGMA page_size=8192;");
214 }
215 db_multi_exec("VACUUM");
216 fossil_print("\nproject-id: %s\n", db_get("project-code", 0));
217
M src/descendants.c
+6 -6
--- src/descendants.c
+++ src/descendants.c
@@ -407,17 +407,17 @@
407407
 db_prepare(&q, "%s ORDER BY event.mtime DESC", blob_sql_text(&sql));
408408
 }
409409
 blob_reset(&sql);
410410
 n = 0;
411411
 while( db_step(&q)==SQLITE_ROW ){
412
- const char *zId = db_column_text(&q, 1);
413
- const char *zDate = db_column_text(&q, 2);
414
- const char *zCom = db_column_text(&q, 3);
415
- const char *zBr = db_column_text(&q, 7);
416
- char *z;
417
-
418412
 if( !showForks || fossil_find_nearest_fork(db_column_int(&q, 0)) ){
413
+ const char *zId = db_column_text(&q, 1);
414
+ const char *zDate = db_column_text(&q, 2);
415
+ const char *zCom = db_column_text(&q, 3);
416
+ const char *zBr = db_column_text(&q, 7);
417
+ char *z;
418
+
419419
 if( byBranch && fossil_strcmp(zBr, zLastBr)!=0 ){
420420
 fossil_print("*** %s ***\n", zBr);
421421
 fossil_free(zLastBr);
422422
 zLastBr = fossil_strdup(zBr);
423423
 }
424424
--- src/descendants.c
+++ src/descendants.c
@@ -407,17 +407,17 @@
407 db_prepare(&q, "%s ORDER BY event.mtime DESC", blob_sql_text(&sql));
408 }
409 blob_reset(&sql);
410 n = 0;
411 while( db_step(&q)==SQLITE_ROW ){
412 const char *zId = db_column_text(&q, 1);
413 const char *zDate = db_column_text(&q, 2);
414 const char *zCom = db_column_text(&q, 3);
415 const char *zBr = db_column_text(&q, 7);
416 char *z;
417
418 if( !showForks || fossil_find_nearest_fork(db_column_int(&q, 0)) ){
 
 
 
 
 
 
419 if( byBranch && fossil_strcmp(zBr, zLastBr)!=0 ){
420 fossil_print("*** %s ***\n", zBr);
421 fossil_free(zLastBr);
422 zLastBr = fossil_strdup(zBr);
423 }
424
--- src/descendants.c
+++ src/descendants.c
@@ -407,17 +407,17 @@
407 db_prepare(&q, "%s ORDER BY event.mtime DESC", blob_sql_text(&sql));
408 }
409 blob_reset(&sql);
410 n = 0;
411 while( db_step(&q)==SQLITE_ROW ){
 
 
 
 
 
 
412 if( !showForks || fossil_find_nearest_fork(db_column_int(&q, 0)) ){
413 const char *zId = db_column_text(&q, 1);
414 const char *zDate = db_column_text(&q, 2);
415 const char *zCom = db_column_text(&q, 3);
416 const char *zBr = db_column_text(&q, 7);
417 char *z;
418
419 if( byBranch && fossil_strcmp(zBr, zLastBr)!=0 ){
420 fossil_print("*** %s ***\n", zBr);
421 fossil_free(zLastBr);
422 zLastBr = fossil_strdup(zBr);
423 }
424
M src/sitemap.c
+1 -1
--- src/sitemap.c
+++ src/sitemap.c
@@ -47,11 +47,11 @@
4747
 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
4848
 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
4949
 @ </ul>
5050
 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
5151
 @ <ul>
52
- @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
52
+ @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
5353
 @ check-ins</a></li>
5454
 @ <li>%z(href("%R/timeline?n=all&namechng"))All check-ins with file name
5555
 @ changes</a></li>
5656
 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
5757
 @ </ul>
5858
--- src/sitemap.c
+++ src/sitemap.c
@@ -47,11 +47,11 @@
47 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
48 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
49 @ </ul>
50 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
51 @ <ul>
52 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
53 @ check-ins</a></li>
54 @ <li>%z(href("%R/timeline?n=all&namechng"))All check-ins with file name
55 @ changes</a></li>
56 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
57 @ </ul>
58
--- src/sitemap.c
+++ src/sitemap.c
@@ -47,11 +47,11 @@
47 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
48 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
49 @ </ul>
50 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
51 @ <ul>
52 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
53 @ check-ins</a></li>
54 @ <li>%z(href("%R/timeline?n=all&namechng"))All check-ins with file name
55 @ changes</a></li>
56 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
57 @ </ul>
58
M src/skins.c
+1 -1
--- src/skins.c
+++ src/skins.c
@@ -602,11 +602,11 @@
602602
 cgi_replace_parameter(aSkinAttr[ii].zFile, builtin_text(zDflt));
603603
 }
604604
 style_header("%s", aSkinAttr[ii].zTitle);
605605
 for(j=0; j<ArraySize(aSkinAttr); j++){
606606
 if( j==ii ) continue;
607
- style_submenu_element(aSkinAttr[j].zSubmenu, 0,
607
+ style_submenu_element(aSkinAttr[j].zSubmenu, 0,
608608
 "%R/setup_skinedit?w=%d&basis=%h",j,zBasis);
609609
 }
610610
 style_submenu_element("Skins", 0, "%R/setup_skin");
611611
 @ <form action="%s(g.zTop)/setup_skinedit" method="post"><div>
612612
 login_insert_csrf_secret();
613613
--- src/skins.c
+++ src/skins.c
@@ -602,11 +602,11 @@
602 cgi_replace_parameter(aSkinAttr[ii].zFile, builtin_text(zDflt));
603 }
604 style_header("%s", aSkinAttr[ii].zTitle);
605 for(j=0; j<ArraySize(aSkinAttr); j++){
606 if( j==ii ) continue;
607 style_submenu_element(aSkinAttr[j].zSubmenu, 0,
608 "%R/setup_skinedit?w=%d&basis=%h",j,zBasis);
609 }
610 style_submenu_element("Skins", 0, "%R/setup_skin");
611 @ <form action="%s(g.zTop)/setup_skinedit" method="post"><div>
612 login_insert_csrf_secret();
613
--- src/skins.c
+++ src/skins.c
@@ -602,11 +602,11 @@
602 cgi_replace_parameter(aSkinAttr[ii].zFile, builtin_text(zDflt));
603 }
604 style_header("%s", aSkinAttr[ii].zTitle);
605 for(j=0; j<ArraySize(aSkinAttr); j++){
606 if( j==ii ) continue;
607 style_submenu_element(aSkinAttr[j].zSubmenu, 0,
608 "%R/setup_skinedit?w=%d&basis=%h",j,zBasis);
609 }
610 style_submenu_element("Skins", 0, "%R/setup_skin");
611 @ <form action="%s(g.zTop)/setup_skinedit" method="post"><div>
612 login_insert_csrf_secret();
613
M src/utf8.c
+1 -1
--- src/utf8.c
+++ src/utf8.c
@@ -323,11 +323,11 @@
323323
 }
324324
325325
 /* If blob to be written to the Windows console is not
326326
 * UTF-8, convert it to UTF-8 first.
327327
 */
328
- blob_init(&blob, zUtf8, nByte);
328
+ blob_init(&blob, zUtf8, nByte);
329329
 blob_to_utf8_no_bom(&blob, 1);
330330
 nChar = MultiByteToWideChar(CP_UTF8, 0, blob_buffer(&blob),
331331
 blob_size(&blob), NULL, 0);
332332
 zUnicode = malloc( (nChar + 1) *sizeof(zUnicode[0]) );
333333
 if( zUnicode==0 ){
334334
--- src/utf8.c
+++ src/utf8.c
@@ -323,11 +323,11 @@
323 }
324
325 /* If blob to be written to the Windows console is not
326 * UTF-8, convert it to UTF-8 first.
327 */
328 blob_init(&blob, zUtf8, nByte);
329 blob_to_utf8_no_bom(&blob, 1);
330 nChar = MultiByteToWideChar(CP_UTF8, 0, blob_buffer(&blob),
331 blob_size(&blob), NULL, 0);
332 zUnicode = malloc( (nChar + 1) *sizeof(zUnicode[0]) );
333 if( zUnicode==0 ){
334
--- src/utf8.c
+++ src/utf8.c
@@ -323,11 +323,11 @@
323 }
324
325 /* If blob to be written to the Windows console is not
326 * UTF-8, convert it to UTF-8 first.
327 */
328 blob_init(&blob, zUtf8, nByte);
329 blob_to_utf8_no_bom(&blob, 1);
330 nChar = MultiByteToWideChar(CP_UTF8, 0, blob_buffer(&blob),
331 blob_size(&blob), NULL, 0);
332 zUnicode = malloc( (nChar + 1) *sizeof(zUnicode[0]) );
333 if( zUnicode==0 ){
334
M src/zip.c
+1 -1
--- src/zip.c
+++ src/zip.c
@@ -399,11 +399,11 @@
399399
 int rid;
400400
 Blob zip;
401401
 const char *zName;
402402
 zName = find_option("name", 0, 1);
403403
 db_find_and_open_repository(0, 0);
404
-
404
+
405405
 /* We should be done with options.. */
406406
 verify_all_options();
407407
408408
 if( g.argc!=4 ){
409409
 usage("VERSION OUTPUTFILE");
410410
--- src/zip.c
+++ src/zip.c
@@ -399,11 +399,11 @@
399 int rid;
400 Blob zip;
401 const char *zName;
402 zName = find_option("name", 0, 1);
403 db_find_and_open_repository(0, 0);
404
405 /* We should be done with options.. */
406 verify_all_options();
407
408 if( g.argc!=4 ){
409 usage("VERSION OUTPUTFILE");
410
--- src/zip.c
+++ src/zip.c
@@ -399,11 +399,11 @@
399 int rid;
400 Blob zip;
401 const char *zName;
402 zName = find_option("name", 0, 1);
403 db_find_and_open_repository(0, 0);
404
405 /* We should be done with options.. */
406 verify_all_options();
407
408 if( g.argc!=4 ){
409 usage("VERSION OUTPUTFILE");
410

Keyboard Shortcuts

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