Fossil SCM
Remove strglob() function, which isn't used any more. Various doc fixes, (cherry-picked from the svn-import branch).
Commit
2c79aed2d5bceca4e06f63d4f5f8559f27906afd
Parent
080ab8cb0a1aab4…
4 files changed
+1
-1
+1
-1
-19
+5
-5
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2645,11 +2645,11 @@ | ||
| 2645 | 2645 | } |
| 2646 | 2646 | } |
| 2647 | 2647 | }else{ |
| 2648 | 2648 | isManifest = 0; |
| 2649 | 2649 | while( ctrlSettings[i].name |
| 2650 | - && strncmp(ctrlSettings[i].name, zName, n)==0 | |
| 2650 | + && strncmp(ctrlSettings[i].name, zName, n)==0 | |
| 2651 | 2651 | ){ |
| 2652 | 2652 | print_setting(&ctrlSettings[i], db_open_local(0)); |
| 2653 | 2653 | i++; |
| 2654 | 2654 | } |
| 2655 | 2655 | } |
| 2656 | 2656 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2645,11 +2645,11 @@ | |
| 2645 | } |
| 2646 | } |
| 2647 | }else{ |
| 2648 | isManifest = 0; |
| 2649 | while( ctrlSettings[i].name |
| 2650 | && strncmp(ctrlSettings[i].name, zName, n)==0 |
| 2651 | ){ |
| 2652 | print_setting(&ctrlSettings[i], db_open_local(0)); |
| 2653 | i++; |
| 2654 | } |
| 2655 | } |
| 2656 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2645,11 +2645,11 @@ | |
| 2645 | } |
| 2646 | } |
| 2647 | }else{ |
| 2648 | isManifest = 0; |
| 2649 | while( ctrlSettings[i].name |
| 2650 | && strncmp(ctrlSettings[i].name, zName, n)==0 |
| 2651 | ){ |
| 2652 | print_setting(&ctrlSettings[i], db_open_local(0)); |
| 2653 | i++; |
| 2654 | } |
| 2655 | } |
| 2656 |
+1
-1
| --- src/foci.c | ||
| +++ src/foci.c | ||
| @@ -31,11 +31,11 @@ | ||
| 31 | 31 | @ CREATE TABLE files_of_checkin( |
| 32 | 32 | @ checkinID INTEGER, -- RID for the checkin manifest |
| 33 | 33 | @ filename TEXT, -- Name of a file |
| 34 | 34 | @ uuid TEXT, -- SHA1 hash of the file |
| 35 | 35 | @ previousName TEXT, -- Name of the file in previous checkin |
| 36 | -@ prem TEXT -- Permissions on the file | |
| 36 | +@ perm TEXT -- Permissions on the file | |
| 37 | 37 | @ ); |
| 38 | 38 | ; |
| 39 | 39 | |
| 40 | 40 | #if INTERFACE |
| 41 | 41 | /* |
| 42 | 42 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -31,11 +31,11 @@ | |
| 31 | @ CREATE TABLE files_of_checkin( |
| 32 | @ checkinID INTEGER, -- RID for the checkin manifest |
| 33 | @ filename TEXT, -- Name of a file |
| 34 | @ uuid TEXT, -- SHA1 hash of the file |
| 35 | @ previousName TEXT, -- Name of the file in previous checkin |
| 36 | @ prem TEXT -- Permissions on the file |
| 37 | @ ); |
| 38 | ; |
| 39 | |
| 40 | #if INTERFACE |
| 41 | /* |
| 42 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -31,11 +31,11 @@ | |
| 31 | @ CREATE TABLE files_of_checkin( |
| 32 | @ checkinID INTEGER, -- RID for the checkin manifest |
| 33 | @ filename TEXT, -- Name of a file |
| 34 | @ uuid TEXT, -- SHA1 hash of the file |
| 35 | @ previousName TEXT, -- Name of the file in previous checkin |
| 36 | @ perm TEXT -- Permissions on the file |
| 37 | @ ); |
| 38 | ; |
| 39 | |
| 40 | #if INTERFACE |
| 41 | /* |
| 42 |
-19
| --- src/glob.c | ||
| +++ src/glob.c | ||
| @@ -138,29 +138,10 @@ | ||
| 138 | 138 | z += i+1; |
| 139 | 139 | } |
| 140 | 140 | return p; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | -/* | |
| 144 | -** Return non-zero if string z matches glob pattern zGlob and zero if the | |
| 145 | -** pattern does not match. | |
| 146 | -** | |
| 147 | -** Globbing rules: | |
| 148 | -** | |
| 149 | -** '*' Matches any sequence of zero or more characters. | |
| 150 | -** | |
| 151 | -** '?' Matches exactly one character. | |
| 152 | -** | |
| 153 | -** [...] Matches one character from the enclosed list of | |
| 154 | -** characters. | |
| 155 | -** | |
| 156 | -** [^...] Matches one character not in the enclosed list. | |
| 157 | -*/ | |
| 158 | -int strglob(const char *zGlob, const char *z){ | |
| 159 | - return sqlite3_strglob(zGlob, z)==0; | |
| 160 | -} | |
| 161 | - | |
| 162 | 143 | /* |
| 163 | 144 | ** Return true (non-zero) if zString matches any of the patterns in |
| 164 | 145 | ** the Glob. The value returned is actually a 1-based index of the pattern |
| 165 | 146 | ** that matched. Return 0 if none of the patterns match zString. |
| 166 | 147 | ** |
| 167 | 148 |
| --- src/glob.c | |
| +++ src/glob.c | |
| @@ -138,29 +138,10 @@ | |
| 138 | z += i+1; |
| 139 | } |
| 140 | return p; |
| 141 | } |
| 142 | |
| 143 | /* |
| 144 | ** Return non-zero if string z matches glob pattern zGlob and zero if the |
| 145 | ** pattern does not match. |
| 146 | ** |
| 147 | ** Globbing rules: |
| 148 | ** |
| 149 | ** '*' Matches any sequence of zero or more characters. |
| 150 | ** |
| 151 | ** '?' Matches exactly one character. |
| 152 | ** |
| 153 | ** [...] Matches one character from the enclosed list of |
| 154 | ** characters. |
| 155 | ** |
| 156 | ** [^...] Matches one character not in the enclosed list. |
| 157 | */ |
| 158 | int strglob(const char *zGlob, const char *z){ |
| 159 | return sqlite3_strglob(zGlob, z)==0; |
| 160 | } |
| 161 | |
| 162 | /* |
| 163 | ** Return true (non-zero) if zString matches any of the patterns in |
| 164 | ** the Glob. The value returned is actually a 1-based index of the pattern |
| 165 | ** that matched. Return 0 if none of the patterns match zString. |
| 166 | ** |
| 167 |
| --- src/glob.c | |
| +++ src/glob.c | |
| @@ -138,29 +138,10 @@ | |
| 138 | z += i+1; |
| 139 | } |
| 140 | return p; |
| 141 | } |
| 142 | |
| 143 | /* |
| 144 | ** Return true (non-zero) if zString matches any of the patterns in |
| 145 | ** the Glob. The value returned is actually a 1-based index of the pattern |
| 146 | ** that matched. Return 0 if none of the patterns match zString. |
| 147 | ** |
| 148 |
+5
-5
| --- src/schema.c | ||
| +++ src/schema.c | ||
| @@ -126,11 +126,11 @@ | ||
| 126 | 126 | @ info TEXT, -- contact information |
| 127 | 127 | @ mtime DATE, -- last change. seconds since 1970 |
| 128 | 128 | @ photo BLOB -- JPEG image of this user |
| 129 | 129 | @ ); |
| 130 | 130 | @ |
| 131 | -@ -- The VAR table holds miscellanous information about the repository. | |
| 131 | +@ -- The config table holds miscellanous information about the repository. | |
| 132 | 132 | @ -- in the form of name-value pairs. |
| 133 | 133 | @ -- |
| 134 | 134 | @ CREATE TABLE config( |
| 135 | 135 | @ name TEXT PRIMARY KEY NOT NULL, -- Primary name of the entry |
| 136 | 136 | @ value CLOB, -- Content of the named parameter |
| @@ -449,12 +449,12 @@ | ||
| 449 | 449 | #if EXPORT_INTERFACE |
| 450 | 450 | # define MAX_INT_TAG 16 /* The largest pre-assigned tag id */ |
| 451 | 451 | #endif |
| 452 | 452 | |
| 453 | 453 | /* |
| 454 | -** The schema for the locate FOSSIL database file found at the root | |
| 455 | -** of very check-out. This database contains the complete state of | |
| 454 | +** The schema for the local FOSSIL database file found at the root | |
| 455 | +** of every check-out. This database contains the complete state of | |
| 456 | 456 | ** the checkout. |
| 457 | 457 | */ |
| 458 | 458 | const char zLocalSchema[] = |
| 459 | 459 | @ -- The VVAR table holds miscellanous information about the local database |
| 460 | 460 | @ -- in the form of name-value pairs. This is similar to the VAR table |
| @@ -481,12 +481,12 @@ | ||
| 481 | 481 | @ -- Vfile.chnged is 0 for unmodified files, 1 for files that have |
| 482 | 482 | @ -- been edited or which have been subjected to a 3-way merge. |
| 483 | 483 | @ -- Vfile.chnged is 2 if the file has been replaced from a different |
| 484 | 484 | @ -- version by the merge and 3 if the file has been added by a merge. |
| 485 | 485 | @ -- Vfile.chnged is 4|5 is the same as 2|3, but the operation has been |
| 486 | -@ -- done by an --integrate merge. The difference between vfile.chnged==2|4 | |
| 487 | -@ -- and a regular add is that with vfile.chnged==2|4 we know that the | |
| 486 | +@ -- done by an --integrate merge. The difference between vfile.chnged==3|5 | |
| 487 | +@ -- and a regular add is that with vfile.chnged==3|5 we know that the | |
| 488 | 488 | @ -- current version of the file is already in the repository. |
| 489 | 489 | @ -- |
| 490 | 490 | @ CREATE TABLE vfile( |
| 491 | 491 | @ id INTEGER PRIMARY KEY, -- ID of the checked out file |
| 492 | 492 | @ vid INTEGER REFERENCES blob, -- The baseline this file is part of. |
| 493 | 493 |
| --- src/schema.c | |
| +++ src/schema.c | |
| @@ -126,11 +126,11 @@ | |
| 126 | @ info TEXT, -- contact information |
| 127 | @ mtime DATE, -- last change. seconds since 1970 |
| 128 | @ photo BLOB -- JPEG image of this user |
| 129 | @ ); |
| 130 | @ |
| 131 | @ -- The VAR table holds miscellanous information about the repository. |
| 132 | @ -- in the form of name-value pairs. |
| 133 | @ -- |
| 134 | @ CREATE TABLE config( |
| 135 | @ name TEXT PRIMARY KEY NOT NULL, -- Primary name of the entry |
| 136 | @ value CLOB, -- Content of the named parameter |
| @@ -449,12 +449,12 @@ | |
| 449 | #if EXPORT_INTERFACE |
| 450 | # define MAX_INT_TAG 16 /* The largest pre-assigned tag id */ |
| 451 | #endif |
| 452 | |
| 453 | /* |
| 454 | ** The schema for the locate FOSSIL database file found at the root |
| 455 | ** of very check-out. This database contains the complete state of |
| 456 | ** the checkout. |
| 457 | */ |
| 458 | const char zLocalSchema[] = |
| 459 | @ -- The VVAR table holds miscellanous information about the local database |
| 460 | @ -- in the form of name-value pairs. This is similar to the VAR table |
| @@ -481,12 +481,12 @@ | |
| 481 | @ -- Vfile.chnged is 0 for unmodified files, 1 for files that have |
| 482 | @ -- been edited or which have been subjected to a 3-way merge. |
| 483 | @ -- Vfile.chnged is 2 if the file has been replaced from a different |
| 484 | @ -- version by the merge and 3 if the file has been added by a merge. |
| 485 | @ -- Vfile.chnged is 4|5 is the same as 2|3, but the operation has been |
| 486 | @ -- done by an --integrate merge. The difference between vfile.chnged==2|4 |
| 487 | @ -- and a regular add is that with vfile.chnged==2|4 we know that the |
| 488 | @ -- current version of the file is already in the repository. |
| 489 | @ -- |
| 490 | @ CREATE TABLE vfile( |
| 491 | @ id INTEGER PRIMARY KEY, -- ID of the checked out file |
| 492 | @ vid INTEGER REFERENCES blob, -- The baseline this file is part of. |
| 493 |
| --- src/schema.c | |
| +++ src/schema.c | |
| @@ -126,11 +126,11 @@ | |
| 126 | @ info TEXT, -- contact information |
| 127 | @ mtime DATE, -- last change. seconds since 1970 |
| 128 | @ photo BLOB -- JPEG image of this user |
| 129 | @ ); |
| 130 | @ |
| 131 | @ -- The config table holds miscellanous information about the repository. |
| 132 | @ -- in the form of name-value pairs. |
| 133 | @ -- |
| 134 | @ CREATE TABLE config( |
| 135 | @ name TEXT PRIMARY KEY NOT NULL, -- Primary name of the entry |
| 136 | @ value CLOB, -- Content of the named parameter |
| @@ -449,12 +449,12 @@ | |
| 449 | #if EXPORT_INTERFACE |
| 450 | # define MAX_INT_TAG 16 /* The largest pre-assigned tag id */ |
| 451 | #endif |
| 452 | |
| 453 | /* |
| 454 | ** The schema for the local FOSSIL database file found at the root |
| 455 | ** of every check-out. This database contains the complete state of |
| 456 | ** the checkout. |
| 457 | */ |
| 458 | const char zLocalSchema[] = |
| 459 | @ -- The VVAR table holds miscellanous information about the local database |
| 460 | @ -- in the form of name-value pairs. This is similar to the VAR table |
| @@ -481,12 +481,12 @@ | |
| 481 | @ -- Vfile.chnged is 0 for unmodified files, 1 for files that have |
| 482 | @ -- been edited or which have been subjected to a 3-way merge. |
| 483 | @ -- Vfile.chnged is 2 if the file has been replaced from a different |
| 484 | @ -- version by the merge and 3 if the file has been added by a merge. |
| 485 | @ -- Vfile.chnged is 4|5 is the same as 2|3, but the operation has been |
| 486 | @ -- done by an --integrate merge. The difference between vfile.chnged==3|5 |
| 487 | @ -- and a regular add is that with vfile.chnged==3|5 we know that the |
| 488 | @ -- current version of the file is already in the repository. |
| 489 | @ -- |
| 490 | @ CREATE TABLE vfile( |
| 491 | @ id INTEGER PRIMARY KEY, -- ID of the checked out file |
| 492 | @ vid INTEGER REFERENCES blob, -- The baseline this file is part of. |
| 493 |