Fossil SCM

Fixed several "Ok" -> "OK".

wyoung 2020-07-20 15:18 trunk
Commit b92e460fd756da5f7b91277c3628bde710916f8f916a48372b5350454fabc8f5
Parent 70bf9a6bf758805…
6 files changed +2 -2 +5 -5 +1 -1 +2 -2 +1 -1 +1 -1
~ src/merge.c ~ src/path.c ~ src/sync.c ~ src/th.c ~ src/wysiwyg.c ~ www/serverext.wiki
M src/merge.c
+2 -2
--- src/merge.c
+++ src/merge.c
@@ -137,17 +137,17 @@
137137
 */
138138
 static void add_renames(
139139
 const char *zFnCol, /* The FV column for the filename in vid */
140140
 int vid, /* The desired version's RID */
141141
 int nid, /* Version N's RID */
142
- int revOk, /* Ok to move backwards (child->parent) if true */
142
+ int revOK, /* OK to move backwards (child->parent) if true */
143143
 const char *zDebug /* Generate trace output if not NULL */
144144
 ){
145145
 int nChng; /* Number of file name changes */
146146
 int *aChng; /* An array of file name changes */
147147
 int i; /* Loop counter */
148
- find_filename_changes(nid, vid, revOk, &nChng, &aChng, zDebug);
148
+ find_filename_changes(nid, vid, revOK, &nChng, &aChng, zDebug);
149149
 if( nChng==0 ) return;
150150
 for(i=0; i<nChng; i++){
151151
 char *zN, *zV;
152152
 zN = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2]);
153153
 zV = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2+1]);
154154
--- src/merge.c
+++ src/merge.c
@@ -137,17 +137,17 @@
137 */
138 static void add_renames(
139 const char *zFnCol, /* The FV column for the filename in vid */
140 int vid, /* The desired version's RID */
141 int nid, /* Version N's RID */
142 int revOk, /* Ok to move backwards (child->parent) if true */
143 const char *zDebug /* Generate trace output if not NULL */
144 ){
145 int nChng; /* Number of file name changes */
146 int *aChng; /* An array of file name changes */
147 int i; /* Loop counter */
148 find_filename_changes(nid, vid, revOk, &nChng, &aChng, zDebug);
149 if( nChng==0 ) return;
150 for(i=0; i<nChng; i++){
151 char *zN, *zV;
152 zN = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2]);
153 zV = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2+1]);
154
--- src/merge.c
+++ src/merge.c
@@ -137,17 +137,17 @@
137 */
138 static void add_renames(
139 const char *zFnCol, /* The FV column for the filename in vid */
140 int vid, /* The desired version's RID */
141 int nid, /* Version N's RID */
142 int revOK, /* OK to move backwards (child->parent) if true */
143 const char *zDebug /* Generate trace output if not NULL */
144 ){
145 int nChng; /* Number of file name changes */
146 int *aChng; /* An array of file name changes */
147 int i; /* Loop counter */
148 find_filename_changes(nid, vid, revOK, &nChng, &aChng, zDebug);
149 if( nChng==0 ) return;
150 for(i=0; i<nChng; i++){
151 char *zN, *zV;
152 zN = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2]);
153 zV = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2+1]);
154
M src/path.c
+5 -5
--- src/path.c
+++ src/path.c
@@ -421,11 +421,11 @@
421421
 ** infrastructure.
422422
 */
423423
 void find_filename_changes(
424424
 int iFrom, /* Ancestor check-in */
425425
 int iTo, /* Recent check-in */
426
- int revOk, /* Ok to move backwards (child->parent) if true */
426
+ int revOK, /* OK to move backwards (child->parent) if true */
427427
 int *pnChng, /* Number of name changes along the path */
428428
 int **aiChng, /* Name changes */
429429
 const char *zDebug /* Generate trace output if no NULL */
430430
 ){
431431
 PathNode *p; /* For looping over path from iFrom to iTo */
@@ -443,11 +443,11 @@
443443
 }else if(0==iTo){
444444
 fossil_fatal("Invalid 'to' RID: 0");
445445
 }
446446
 if( iFrom==iTo ) return;
447447
 path_reset();
448
- p = path_shortest(iFrom, iTo, 1, revOk==0, 0);
448
+ p = path_shortest(iFrom, iTo, 1, revOK==0, 0);
449449
 if( p==0 ) return;
