Fossil SCM

Few (textual) typos. Eliminate unneccary spacing.

jan.nijtmans 2017-03-02 12:08 trunk
Commit b098c9398aacca4085a6117196f2d5a2a9cbf47f
+1 -1
--- src/manifest.c
+++ src/manifest.c
@@ -327,11 +327,11 @@
327327
** takes over the input blob and will free it when the
328328
** Manifest object is freed. Zeros are inserted into the blob
329329
** as string terminators so that blob should not be used again.
330330
**
331331
** Return a pointer to an allocated Manifest object if the content
332
-** really is a structural artifact of some kind. The returned Manifest
332
+** really is a structural artifact of some kind. The returned Manifest
333333
** object needs to be freed by a subsequent call to manifest_destroy().
334334
** Return NULL if there are syntax errors or if the input blob does
335335
** not describe a valid structural artifact.
336336
**
337337
** This routine is strict about the format of a structural artifacts.
338338
--- src/manifest.c
+++ src/manifest.c
@@ -327,11 +327,11 @@
327 ** takes over the input blob and will free it when the
328 ** Manifest object is freed. Zeros are inserted into the blob
329 ** as string terminators so that blob should not be used again.
330 **
331 ** Return a pointer to an allocated Manifest object if the content
332 ** really is a structural artifact of some kind. The returned Manifest
333 ** object needs to be freed by a subsequent call to manifest_destroy().
334 ** Return NULL if there are syntax errors or if the input blob does
335 ** not describe a valid structural artifact.
336 **
337 ** This routine is strict about the format of a structural artifacts.
338
--- src/manifest.c
+++ src/manifest.c
@@ -327,11 +327,11 @@
327 ** takes over the input blob and will free it when the
328 ** Manifest object is freed. Zeros are inserted into the blob
329 ** as string terminators so that blob should not be used again.
330 **
331 ** Return a pointer to an allocated Manifest object if the content
332 ** really is a structural artifact of some kind. The returned Manifest
333 ** object needs to be freed by a subsequent call to manifest_destroy().
334 ** Return NULL if there are syntax errors or if the input blob does
335 ** not describe a valid structural artifact.
336 **
337 ** This routine is strict about the format of a structural artifacts.
338
+2 -2
--- src/sha1.c
+++ src/sha1.c
@@ -63,11 +63,11 @@
6363
#define SHA1Init SHA1DCInit
6464
#define SHA1Update SHA1DCUpdate
6565
#define SHA1Final SHA1DCFinal
6666
6767
/*
68
-** SHA1 Implemenatation #2: use the SHA1 algorithm built into SSL
68
+** SHA1 Implementation #2: use the SHA1 algorithm built into SSL
6969
*/
7070
#elif defined(FOSSIL_ENABLE_SSL)
7171
7272
# include <openssl/sha.h>
7373
# define SHA1Context SHA_CTX
@@ -74,11 +74,11 @@
7474
# define SHA1Init SHA1_Init
7575
# define SHA1Update SHA1_Update
7676
# define SHA1Final SHA1_Final
7777
7878
/*
79
-** SHA1 Implemenatation #3: If none of the previous two SHA1
79
+** SHA1 Implementation #3: If none of the previous two SHA1
8080
** algorithms work, there is this built-in. This built-in was the
8181
** original implementation used by Fossil.
8282
*/
8383
#else
8484
/*
8585
--- src/sha1.c
+++ src/sha1.c
@@ -63,11 +63,11 @@
63 #define SHA1Init SHA1DCInit
64 #define SHA1Update SHA1DCUpdate
65 #define SHA1Final SHA1DCFinal
66
67 /*
68 ** SHA1 Implemenatation #2: use the SHA1 algorithm built into SSL
69 */
70 #elif defined(FOSSIL_ENABLE_SSL)
71
72 # include <openssl/sha.h>
73 # define SHA1Context SHA_CTX
@@ -74,11 +74,11 @@
74 # define SHA1Init SHA1_Init
75 # define SHA1Update SHA1_Update
76 # define SHA1Final SHA1_Final
77
78 /*
79 ** SHA1 Implemenatation #3: If none of the previous two SHA1
80 ** algorithms work, there is this built-in. This built-in was the
81 ** original implementation used by Fossil.
82 */
83 #else
84 /*
85
--- src/sha1.c
+++ src/sha1.c
@@ -63,11 +63,11 @@
63 #define SHA1Init SHA1DCInit
64 #define SHA1Update SHA1DCUpdate
65 #define SHA1Final SHA1DCFinal
66
67 /*
68 ** SHA1 Implementation #2: use the SHA1 algorithm built into SSL
69 */
70 #elif defined(FOSSIL_ENABLE_SSL)
71
72 # include <openssl/sha.h>
73 # define SHA1Context SHA_CTX
@@ -74,11 +74,11 @@
74 # define SHA1Init SHA1_Init
75 # define SHA1Update SHA1_Update
76 # define SHA1Final SHA1_Final
77
78 /*
79 ** SHA1 Implementation #3: If none of the previous two SHA1
80 ** algorithms work, there is this built-in. This built-in was the
81 ** original implementation used by Fossil.
82 */
83 #else
84 /*
85
+6 -6
--- src/sha1hard.c
+++ src/sha1hard.c
@@ -1,8 +1,8 @@
11
/*
2
-** The code in this file is the concatination of several files
3
-** copied out of
2
+** The code in this file is the concatenation of several files
3
+** copied out of
44
**
55
** https://github.com/cr-marcstevens/sha1collisiondetection
66
**
77
** The copy was made on 2017-03-01. Some minor formatting changes
88
** were made but otherwise the code is unchanged. All
@@ -26,18 +26,18 @@
2626
* https://opensource.org/licenses/MIT
2727
***/
2828
/*************** File: LICENSE.txt ***************/
2929
/*
3030
** MIT License
31
-**
31
+**
3232
** Copyright (c) 2017:
3333
** Marc Stevens
3434
** Cryptology Group
3535
** Centrum Wiskunde & Informatica
3636
** P.O. Box 94079, 1090 GB Amsterdam, Netherlands
3737
** [email protected]
38
-**
38
+**
3939
** Dan Shumow
4040
** Microsoft Research
4141
** [email protected]
4242
**
4343
** Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -44,14 +44,14 @@
4444
** of this software and associated documentation files (the "Software"), to deal
4545
** in the Software without restriction, including without limitation the rights
4646
** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
4747
** copies of the Software, and to permit persons to whom the Software is
4848
** furnished to do so, subject to the following conditions:
49
-**
49
+**
5050
** The above copyright notice and this permission notice shall be included in all
5151
** copies or substantial portions of the Software.
52
-**
52
+**
5353
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
5454
** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
5555
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
5656
** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
5757
** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
5858
--- src/sha1hard.c
+++ src/sha1hard.c
@@ -1,8 +1,8 @@
1 /*
2 ** The code in this file is the concatination of several files
3 ** copied out of
4 **
5 ** https://github.com/cr-marcstevens/sha1collisiondetection
6 **
7 ** The copy was made on 2017-03-01. Some minor formatting changes
8 ** were made but otherwise the code is unchanged. All
@@ -26,18 +26,18 @@
26 * https://opensource.org/licenses/MIT
27 ***/
28 /*************** File: LICENSE.txt ***************/
29 /*
30 ** MIT License
31 **
32 ** Copyright (c) 2017:
33 ** Marc Stevens
34 ** Cryptology Group
35 ** Centrum Wiskunde & Informatica
36 ** P.O. Box 94079, 1090 GB Amsterdam, Netherlands
37 ** [email protected]
38 **
39 ** Dan Shumow
40 ** Microsoft Research
41 ** [email protected]
42 **
43 ** Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -44,14 +44,14 @@
44 ** of this software and associated documentation files (the "Software"), to deal
45 ** in the Software without restriction, including without limitation the rights
46 ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
47 ** copies of the Software, and to permit persons to whom the Software is
48 ** furnished to do so, subject to the following conditions:
49 **
50 ** The above copyright notice and this permission notice shall be included in all
51 ** copies or substantial portions of the Software.
52 **
53 ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
54 ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
55 ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
56 ** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
57 ** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
58
--- src/sha1hard.c
+++ src/sha1hard.c
@@ -1,8 +1,8 @@
1 /*
2 ** The code in this file is the concatenation of several files
3 ** copied out of
4 **
5 ** https://github.com/cr-marcstevens/sha1collisiondetection
6 **
7 ** The copy was made on 2017-03-01. Some minor formatting changes
8 ** were made but otherwise the code is unchanged. All
@@ -26,18 +26,18 @@
26 * https://opensource.org/licenses/MIT
27 ***/
28 /*************** File: LICENSE.txt ***************/
29 /*
30 ** MIT License
31 **
32 ** Copyright (c) 2017:
33 ** Marc Stevens
34 ** Cryptology Group
35 ** Centrum Wiskunde & Informatica
36 ** P.O. Box 94079, 1090 GB Amsterdam, Netherlands
37 ** [email protected]
38 **
39 ** Dan Shumow
40 ** Microsoft Research
41 ** [email protected]
42 **
43 ** Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -44,14 +44,14 @@
44 ** of this software and associated documentation files (the "Software"), to deal
45 ** in the Software without restriction, including without limitation the rights
46 ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
47 ** copies of the Software, and to permit persons to whom the Software is
48 ** furnished to do so, subject to the following conditions:
49 **
50 ** The above copyright notice and this permission notice shall be included in all
51 ** copies or substantial portions of the Software.
52 **
53 ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
54 ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
55 ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
56 ** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
57 ** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
58
+1 -1
--- src/sha3.c
+++ src/sha3.c
@@ -43,11 +43,11 @@
4343
#endif
4444
4545
4646
/*
4747
** State structure for a SHA3 hash in progress
48
-*/
48
+*/
4949
typedef struct SHA3Context SHA3Context;
5050
struct SHA3Context {
5151
union {
5252
u64 s[25]; /* Keccak state. 5x5 lines of 64 bits each */
5353
unsigned char x[1600]; /* ... or 1600 bytes */
5454
--- src/sha3.c
+++ src/sha3.c
@@ -43,11 +43,11 @@
43 #endif
44
45
46 /*
47 ** State structure for a SHA3 hash in progress
48 */
49 typedef struct SHA3Context SHA3Context;
50 struct SHA3Context {
51 union {
52 u64 s[25]; /* Keccak state. 5x5 lines of 64 bits each */
53 unsigned char x[1600]; /* ... or 1600 bytes */
54
--- src/sha3.c
+++ src/sha3.c
@@ -43,11 +43,11 @@
43 #endif
44
45
46 /*
47 ** State structure for a SHA3 hash in progress
48 */
49 typedef struct SHA3Context SHA3Context;
50 struct SHA3Context {
51 union {
52 u64 s[25]; /* Keccak state. 5x5 lines of 64 bits each */
53 unsigned char x[1600]; /* ... or 1600 bytes */
54
+1 -1
--- src/shun.c
+++ src/shun.c
@@ -173,11 +173,11 @@
173173
@ 64-character lowercase hexadecimal hash of the artifact content) in the
174174
@ following box and press the "Shun" button. This will cause the artifacts
175175
@ to be removed from the repository and will prevent the artifacts from being
176176
@ readded to the repository by subsequent sync operation.</p>
177177
@
178
- @ <p>Note that you must enter the full 40- or 64-character artifact hashes,
178
+ @ <p>Note that you must enter the full 40- or 64-character artifact hashes,
179179
@ not an abbreviation or a symbolic tag.</p>
180180
@
181181
@ <p>Warning: Shunning should only be used to remove inappropriate content
182182
@ from the repository. Inappropriate content includes such things as
183183
@ spam added to Wiki, files that violate copyright or patent agreements,
184184
--- src/shun.c
+++ src/shun.c
@@ -173,11 +173,11 @@
173 @ 64-character lowercase hexadecimal hash of the artifact content) in the
174 @ following box and press the "Shun" button. This will cause the artifacts
175 @ to be removed from the repository and will prevent the artifacts from being
176 @ readded to the repository by subsequent sync operation.</p>
177 @
178 @ <p>Note that you must enter the full 40- or 64-character artifact hashes,
179 @ not an abbreviation or a symbolic tag.</p>
180 @
181 @ <p>Warning: Shunning should only be used to remove inappropriate content
182 @ from the repository. Inappropriate content includes such things as
183 @ spam added to Wiki, files that violate copyright or patent agreements,
184
--- src/shun.c
+++ src/shun.c
@@ -173,11 +173,11 @@
173 @ 64-character lowercase hexadecimal hash of the artifact content) in the
174 @ following box and press the "Shun" button. This will cause the artifacts
175 @ to be removed from the repository and will prevent the artifacts from being
176 @ readded to the repository by subsequent sync operation.</p>
177 @
178 @ <p>Note that you must enter the full 40- or 64-character artifact hashes,
179 @ not an abbreviation or a symbolic tag.</p>
180 @
181 @ <p>Warning: Shunning should only be used to remove inappropriate content
182 @ from the repository. Inappropriate content includes such things as
183 @ spam added to Wiki, files that violate copyright or patent agreements,
184
+1 -1
--- src/vfile.c
+++ src/vfile.c
@@ -21,11 +21,11 @@
2121
#include "vfile.h"
2222
#include <assert.h>
2323
#include <sys/types.h>
2424
2525
/*
26
-** The input is guaranteed to be a 40- or 64-character well-formed
26
+** The input is guaranteed to be a 40- or 64-character well-formed
2727
** artifact hash. Find its rid.
2828
*/
2929
int fast_uuid_to_rid(const char *zUuid){
3030
static Stmt q;
3131
int rid;
3232
--- src/vfile.c
+++ src/vfile.c
@@ -21,11 +21,11 @@
21 #include "vfile.h"
22 #include <assert.h>
23 #include <sys/types.h>
24
25 /*
26 ** The input is guaranteed to be a 40- or 64-character well-formed
27 ** artifact hash. Find its rid.
28 */
29 int fast_uuid_to_rid(const char *zUuid){
30 static Stmt q;
31 int rid;
32
--- src/vfile.c
+++ src/vfile.c
@@ -21,11 +21,11 @@
21 #include "vfile.h"
22 #include <assert.h>
23 #include <sys/types.h>
24
25 /*
26 ** The input is guaranteed to be a 40- or 64-character well-formed
27 ** artifact hash. Find its rid.
28 */
29 int fast_uuid_to_rid(const char *zUuid){
30 static Stmt q;
31 int rid;
32
+2 -2
--- src/xfer.c
+++ src/xfer.c
@@ -496,15 +496,15 @@
496496
}
497497
return size;
498498
}
499499
500500
/*
501
-** Push an error message to alert the older client that the repository
501
+** Push an error message to alert the older client that the repository
502502
** has SHA3 content and cannot be synced or cloned.
503503
*/
504504
static void xfer_cannot_send_sha3_error(Xfer *pXfer){
505
- blob_appendf(pXfer->pOut,
505
+ blob_appendf(pXfer->pOut,
506506
"error Fossil\\sversion\\s2.0\\sor\\slater\\srequired.\n"
507507
);
508508
}
509509
510510
511511
--- src/xfer.c
+++ src/xfer.c
@@ -496,15 +496,15 @@
496 }
497 return size;
498 }
499
500 /*
501 ** Push an error message to alert the older client that the repository
502 ** has SHA3 content and cannot be synced or cloned.
503 */
504 static void xfer_cannot_send_sha3_error(Xfer *pXfer){
505 blob_appendf(pXfer->pOut,
506 "error Fossil\\sversion\\s2.0\\sor\\slater\\srequired.\n"
507 );
508 }
509
510
511
--- src/xfer.c
+++ src/xfer.c
@@ -496,15 +496,15 @@
496 }
497 return size;
498 }
499
500 /*
501 ** Push an error message to alert the older client that the repository
502 ** has SHA3 content and cannot be synced or cloned.
503 */
504 static void xfer_cannot_send_sha3_error(Xfer *pXfer){
505 blob_appendf(pXfer->pOut,
506 "error Fossil\\sversion\\s2.0\\sor\\slater\\srequired.\n"
507 );
508 }
509
510
511
--- www/fileformat.wiki
+++ www/fileformat.wiki
@@ -42,13 +42,13 @@
4242
the hash is computed. The artifact name is just the (lower-case
4343
hexadecimal) hash of the raw artifact.
4444
4545
Fossil currently computes artifact names using either SHA1 or SHA3-256. It
4646
is relatively easy to add new algorithms in the future, but there are no
47
-plans to do so at this time.
47
+plans to do so at this time.
4848
49
-When referring to artifacts in using tty commands or webpage URLs, it is
49
+When referring to artifacts in using tty commands or webpage URLs, it is
5050
sufficient to specify a unique prefix for the artifact name. If the input
5151
prefix is not unique, Fossil will show an error. Within a structural
5252
artifact, however, all references to other artifacts must be the complete
5353
hash.
5454
5555
--- www/fileformat.wiki
+++ www/fileformat.wiki
@@ -42,13 +42,13 @@
42 the hash is computed. The artifact name is just the (lower-case
43 hexadecimal) hash of the raw artifact.
44
45 Fossil currently computes artifact names using either SHA1 or SHA3-256. It
46 is relatively easy to add new algorithms in the future, but there are no
47 plans to do so at this time.
48
49 When referring to artifacts in using tty commands or webpage URLs, it is
50 sufficient to specify a unique prefix for the artifact name. If the input
51 prefix is not unique, Fossil will show an error. Within a structural
52 artifact, however, all references to other artifacts must be the complete
53 hash.
54
55
--- www/fileformat.wiki
+++ www/fileformat.wiki
@@ -42,13 +42,13 @@
42 the hash is computed. The artifact name is just the (lower-case
43 hexadecimal) hash of the raw artifact.
44
45 Fossil currently computes artifact names using either SHA1 or SHA3-256. It
46 is relatively easy to add new algorithms in the future, but there are no
47 plans to do so at this time.
48
49 When referring to artifacts in using tty commands or webpage URLs, it is
50 sufficient to specify a unique prefix for the artifact name. If the input
51 prefix is not unique, Fossil will show an error. Within a structural
52 artifact, however, all references to other artifacts must be the complete
53 hash.
54
55
+2 -2
--- www/sync.wiki
+++ www/sync.wiki
@@ -13,11 +13,11 @@
1313
artifacts are unordered, the order in which artifacts are received
1414
at a server is inconsequential. It is assumed that the hash names
1515
of artifacts are unique - that every artifact has a different hash.
1616
To a first approximation, synchronization proceeds by sharing lists
1717
hash values for available artifacts, then sharing the content of artifacts
18
-whose names are missing from one side or the other of the connection.
18
+whose names are missing from one side or the other of the connection.
1919
In practice, a repository might contain millions of artifacts. The list of
2020
hash names for this many artifacts can be large. So optimizations are
2121
employed that usually reduce the number of hashes that need to be
2222
shared to a few hundred.</p>
2323
@@ -409,11 +409,11 @@
409409
</blockquote>
410410
411411
<p>The <i>name</i> argument is the name of an unversioned file.
412412
The <i>mtime</i> is the last modification time of the unversioned file
413413
in seconds since 1970.
414
-The <i>hash</i> is the SHA1 or SHA3-256 hash of the unversioned file
414
+The <i>hash</i> is the SHA1 or SHA3-256 hash of the unversioned file
415415
content, or "<b>-</b>" if the file has been deleted.
416416
The <i>size</i> is the uncompressed size of the file in bytes.
417417
418418
<p>When the server sees a "pragma uv-hash" card for which the hash
419419
does not match, it sends uvigot cards for every unversioned file that it
420420
--- www/sync.wiki
+++ www/sync.wiki
@@ -13,11 +13,11 @@
13 artifacts are unordered, the order in which artifacts are received
14 at a server is inconsequential. It is assumed that the hash names
15 of artifacts are unique - that every artifact has a different hash.
16 To a first approximation, synchronization proceeds by sharing lists
17 hash values for available artifacts, then sharing the content of artifacts
18 whose names are missing from one side or the other of the connection.
19 In practice, a repository might contain millions of artifacts. The list of
20 hash names for this many artifacts can be large. So optimizations are
21 employed that usually reduce the number of hashes that need to be
22 shared to a few hundred.</p>
23
@@ -409,11 +409,11 @@
409 </blockquote>
410
411 <p>The <i>name</i> argument is the name of an unversioned file.
412 The <i>mtime</i> is the last modification time of the unversioned file
413 in seconds since 1970.
414 The <i>hash</i> is the SHA1 or SHA3-256 hash of the unversioned file
415 content, or "<b>-</b>" if the file has been deleted.
416 The <i>size</i> is the uncompressed size of the file in bytes.
417
418 <p>When the server sees a "pragma uv-hash" card for which the hash
419 does not match, it sends uvigot cards for every unversioned file that it
420
--- www/sync.wiki
+++ www/sync.wiki
@@ -13,11 +13,11 @@
13 artifacts are unordered, the order in which artifacts are received
14 at a server is inconsequential. It is assumed that the hash names
15 of artifacts are unique - that every artifact has a different hash.
16 To a first approximation, synchronization proceeds by sharing lists
17 hash values for available artifacts, then sharing the content of artifacts
18 whose names are missing from one side or the other of the connection.
19 In practice, a repository might contain millions of artifacts. The list of
20 hash names for this many artifacts can be large. So optimizations are
21 employed that usually reduce the number of hashes that need to be
22 shared to a few hundred.</p>
23
@@ -409,11 +409,11 @@
409 </blockquote>
410
411 <p>The <i>name</i> argument is the name of an unversioned file.
412 The <i>mtime</i> is the last modification time of the unversioned file
413 in seconds since 1970.
414 The <i>hash</i> is the SHA1 or SHA3-256 hash of the unversioned file
415 content, or "<b>-</b>" if the file has been deleted.
416 The <i>size</i> is the uncompressed size of the file in bytes.
417
418 <p>When the server sees a "pragma uv-hash" card for which the hash
419 does not match, it sends uvigot cards for every unversioned file that it
420

Keyboard Shortcuts

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