Fossil SCM
Update custom MinGW makefile, add one "const" and remove some unnecessary eol-spaces
Commit
9e318f6b48025e932910ebb0f762ea1fba50ebe7
Parent
5406f49271df762…
9 files changed
+2
-2
+3
-3
+2
-2
+1
-1
+2
-2
+1
-1
+1
-1
+1
-1
+6
-2
+2
-2
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -302,11 +302,11 @@ | ||
| 302 | 302 | fossil_fatal("branch subcommand should be one of: " |
| 303 | 303 | "new list ls"); |
| 304 | 304 | } |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | -static char brlistQuery[] = | |
| 307 | +static const char brlistQuery[] = | |
| 308 | 308 | @ SELECT |
| 309 | 309 | @ tagxref.value, |
| 310 | 310 | @ max(event.mtime), |
| 311 | 311 | @ EXISTS(SELECT 1 FROM tagxref AS tx |
| 312 | 312 | @ WHERE tx.rid=tagxref.rid |
| @@ -343,11 +343,11 @@ | ||
| 343 | 343 | login_check_credentials(); |
| 344 | 344 | if( !g.perm.Read ){ login_needed(); return; } |
| 345 | 345 | style_header("Branches"); |
| 346 | 346 | style_adunit_config(ADUNIT_RIGHT_OK); |
| 347 | 347 | login_anonymous_available(); |
| 348 | - | |
| 348 | + | |
| 349 | 349 | db_prepare(&q, brlistQuery/*works-like:""*/); |
| 350 | 350 | rNow = db_double(0.0, "SELECT julianday('now')"); |
| 351 | 351 | @ <div class="brlist"><table id="branchlisttable"> |
| 352 | 352 | @ <thead><tr> |
| 353 | 353 | @ <th>Branch Name</th> |
| 354 | 354 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -302,11 +302,11 @@ | |
| 302 | fossil_fatal("branch subcommand should be one of: " |
| 303 | "new list ls"); |
| 304 | } |
| 305 | } |
| 306 | |
| 307 | static char brlistQuery[] = |
| 308 | @ SELECT |
| 309 | @ tagxref.value, |
| 310 | @ max(event.mtime), |
| 311 | @ EXISTS(SELECT 1 FROM tagxref AS tx |
| 312 | @ WHERE tx.rid=tagxref.rid |
| @@ -343,11 +343,11 @@ | |
| 343 | login_check_credentials(); |
| 344 | if( !g.perm.Read ){ login_needed(); return; } |
| 345 | style_header("Branches"); |
| 346 | style_adunit_config(ADUNIT_RIGHT_OK); |
| 347 | login_anonymous_available(); |
| 348 | |
| 349 | db_prepare(&q, brlistQuery/*works-like:""*/); |
| 350 | rNow = db_double(0.0, "SELECT julianday('now')"); |
| 351 | @ <div class="brlist"><table id="branchlisttable"> |
| 352 | @ <thead><tr> |
| 353 | @ <th>Branch Name</th> |
| 354 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -302,11 +302,11 @@ | |
| 302 | fossil_fatal("branch subcommand should be one of: " |
| 303 | "new list ls"); |
| 304 | } |
| 305 | } |
| 306 | |
| 307 | static const char brlistQuery[] = |
| 308 | @ SELECT |
| 309 | @ tagxref.value, |
| 310 | @ max(event.mtime), |
| 311 | @ EXISTS(SELECT 1 FROM tagxref AS tx |
| 312 | @ WHERE tx.rid=tagxref.rid |
| @@ -343,11 +343,11 @@ | |
| 343 | login_check_credentials(); |
| 344 | if( !g.perm.Read ){ login_needed(); return; } |
| 345 | style_header("Branches"); |
| 346 | style_adunit_config(ADUNIT_RIGHT_OK); |
| 347 | login_anonymous_available(); |
| 348 | |
| 349 | db_prepare(&q, brlistQuery/*works-like:""*/); |
| 350 | rNow = db_double(0.0, "SELECT julianday('now')"); |
| 351 | @ <div class="brlist"><table id="branchlisttable"> |
| 352 | @ <thead><tr> |
| 353 | @ <th>Branch Name</th> |
| 354 |
+3
-3
| --- src/browse.c | ||
| +++ src/browse.c | ||
| @@ -888,11 +888,11 @@ | ||
| 888 | 888 | |
| 889 | 889 | /* |
| 890 | 890 | ** SQL used to compute the age of all files in checkin :ckin whose |
| 891 | 891 | ** names match :glob |
| 892 | 892 | */ |
| 893 | -static const char zComputeFileAgeSetup[] = | |
| 893 | +static const char zComputeFileAgeSetup[] = | |
| 894 | 894 | @ CREATE TABLE IF NOT EXISTS temp.fileage( |
| 895 | 895 | @ fnid INTEGER PRIMARY KEY, |
| 896 | 896 | @ fid INTEGER, |
| 897 | 897 | @ mid INTEGER, |
| 898 | 898 | @ mtime DATETIME, |
| @@ -899,11 +899,11 @@ | ||
| 899 | 899 | @ pathname TEXT |
| 900 | 900 | @ ); |
| 901 | 901 | @ CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin; |
| 902 | 902 | ; |
| 903 | 903 | |
| 904 | -static const char zComputeFileAgeRun[] = | |
| 904 | +static const char zComputeFileAgeRun[] = | |
| 905 | 905 | @ WITH RECURSIVE |
| 906 | 906 | @ ckin(x) AS (VALUES(:ckin) UNION ALL |
| 907 | 907 | @ SELECT pid FROM ckin, plink WHERE cid=x AND isprim) |
| 908 | 908 | @ INSERT OR IGNORE INTO fileage(fnid, fid, mid, mtime, pathname) |
| 909 | 909 | @ SELECT mlink.fnid, mlink.fid, x, event.mtime, filename.name |
| @@ -1025,11 +1025,11 @@ | ||
| 1025 | 1025 | style_header("File Ages"); |
| 1026 | 1026 | zGlob = P("glob"); |
| 1027 | 1027 | compute_fileage(rid,zGlob); |
| 1028 | 1028 | db_multi_exec("CREATE INDEX fileage_ix1 ON fileage(mid,pathname);"); |
| 1029 | 1029 | |
| 1030 | - @ <h2>Files in | |
| 1030 | + @ <h2>Files in | |
| 1031 | 1031 | @ %z(href("%R/info?name=%T",zUuid))[%S(zUuid)]</a> |
| 1032 | 1032 | if( zGlob && zGlob[0] ){ |
| 1033 | 1033 | @ that match "%h(zGlob)" and |
| 1034 | 1034 | } |
| 1035 | 1035 | @ ordered by check-in time</h2> |
| 1036 | 1036 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -888,11 +888,11 @@ | |
| 888 | |
| 889 | /* |
| 890 | ** SQL used to compute the age of all files in checkin :ckin whose |
| 891 | ** names match :glob |
| 892 | */ |
| 893 | static const char zComputeFileAgeSetup[] = |
| 894 | @ CREATE TABLE IF NOT EXISTS temp.fileage( |
| 895 | @ fnid INTEGER PRIMARY KEY, |
| 896 | @ fid INTEGER, |
| 897 | @ mid INTEGER, |
| 898 | @ mtime DATETIME, |
| @@ -899,11 +899,11 @@ | |
| 899 | @ pathname TEXT |
| 900 | @ ); |
| 901 | @ CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin; |
| 902 | ; |
| 903 | |
| 904 | static const char zComputeFileAgeRun[] = |
| 905 | @ WITH RECURSIVE |
| 906 | @ ckin(x) AS (VALUES(:ckin) UNION ALL |
| 907 | @ SELECT pid FROM ckin, plink WHERE cid=x AND isprim) |
| 908 | @ INSERT OR IGNORE INTO fileage(fnid, fid, mid, mtime, pathname) |
| 909 | @ SELECT mlink.fnid, mlink.fid, x, event.mtime, filename.name |
| @@ -1025,11 +1025,11 @@ | |
| 1025 | style_header("File Ages"); |
| 1026 | zGlob = P("glob"); |
| 1027 | compute_fileage(rid,zGlob); |
| 1028 | db_multi_exec("CREATE INDEX fileage_ix1 ON fileage(mid,pathname);"); |
| 1029 | |
| 1030 | @ <h2>Files in |
| 1031 | @ %z(href("%R/info?name=%T",zUuid))[%S(zUuid)]</a> |
| 1032 | if( zGlob && zGlob[0] ){ |
| 1033 | @ that match "%h(zGlob)" and |
| 1034 | } |
| 1035 | @ ordered by check-in time</h2> |
| 1036 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -888,11 +888,11 @@ | |
| 888 | |
| 889 | /* |
| 890 | ** SQL used to compute the age of all files in checkin :ckin whose |
| 891 | ** names match :glob |
| 892 | */ |
| 893 | static const char zComputeFileAgeSetup[] = |
| 894 | @ CREATE TABLE IF NOT EXISTS temp.fileage( |
| 895 | @ fnid INTEGER PRIMARY KEY, |
| 896 | @ fid INTEGER, |
| 897 | @ mid INTEGER, |
| 898 | @ mtime DATETIME, |
| @@ -899,11 +899,11 @@ | |
| 899 | @ pathname TEXT |
| 900 | @ ); |
| 901 | @ CREATE VIRTUAL TABLE IF NOT EXISTS temp.foci USING files_of_checkin; |
| 902 | ; |
| 903 | |
| 904 | static const char zComputeFileAgeRun[] = |
| 905 | @ WITH RECURSIVE |
| 906 | @ ckin(x) AS (VALUES(:ckin) UNION ALL |
| 907 | @ SELECT pid FROM ckin, plink WHERE cid=x AND isprim) |
| 908 | @ INSERT OR IGNORE INTO fileage(fnid, fid, mid, mtime, pathname) |
| 909 | @ SELECT mlink.fnid, mlink.fid, x, event.mtime, filename.name |
| @@ -1025,11 +1025,11 @@ | |
| 1025 | style_header("File Ages"); |
| 1026 | zGlob = P("glob"); |
| 1027 | compute_fileage(rid,zGlob); |
| 1028 | db_multi_exec("CREATE INDEX fileage_ix1 ON fileage(mid,pathname);"); |
| 1029 | |
| 1030 | @ <h2>Files in |
| 1031 | @ %z(href("%R/info?name=%T",zUuid))[%S(zUuid)]</a> |
| 1032 | if( zGlob && zGlob[0] ){ |
| 1033 | @ that match "%h(zGlob)" and |
| 1034 | } |
| 1035 | @ ordered by check-in time</h2> |
| 1036 |
M
src/db.c
+2
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -795,11 +795,11 @@ | ||
| 795 | 795 | } |
| 796 | 796 | } |
| 797 | 797 | } |
| 798 | 798 | |
| 799 | 799 | /* |
| 800 | -** Register the SQL functions that are useful both to the internal | |
| 800 | +** Register the SQL functions that are useful both to the internal | |
| 801 | 801 | ** representation and to the "fossil sql" command. |
| 802 | 802 | */ |
| 803 | 803 | void db_add_aux_functions(sqlite3 *db){ |
| 804 | 804 | sqlite3_create_function(db, "checkin_mtime", 2, SQLITE_UTF8, 0, |
| 805 | 805 | db_checkin_mtime_function, 0, 0); |
| @@ -840,11 +840,11 @@ | ||
| 840 | 840 | ); |
| 841 | 841 | sqlite3_create_function( |
| 842 | 842 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 843 | 843 | ); |
| 844 | 844 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 845 | - db_add_aux_functions(db); | |
| 845 | + db_add_aux_functions(db); | |
| 846 | 846 | re_add_sql_func(db); /* The REGEXP operator */ |
| 847 | 847 | foci_register(db); /* The "files_of_checkin" virtual table */ |
| 848 | 848 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 849 | 849 | return db; |
| 850 | 850 | } |
| 851 | 851 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -795,11 +795,11 @@ | |
| 795 | } |
| 796 | } |
| 797 | } |
| 798 | |
| 799 | /* |
| 800 | ** Register the SQL functions that are useful both to the internal |
| 801 | ** representation and to the "fossil sql" command. |
| 802 | */ |
| 803 | void db_add_aux_functions(sqlite3 *db){ |
| 804 | sqlite3_create_function(db, "checkin_mtime", 2, SQLITE_UTF8, 0, |
| 805 | db_checkin_mtime_function, 0, 0); |
| @@ -840,11 +840,11 @@ | |
| 840 | ); |
| 841 | sqlite3_create_function( |
| 842 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 843 | ); |
| 844 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 845 | db_add_aux_functions(db); |
| 846 | re_add_sql_func(db); /* The REGEXP operator */ |
| 847 | foci_register(db); /* The "files_of_checkin" virtual table */ |
| 848 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 849 | return db; |
| 850 | } |
| 851 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -795,11 +795,11 @@ | |
| 795 | } |
| 796 | } |
| 797 | } |
| 798 | |
| 799 | /* |
| 800 | ** Register the SQL functions that are useful both to the internal |
| 801 | ** representation and to the "fossil sql" command. |
| 802 | */ |
| 803 | void db_add_aux_functions(sqlite3 *db){ |
| 804 | sqlite3_create_function(db, "checkin_mtime", 2, SQLITE_UTF8, 0, |
| 805 | db_checkin_mtime_function, 0, 0); |
| @@ -840,11 +840,11 @@ | |
| 840 | ); |
| 841 | sqlite3_create_function( |
| 842 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 843 | ); |
| 844 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 845 | db_add_aux_functions(db); |
| 846 | re_add_sql_func(db); /* The REGEXP operator */ |
| 847 | foci_register(db); /* The "files_of_checkin" virtual table */ |
| 848 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 849 | return db; |
| 850 | } |
| 851 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1874,11 +1874,11 @@ | ||
| 1874 | 1874 | } |
| 1875 | 1875 | if( blob_eq(&key, "debug:") && blob_token(&line, &value) ){ |
| 1876 | 1876 | /* debug: FILENAME |
| 1877 | 1877 | ** |
| 1878 | 1878 | ** Causes output from cgi_debug() and CGIDEBUG(()) calls to go |
| 1879 | - ** into FILENAME. | |
| 1879 | + ** into FILENAME. | |
| 1880 | 1880 | */ |
| 1881 | 1881 | g.fDebug = fossil_fopen(blob_str(&value), "ab"); |
| 1882 | 1882 | blob_reset(&value); |
| 1883 | 1883 | continue; |
| 1884 | 1884 | } |
| 1885 | 1885 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1874,11 +1874,11 @@ | |
| 1874 | } |
| 1875 | if( blob_eq(&key, "debug:") && blob_token(&line, &value) ){ |
| 1876 | /* debug: FILENAME |
| 1877 | ** |
| 1878 | ** Causes output from cgi_debug() and CGIDEBUG(()) calls to go |
| 1879 | ** into FILENAME. |
| 1880 | */ |
| 1881 | g.fDebug = fossil_fopen(blob_str(&value), "ab"); |
| 1882 | blob_reset(&value); |
| 1883 | continue; |
| 1884 | } |
| 1885 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1874,11 +1874,11 @@ | |
| 1874 | } |
| 1875 | if( blob_eq(&key, "debug:") && blob_token(&line, &value) ){ |
| 1876 | /* debug: FILENAME |
| 1877 | ** |
| 1878 | ** Causes output from cgi_debug() and CGIDEBUG(()) calls to go |
| 1879 | ** into FILENAME. |
| 1880 | */ |
| 1881 | g.fDebug = fossil_fopen(blob_str(&value), "ab"); |
| 1882 | blob_reset(&value); |
| 1883 | continue; |
| 1884 | } |
| 1885 |
+2
-2
| --- src/schema.c | ||
| +++ src/schema.c | ||
| @@ -12,11 +12,11 @@ | ||
| 12 | 12 | ** Author contact information: |
| 13 | 13 | ** [email protected] |
| 14 | 14 | ** http://www.hwaci.com/drh/ |
| 15 | 15 | ** |
| 16 | 16 | ******************************************************************************* |
| 17 | -** | |
| 17 | +** | |
| 18 | 18 | ** This file contains string constants that implement the database schema. |
| 19 | 19 | */ |
| 20 | 20 | #include "config.h" |
| 21 | 21 | #include "schema.h" |
| 22 | 22 | |
| @@ -81,11 +81,11 @@ | ||
| 81 | 81 | @ uuid TEXT UNIQUE NOT NULL, -- SHA1 hash of the content |
| 82 | 82 | @ content BLOB, -- Compressed content of this record |
| 83 | 83 | @ CHECK( length(uuid)==40 AND rid>0 ) |
| 84 | 84 | @ ); |
| 85 | 85 | @ CREATE TABLE delta( |
| 86 | -@ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed | |
| 86 | +@ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed | |
| 87 | 87 | @ srcid INTEGER NOT NULL REFERENCES blob -- Baseline for delta-compression |
| 88 | 88 | @ ); |
| 89 | 89 | @ CREATE INDEX delta_i1 ON delta(srcid); |
| 90 | 90 | @ |
| 91 | 91 | @ ------------------------------------------------------------------------- |
| 92 | 92 |
| --- src/schema.c | |
| +++ src/schema.c | |
| @@ -12,11 +12,11 @@ | |
| 12 | ** Author contact information: |
| 13 | ** [email protected] |
| 14 | ** http://www.hwaci.com/drh/ |
| 15 | ** |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file contains string constants that implement the database schema. |
| 19 | */ |
| 20 | #include "config.h" |
| 21 | #include "schema.h" |
| 22 | |
| @@ -81,11 +81,11 @@ | |
| 81 | @ uuid TEXT UNIQUE NOT NULL, -- SHA1 hash of the content |
| 82 | @ content BLOB, -- Compressed content of this record |
| 83 | @ CHECK( length(uuid)==40 AND rid>0 ) |
| 84 | @ ); |
| 85 | @ CREATE TABLE delta( |
| 86 | @ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed |
| 87 | @ srcid INTEGER NOT NULL REFERENCES blob -- Baseline for delta-compression |
| 88 | @ ); |
| 89 | @ CREATE INDEX delta_i1 ON delta(srcid); |
| 90 | @ |
| 91 | @ ------------------------------------------------------------------------- |
| 92 |
| --- src/schema.c | |
| +++ src/schema.c | |
| @@ -12,11 +12,11 @@ | |
| 12 | ** Author contact information: |
| 13 | ** [email protected] |
| 14 | ** http://www.hwaci.com/drh/ |
| 15 | ** |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file contains string constants that implement the database schema. |
| 19 | */ |
| 20 | #include "config.h" |
| 21 | #include "schema.h" |
| 22 | |
| @@ -81,11 +81,11 @@ | |
| 81 | @ uuid TEXT UNIQUE NOT NULL, -- SHA1 hash of the content |
| 82 | @ content BLOB, -- Compressed content of this record |
| 83 | @ CHECK( length(uuid)==40 AND rid>0 ) |
| 84 | @ ); |
| 85 | @ CREATE TABLE delta( |
| 86 | @ rid INTEGER PRIMARY KEY, -- BLOB that is delta-compressed |
| 87 | @ srcid INTEGER NOT NULL REFERENCES blob -- Baseline for delta-compression |
| 88 | @ ); |
| 89 | @ CREATE INDEX delta_i1 ON delta(srcid); |
| 90 | @ |
| 91 | @ ------------------------------------------------------------------------- |
| 92 |
+1
-1
| --- src/sqlcmd.c | ||
| +++ src/sqlcmd.c | ||
| @@ -108,11 +108,11 @@ | ||
| 108 | 108 | sqlite3_result_error(context, "input is not zlib compressed", -1); |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /* |
| 113 | -** Add the content(), compress(), and decompress() SQL functions to | |
| 113 | +** Add the content(), compress(), and decompress() SQL functions to | |
| 114 | 114 | ** database connection db. |
| 115 | 115 | */ |
| 116 | 116 | int add_content_sql_commands(sqlite3 *db){ |
| 117 | 117 | sqlite3_create_function(db, "content", 1, SQLITE_UTF8, 0, |
| 118 | 118 | sqlcmd_content, 0, 0); |
| 119 | 119 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -108,11 +108,11 @@ | |
| 108 | sqlite3_result_error(context, "input is not zlib compressed", -1); |
| 109 | } |
| 110 | } |
| 111 | |
| 112 | /* |
| 113 | ** Add the content(), compress(), and decompress() SQL functions to |
| 114 | ** database connection db. |
| 115 | */ |
| 116 | int add_content_sql_commands(sqlite3 *db){ |
| 117 | sqlite3_create_function(db, "content", 1, SQLITE_UTF8, 0, |
| 118 | sqlcmd_content, 0, 0); |
| 119 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -108,11 +108,11 @@ | |
| 108 | sqlite3_result_error(context, "input is not zlib compressed", -1); |
| 109 | } |
| 110 | } |
| 111 | |
| 112 | /* |
| 113 | ** Add the content(), compress(), and decompress() SQL functions to |
| 114 | ** database connection db. |
| 115 | */ |
| 116 | int add_content_sql_commands(sqlite3 *db){ |
| 117 | sqlite3_create_function(db, "content", 1, SQLITE_UTF8, 0, |
| 118 | sqlcmd_content, 0, 0); |
| 119 |
+1
-1
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -354,11 +354,11 @@ | ||
| 354 | 354 | |
| 355 | 355 | #if INTERFACE |
| 356 | 356 | /* Allowed parameters for style_adunit() */ |
| 357 | 357 | #define ADUNIT_OFF 0x0001 /* Do not allow ads on this page */ |
| 358 | 358 | #define ADUNIT_RIGHT_OK 0x0002 /* Right-side vertical ads ok here */ |
| 359 | -#endif | |
| 359 | +#endif | |
| 360 | 360 | |
| 361 | 361 | /* |
| 362 | 362 | ** Various page implementations can invoke this interface to let the |
| 363 | 363 | ** style manager know what kinds of ads are appropriate for this page. |
| 364 | 364 | */ |
| 365 | 365 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -354,11 +354,11 @@ | |
| 354 | |
| 355 | #if INTERFACE |
| 356 | /* Allowed parameters for style_adunit() */ |
| 357 | #define ADUNIT_OFF 0x0001 /* Do not allow ads on this page */ |
| 358 | #define ADUNIT_RIGHT_OK 0x0002 /* Right-side vertical ads ok here */ |
| 359 | #endif |
| 360 | |
| 361 | /* |
| 362 | ** Various page implementations can invoke this interface to let the |
| 363 | ** style manager know what kinds of ads are appropriate for this page. |
| 364 | */ |
| 365 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -354,11 +354,11 @@ | |
| 354 | |
| 355 | #if INTERFACE |
| 356 | /* Allowed parameters for style_adunit() */ |
| 357 | #define ADUNIT_OFF 0x0001 /* Do not allow ads on this page */ |
| 358 | #define ADUNIT_RIGHT_OK 0x0002 /* Right-side vertical ads ok here */ |
| 359 | #endif |
| 360 | |
| 361 | /* |
| 362 | ** Various page implementations can invoke this interface to let the |
| 363 | ** style manager know what kinds of ads are appropriate for this page. |
| 364 | */ |
| 365 |
+1
-1
| --- src/tag.c | ||
| +++ src/tag.c | ||
| @@ -269,11 +269,11 @@ | ||
| 269 | 269 | } |
| 270 | 270 | g.markPrivate = content_is_private(rid); |
| 271 | 271 | zValue = g.argc==5 ? g.argv[4] : 0; |
| 272 | 272 | db_begin_transaction(); |
| 273 | 273 | tag_insert(zTag, tagtype, zValue, -1, 0.0, rid); |
| 274 | - db_end_transaction(0); | |
| 274 | + db_end_transaction(0); | |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | /* |
| 278 | 278 | ** Add a control record to the repository that either creates |
| 279 | 279 | ** or cancels a tag. |
| 280 | 280 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -269,11 +269,11 @@ | |
| 269 | } |
| 270 | g.markPrivate = content_is_private(rid); |
| 271 | zValue = g.argc==5 ? g.argv[4] : 0; |
| 272 | db_begin_transaction(); |
| 273 | tag_insert(zTag, tagtype, zValue, -1, 0.0, rid); |
| 274 | db_end_transaction(0); |
| 275 | } |
| 276 | |
| 277 | /* |
| 278 | ** Add a control record to the repository that either creates |
| 279 | ** or cancels a tag. |
| 280 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -269,11 +269,11 @@ | |
| 269 | } |
| 270 | g.markPrivate = content_is_private(rid); |
| 271 | zValue = g.argc==5 ? g.argv[4] : 0; |
| 272 | db_begin_transaction(); |
| 273 | tag_insert(zTag, tagtype, zValue, -1, 0.0, rid); |
| 274 | db_end_transaction(0); |
| 275 | } |
| 276 | |
| 277 | /* |
| 278 | ** Add a control record to the repository that either creates |
| 279 | ** or cancels a tag. |
| 280 |
+6
-2
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -496,20 +496,24 @@ | ||
| 496 | 496 | $(SRCDIR)/../skins/eagle/footer.txt \ |
| 497 | 497 | $(SRCDIR)/../skins/eagle/header.txt \ |
| 498 | 498 | $(SRCDIR)/../skins/enhanced1/css.txt \ |
| 499 | 499 | $(SRCDIR)/../skins/enhanced1/footer.txt \ |
| 500 | 500 | $(SRCDIR)/../skins/enhanced1/header.txt \ |
| 501 | + $(SRCDIR)/../skins/etienne1/css.txt \ | |
| 502 | + $(SRCDIR)/../skins/etienne1/footer.txt \ | |
| 503 | + $(SRCDIR)/../skins/etienne1/header.txt \ | |
| 501 | 504 | $(SRCDIR)/../skins/khaki/css.txt \ |
| 502 | 505 | $(SRCDIR)/../skins/khaki/footer.txt \ |
| 503 | 506 | $(SRCDIR)/../skins/khaki/header.txt \ |
| 504 | 507 | $(SRCDIR)/../skins/plain_gray/css.txt \ |
| 505 | 508 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 506 | 509 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 507 | 510 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 508 | 511 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 509 | 512 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 510 | - $(SRCDIR)/diff.tcl | |
| 513 | + $(SRCDIR)/diff.tcl \ | |
| 514 | + $(SRCDIR)/markdown.md | |
| 511 | 515 | |
| 512 | 516 | TRANS_SRC = \ |
| 513 | 517 | $(OBJDIR)/add_.c \ |
| 514 | 518 | $(OBJDIR)/allrepo_.c \ |
| 515 | 519 | $(OBJDIR)/attach_.c \ |
| @@ -936,11 +940,11 @@ | ||
| 936 | 940 | |
| 937 | 941 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX) |
| 938 | 942 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 939 | 943 | |
| 940 | 944 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 941 | - $(MKBUILTIN) $(EXTRA_FILES) >$@ | |
| 945 | + $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ | |
| 942 | 946 | |
| 943 | 947 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h |
| 944 | 948 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 945 | 949 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 946 | 950 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 947 | 951 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -496,20 +496,24 @@ | |
| 496 | $(SRCDIR)/../skins/eagle/footer.txt \ |
| 497 | $(SRCDIR)/../skins/eagle/header.txt \ |
| 498 | $(SRCDIR)/../skins/enhanced1/css.txt \ |
| 499 | $(SRCDIR)/../skins/enhanced1/footer.txt \ |
| 500 | $(SRCDIR)/../skins/enhanced1/header.txt \ |
| 501 | $(SRCDIR)/../skins/khaki/css.txt \ |
| 502 | $(SRCDIR)/../skins/khaki/footer.txt \ |
| 503 | $(SRCDIR)/../skins/khaki/header.txt \ |
| 504 | $(SRCDIR)/../skins/plain_gray/css.txt \ |
| 505 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 506 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 507 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 508 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 509 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 510 | $(SRCDIR)/diff.tcl |
| 511 | |
| 512 | TRANS_SRC = \ |
| 513 | $(OBJDIR)/add_.c \ |
| 514 | $(OBJDIR)/allrepo_.c \ |
| 515 | $(OBJDIR)/attach_.c \ |
| @@ -936,11 +940,11 @@ | |
| 936 | |
| 937 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX) |
| 938 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 939 | |
| 940 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 941 | $(MKBUILTIN) $(EXTRA_FILES) >$@ |
| 942 | |
| 943 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h |
| 944 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 945 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 946 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 947 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -496,20 +496,24 @@ | |
| 496 | $(SRCDIR)/../skins/eagle/footer.txt \ |
| 497 | $(SRCDIR)/../skins/eagle/header.txt \ |
| 498 | $(SRCDIR)/../skins/enhanced1/css.txt \ |
| 499 | $(SRCDIR)/../skins/enhanced1/footer.txt \ |
| 500 | $(SRCDIR)/../skins/enhanced1/header.txt \ |
| 501 | $(SRCDIR)/../skins/etienne1/css.txt \ |
| 502 | $(SRCDIR)/../skins/etienne1/footer.txt \ |
| 503 | $(SRCDIR)/../skins/etienne1/header.txt \ |
| 504 | $(SRCDIR)/../skins/khaki/css.txt \ |
| 505 | $(SRCDIR)/../skins/khaki/footer.txt \ |
| 506 | $(SRCDIR)/../skins/khaki/header.txt \ |
| 507 | $(SRCDIR)/../skins/plain_gray/css.txt \ |
| 508 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 509 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 510 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 511 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 512 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 513 | $(SRCDIR)/diff.tcl \ |
| 514 | $(SRCDIR)/markdown.md |
| 515 | |
| 516 | TRANS_SRC = \ |
| 517 | $(OBJDIR)/add_.c \ |
| 518 | $(OBJDIR)/allrepo_.c \ |
| 519 | $(OBJDIR)/attach_.c \ |
| @@ -936,11 +940,11 @@ | |
| 940 | |
| 941 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX) |
| 942 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 943 | |
| 944 | $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES) |
| 945 | $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@ |
| 946 | |
| 947 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h |
| 948 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 949 | $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \ |
| 950 | $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \ |
| 951 |