450450
 path_reverse_path();
451451
 db_prepare(&q1,
452452
 "SELECT pfnid, fnid FROM mlink"
453453
 " WHERE mid=:mid AND (pfnid>0 OR fid==0)"
@@ -541,20 +541,20 @@
541541
 int iTo;
542542
 int *aChng;
543543
 int nChng;
544544
 int i;
545545
 const char *zDebug = 0;
546
- int revOk = 0;
546
+ int revOK = 0;
547547
548548
 db_find_and_open_repository(0,0);
549549
 zDebug = find_option("debug",0,0)!=0 ? "debug" : 0;
550
- revOk = find_option("bidirectional",0,0)!=0;
550
+ revOK = find_option("bidirectional",0,0)!=0;
551551
 if( g.argc<4 ) usage("VERSION1 VERSION2");
552552
 while( g.argc>=4 ){
553553
 iFrom = name_to_rid(g.argv[2]);
554554
 iTo = name_to_rid(g.argv[3]);
555
- find_filename_changes(iFrom, iTo, revOk, &nChng, &aChng, zDebug);
555
+ find_filename_changes(iFrom, iTo, revOK, &nChng, &aChng, zDebug);
556556
 fossil_print("------ Changes for (%d) %s -> (%d) %s\n",
557557
 iFrom, g.argv[2], iTo, g.argv[3]);
558558
 for(i=0; i<nChng; i++){
559559
 char *zFrom, *zTo;
560560
561561
--- src/path.c
+++ src/path.c
@@ -421,11 +421,11 @@
421 ** infrastructure.
422 */
423 void find_filename_changes(
424 int iFrom, /* Ancestor check-in */
425 int iTo, /* Recent check-in */
426 int revOk, /* Ok to move backwards (child->parent) if true */
427 int *pnChng, /* Number of name changes along the path */
428 int **aiChng, /* Name changes */
429 const char *zDebug /* Generate trace output if no NULL */
430 ){
431 PathNode *p; /* For looping over path from iFrom to iTo */
@@ -443,11 +443,11 @@
443 }else if(0==iTo){
444 fossil_fatal("Invalid 'to' RID: 0");
445 }
446 if( iFrom==iTo ) return;
447 path_reset();
448 p = path_shortest(iFrom, iTo, 1, revOk==0, 0);
449 if( p==0 ) return;
450 path_reverse_path();
451 db_prepare(&q1,
452 "SELECT pfnid, fnid FROM mlink"
453 " WHERE mid=:mid AND (pfnid>0 OR fid==0)"
@@ -541,20 +541,20 @@
541 int iTo;
542 int *aChng;
543 int nChng;
544 int i;
545 const char *zDebug = 0;
546 int revOk = 0;
547
548 db_find_and_open_repository(0,0);
549 zDebug = find_option("debug",0,0)!=0 ? "debug" : 0;
550 revOk = find_option("bidirectional",0,0)!=0;
551 if( g.argc<4 ) usage("VERSION1 VERSION2");
552 while( g.argc>=4 ){
553 iFrom = name_to_rid(g.argv[2]);
554 iTo = name_to_rid(g.argv[3]);
555 find_filename_changes(iFrom, iTo, revOk, &nChng, &aChng, zDebug);
556 fossil_print("------ Changes for (%d) %s -> (%d) %s\n",
557 iFrom, g.argv[2], iTo, g.argv[3]);
558 for(i=0; i<nChng; i++){
559 char *zFrom, *zTo;
560
561
--- src/path.c
+++ src/path.c
@@ -421,11 +421,11 @@
421 ** infrastructure.
422 */
423 void find_filename_changes(
424 int iFrom, /* Ancestor check-in */
425 int iTo, /* Recent check-in */
426 int revOK, /* OK to move backwards (child->parent) if true */
427 int *pnChng, /* Number of name changes along the path */
428 int **aiChng, /* Name changes */
429 const char *zDebug /* Generate trace output if no NULL */
430 ){
431 PathNode *p; /* For looping over path from iFrom to iTo */
@@ -443,11 +443,11 @@
443 }else if(0==iTo){
444 fossil_fatal("Invalid 'to' RID: 0");
445 }
446 if( iFrom==iTo ) return;
447 path_reset();
448 p = path_shortest(iFrom, iTo, 1, revOK==0, 0);
449 if( p==0 ) return;
450 path_reverse_path();
451 db_prepare(&q1,
452 "SELECT pfnid, fnid FROM mlink"
453 " WHERE mid=:mid AND (pfnid>0 OR fid==0)"
@@ -541,20 +541,20 @@
541 int iTo;
542 int *aChng;
543 int nChng;
544 int i;
545 const char *zDebug = 0;
546 int revOK = 0;
547
548 db_find_and_open_repository(0,0);
549 zDebug = find_option("debug",0,0)!=0 ? "debug" : 0;
550 revOK = find_option("bidirectional",0,0)!=0;
551 if( g.argc<4 ) usage("VERSION1 VERSION2");
552 while( g.argc>=4 ){
553 iFrom = name_to_rid(g.argv[2]);
554 iTo = name_to_rid(g.argv[3]);
555 find_filename_changes(iFrom, iTo, revOK, &nChng, &aChng, zDebug);
556 fossil_print("------ Changes for (%d) %s -> (%d) %s\n",
557 iFrom, g.argv[2], iTo, g.argv[3]);
558 for(i=0; i<nChng; i++){
559 char *zFrom, *zTo;
560
561
M src/sync.c
+1 -1
--- src/sync.c
+++ src/sync.c
@@ -513,11 +513,11 @@
513513
 ** open checkout file (if any) is not saved. Nor is the global configuration
514514
 ** database.
515515
 **
516516
 ** Options:
517517
 **
518
-** --overwrite Ok to overwrite an existing file.
518
+** --overwrite OK to overwrite an existing file.
519519
 ** -R NAME Filename of the repository to backup
520520
 */
521521
 void backup_cmd(void){
522522
 char *zDest;
523523
 int bOverwrite = 0;
524524
--- src/sync.c
+++ src/sync.c
@@ -513,11 +513,11 @@
513 ** open checkout file (if any) is not saved. Nor is the global configuration
514 ** database.
515 **
516 ** Options:
517 **
518 ** --overwrite Ok to overwrite an existing file.
519 ** -R NAME Filename of the repository to backup
520 */
521 void backup_cmd(void){
522 char *zDest;
523 int bOverwrite = 0;
524
--- src/sync.c
+++ src/sync.c
@@ -513,11 +513,11 @@
513 ** open checkout file (if any) is not saved. Nor is the global configuration
514 ** database.
515 **
516 ** Options:
517 **
518 ** --overwrite OK to overwrite an existing file.
519 ** -R NAME Filename of the repository to backup
520 */
521 void backup_cmd(void){
522 char *zDest;
523 int bOverwrite = 0;
524
M src/th.c
+2 -2
--- src/th.c
+++ src/th.c
@@ -1134,19 +1134,19 @@
11341134
 ** it is created. Otherwise, an error is left in the interpreter result
11351135
 ** and NULL returned.
11361136
 **
11371137
 ** If the arrayok argument is false and the named variable is an array,
11381138
 ** an error is left in the interpreter result and NULL returned. If
1139
-** arrayok is true an array name is Ok.
1139
+** arrayok is true an array name is OK.
11401140
 */
11411141
11421142
 static Th_Variable *thFindValue(
11431143
 Th_Interp *interp,
11441144
 const char *zVar, /* Pointer to variable name */
11451145
 int nVar, /* Number of bytes at nVar */
11461146
 int create, /* If true, create the variable if not found */
1147
- int arrayok, /* If true, an array is Ok. Otherwise array==error */
1147
+ int arrayok, /* If true, an array is OK. Otherwise array==error */
11481148
 int noerror, /* If false, set interpreter result to error */
11491149
 Find *pFind /* If non-zero, place output here */
11501150
 ){
11511151
 const char *zOuter;
11521152
 int nOuter;
11531153
--- src/th.c
+++ src/th.c
@@ -1134,19 +1134,19 @@
1134 ** it is created. Otherwise, an error is left in the interpreter result
1135 ** and NULL returned.
1136 **
1137 ** If the arrayok argument is false and the named variable is an array,
1138 ** an error is left in the interpreter result and NULL returned. If
1139 ** arrayok is true an array name is Ok.
1140 */
1141
1142 static Th_Variable *thFindValue(
1143 Th_Interp *interp,
1144 const char *zVar, /* Pointer to variable name */
1145 int nVar, /* Number of bytes at nVar */
1146 int create, /* If true, create the variable if not found */
1147 int arrayok, /* If true, an array is Ok. Otherwise array==error */
1148 int noerror, /* If false, set interpreter result to error */
1149 Find *pFind /* If non-zero, place output here */
1150 ){
1151 const char *zOuter;
1152 int nOuter;
1153
--- src/th.c
+++ src/th.c
@@ -1134,19 +1134,19 @@
1134 ** it is created. Otherwise, an error is left in the interpreter result
1135 ** and NULL returned.
1136 **
1137 ** If the arrayok argument is false and the named variable is an array,
1138 ** an error is left in the interpreter result and NULL returned. If
1139 ** arrayok is true an array name is OK.
1140 */
1141
1142 static Th_Variable *thFindValue(
1143 Th_Interp *interp,
1144 const char *zVar, /* Pointer to variable name */
1145 int nVar, /* Number of bytes at nVar */
1146 int create, /* If true, create the variable if not found */
1147 int arrayok, /* If true, an array is OK. Otherwise array==error */
1148 int noerror, /* If false, set interpreter result to error */
1149 Find *pFind /* If non-zero, place output here */
1150 ){
1151 const char *zOuter;
1152 int nOuter;
1153
M src/wysiwyg.c
+1 -1
--- src/wysiwyg.c
+++ src/wysiwyg.c
@@ -283,11 +283,11 @@
283283
 @ } catch (e) {
284284
 @ try {
285285
 @ // For IE9 or IE10, this should work.
286286
 @ document.execCommand("useCSS", 0, true);
287287
 @ } catch (e) {
288
- @ // Ok, that apparently did not work, do nothing.
288
+ @ // OK, that apparently did not work, do nothing.
289289
 @ }
290290
 @ }
291291
 @ document.execCommand(sCmd, false, sValue);
292292
 @ oDoc.focus();
293293
 @ }
294294
--- src/wysiwyg.c
+++ src/wysiwyg.c
@@ -283,11 +283,11 @@
283 @ } catch (e) {
284 @ try {
285 @ // For IE9 or IE10, this should work.
286 @ document.execCommand("useCSS", 0, true);
287 @ } catch (e) {
288 @ // Ok, that apparently did not work, do nothing.
289 @ }
290 @ }
291 @ document.execCommand(sCmd, false, sValue);
292 @ oDoc.focus();
293 @ }
294
--- src/wysiwyg.c
+++ src/wysiwyg.c
@@ -283,11 +283,11 @@
283 @ } catch (e) {
284 @ try {
285 @ // For IE9 or IE10, this should work.
286 @ document.execCommand("useCSS", 0, true);
287 @ } catch (e) {
288 @ // OK, that apparently did not work, do nothing.
289 @ }
290 @ }
291 @ document.execCommand(sCmd, false, sValue);
292 @ oDoc.focus();
293 @ }
294
M www/serverext.wiki
+1 -1
--- www/serverext.wiki
+++ www/serverext.wiki
@@ -219,11 +219,11 @@
219219
 the CGI. These are followed by a blank line and then the content.
220220
221221
 Typical parameter output looks like this:
222222
223223
 <blockquote><verbatim>
224
-Status: 200 Ok
224
+Status: 200 OK
225225
 Content-Type: text/html
226226
 </verbatim></blockquote>
227227
228228
 CGI programs can return any content type they want - they are not restricted
229229
 to text replies. It is OK for a CGI program to return (for example)
230230
--- www/serverext.wiki
+++ www/serverext.wiki
@@ -219,11 +219,11 @@
219 the CGI. These are followed by a blank line and then the content.
220
221 Typical parameter output looks like this:
222
223 <blockquote><verbatim>
224 Status: 200 Ok
225 Content-Type: text/html
226 </verbatim></blockquote>
227
228 CGI programs can return any content type they want - they are not restricted
229 to text replies. It is OK for a CGI program to return (for example)
230
--- www/serverext.wiki
+++ www/serverext.wiki
@@ -219,11 +219,11 @@
219 the CGI. These are followed by a blank line and then the content.
220
221 Typical parameter output looks like this:
222
223 <blockquote><verbatim>
224 Status: 200 OK
225 Content-Type: text/html
226 </verbatim></blockquote>
227
228 CGI programs can return any content type they want - they are not restricted
229 to text replies. It is OK for a CGI program to return (for example)
230

Keyboard Shortcuts

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