Fossil SCM

Replace stray tab characters.

danield 2024-02-02 16:23 trunk
Commit 9db696ea7879b810fc73158df0cca0e2c97fea271d3112c8206108e62a8da102
Parent 55a0a4d01a50b29…
4 files changed +1 -1 +1 -1 +16 -16 +7 -7
~ src/db.c ~ src/merge.c ~ src/sha1hard.c ~ src/wiki.c
M src/db.c
+1 -1
--- src/db.c
+++ src/db.c
@@ -5239,11 +5239,11 @@
52395239
 **
52405240
 ** The purpose of this command is for testing the WITHOUT ROWID capabilities
52415241
 ** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
52425242
 **
52435243
 ** Options:
5244
-** -n|--dry-run No changes. Just print what would happen.
5244
+** -n|--dry-run No changes. Just print what would happen.
52455245
 */
52465246
 void test_without_rowid(void){
52475247
 int i, j;
52485248
 Stmt q;
52495249
 Blob allSql;
52505250
--- src/db.c
+++ src/db.c
@@ -5239,11 +5239,11 @@
5239 **
5240 ** The purpose of this command is for testing the WITHOUT ROWID capabilities
5241 ** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
5242 **
5243 ** Options:
5244 ** -n|--dry-run No changes. Just print what would happen.
5245 */
5246 void test_without_rowid(void){
5247 int i, j;
5248 Stmt q;
5249 Blob allSql;
5250
--- src/db.c
+++ src/db.c
@@ -5239,11 +5239,11 @@
5239 **
5240 ** The purpose of this command is for testing the WITHOUT ROWID capabilities
5241 ** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
5242 **
5243 ** Options:
5244 ** -n|--dry-run No changes. Just print what would happen.
5245 */
5246 void test_without_rowid(void){
5247 int i, j;
5248 Stmt q;
5249 Blob allSql;
5250
M src/merge.c
+1 -1
--- src/merge.c
+++ src/merge.c
@@ -136,11 +136,11 @@
136136
 ** version N and the version specified by vid.
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 */
141
- int nid, /* The check-in rid for the name pivot */
141
+ int nid, /* The check-in rid for the name pivot */
142142
 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
--- src/merge.c
+++ src/merge.c
@@ -136,11 +136,11 @@
136 ** version N and the version specified by vid.
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, /* The check-in rid for the name pivot */
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
--- src/merge.c
+++ src/merge.c
@@ -136,11 +136,11 @@
136 ** version N and the version specified by vid.
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, /* The check-in rid for the name pivot */
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
M src/sha1hard.c
+16 -16
--- src/sha1hard.c
+++ src/sha1hard.c
@@ -73,26 +73,26 @@
7373
 void sha1_compression_W(uint32_t ihv[5], const uint32_t W[80]);
7474
 void sha1_compression_states(uint32_t ihv[5], const uint32_t W[80], uint32_t states[80][5]);
7575
 extern sha1_recompression_type sha1_recompression_step[80];
7676
 typedef void(*collision_block_callback)(uint64_t, const uint32_t*, const uint32_t*, const uint32_t*, const uint32_t*);
7777
 typedef struct {
78
- uint64_t total;
79
- uint32_t ihv[5];
80
- unsigned char buffer[64];
81
- int bigendian;
82
- int found_collision;
83
- int safe_hash;
84
- int detect_coll;
85
- int ubc_check;
86
- int reduced_round_coll;
87
- collision_block_callback callback;
88
-
89
- uint32_t ihv1[5];
90
- uint32_t ihv2[5];
91
- uint32_t m1[80];
92
- uint32_t m2[80];
93
- uint32_t states[80][5];
78
+ uint64_t total;
79
+ uint32_t ihv[5];
80
+ unsigned char buffer[64];
81
+ int bigendian;
82
+ int found_collision;
83
+ int safe_hash;
84
+ int detect_coll;
85
+ int ubc_check;
86
+ int reduced_round_coll;
87
+ collision_block_callback callback;
88
+
89
+ uint32_t ihv1[5];
90
+ uint32_t ihv2[5];
91
+ uint32_t m1[80];
92
+ uint32_t m2[80];
93
+ uint32_t states[80][5];
9494
 } SHA1_CTX;
9595
9696
 /******************** File: lib/ubc_check.c **************************/
9797
 /***
9898
 * Copyright 2017 Marc Stevens <[email protected]>, Dan Shumow <[email protected]>
9999
--- src/sha1hard.c
+++ src/sha1hard.c
@@ -73,26 +73,26 @@
73 void sha1_compression_W(uint32_t ihv[5], const uint32_t W[80]);
74 void sha1_compression_states(uint32_t ihv[5], const uint32_t W[80], uint32_t states[80][5]);
75 extern sha1_recompression_type sha1_recompression_step[80];
76 typedef void(*collision_block_callback)(uint64_t, const uint32_t*, const uint32_t*, const uint32_t*, const uint32_t*);
77 typedef struct {
78 uint64_t total;
79 uint32_t ihv[5];
80 unsigned char buffer[64];
81 int bigendian;
82 int found_collision;
83 int safe_hash;
84 int detect_coll;
85 int ubc_check;
86 int reduced_round_coll;
87 collision_block_callback callback;
88
89 uint32_t ihv1[5];
90 uint32_t ihv2[5];
91 uint32_t m1[80];
92 uint32_t m2[80];
93 uint32_t states[80][5];
94 } SHA1_CTX;
95
96 /******************** File: lib/ubc_check.c **************************/
97 /***
98 * Copyright 2017 Marc Stevens <[email protected]>, Dan Shumow <[email protected]>
99
--- src/sha1hard.c
+++ src/sha1hard.c
@@ -73,26 +73,26 @@
73 void sha1_compression_W(uint32_t ihv[5], const uint32_t W[80]);
74 void sha1_compression_states(uint32_t ihv[5], const uint32_t W[80], uint32_t states[80][5]);
75 extern sha1_recompression_type sha1_recompression_step[80];
76 typedef void(*collision_block_callback)(uint64_t, const uint32_t*, const uint32_t*, const uint32_t*, const uint32_t*);
77 typedef struct {
78 uint64_t total;
79 uint32_t ihv[5];
80 unsigned char buffer[64];
81 int bigendian;
82 int found_collision;
83 int safe_hash;
84 int detect_coll;
85 int ubc_check;
86 int reduced_round_coll;
87 collision_block_callback callback;
88
89 uint32_t ihv1[5];
90 uint32_t ihv2[5];
91 uint32_t m1[80];
92 uint32_t m2[80];
93 uint32_t states[80][5];
94 } SHA1_CTX;
95
96 /******************** File: lib/ubc_check.c **************************/
97 /***
98 * Copyright 2017 Marc Stevens <[email protected]>, Dan Shumow <[email protected]>
99
M src/wiki.c
+7 -7
--- src/wiki.c
+++ src/wiki.c
@@ -2133,23 +2133,23 @@
21332133
 ** At present, technote tags are prefixed with 'sym-', which shouldn't
21342134
 ** be the case, so we check for both with and without the prefix until
21352135
 ** such time as tags have the errant prefix dropped.
21362136
 */
21372137
 rid = db_int(0, "SELECT e.objid"
2138
- " FROM event e, tag t, tagxref tx"
2139
- " WHERE e.type='e'"
2140
- " AND e.tagid IS NOT NULL"
2141
- " AND e.objid IN"
2138
+ " FROM event e, tag t, tagxref tx"
2139
+ " WHERE e.type='e'"
2140
+ " AND e.tagid IS NOT NULL"
2141
+ " AND e.objid IN"
21422142
 " (SELECT rid FROM tagxref"
21432143
 " WHERE tagid=(SELECT tagid FROM tag"
21442144
 " WHERE tagname GLOB '%q'))"
2145
- " OR e.objid IN"
2145
+ " OR e.objid IN"
21462146
 " (SELECT rid FROM tagxref"
21472147
 " WHERE tagid=(SELECT tagid FROM tag"
21482148
 " WHERE tagname GLOB 'sym-%q'))"
2149
- " ORDER BY e.mtime DESC LIMIT 1",
2150
- zETime, zETime);
2149
+ " ORDER BY e.mtime DESC LIMIT 1",
2150
+ zETime, zETime);
21512151
 }
21522152
 return rid;
21532153
 }
21542154
21552155
 /*
21562156
--- src/wiki.c
+++ src/wiki.c
@@ -2133,23 +2133,23 @@
2133 ** At present, technote tags are prefixed with 'sym-', which shouldn't
2134 ** be the case, so we check for both with and without the prefix until
2135 ** such time as tags have the errant prefix dropped.
2136 */
2137 rid = db_int(0, "SELECT e.objid"
2138 " FROM event e, tag t, tagxref tx"
2139 " WHERE e.type='e'"
2140 " AND e.tagid IS NOT NULL"
2141 " AND e.objid IN"
2142 " (SELECT rid FROM tagxref"
2143 " WHERE tagid=(SELECT tagid FROM tag"
2144 " WHERE tagname GLOB '%q'))"
2145 " OR e.objid IN"
2146 " (SELECT rid FROM tagxref"
2147 " WHERE tagid=(SELECT tagid FROM tag"
2148 " WHERE tagname GLOB 'sym-%q'))"
2149 " ORDER BY e.mtime DESC LIMIT 1",
2150 zETime, zETime);
2151 }
2152 return rid;
2153 }
2154
2155 /*
2156
--- src/wiki.c
+++ src/wiki.c
@@ -2133,23 +2133,23 @@
2133 ** At present, technote tags are prefixed with 'sym-', which shouldn't
2134 ** be the case, so we check for both with and without the prefix until
2135 ** such time as tags have the errant prefix dropped.
2136 */
2137 rid = db_int(0, "SELECT e.objid"
2138 " FROM event e, tag t, tagxref tx"
2139 " WHERE e.type='e'"
2140 " AND e.tagid IS NOT NULL"
2141 " AND e.objid IN"
2142 " (SELECT rid FROM tagxref"
2143 " WHERE tagid=(SELECT tagid FROM tag"
2144 " WHERE tagname GLOB '%q'))"
2145 " OR e.objid IN"
2146 " (SELECT rid FROM tagxref"
2147 " WHERE tagid=(SELECT tagid FROM tag"
2148 " WHERE tagname GLOB 'sym-%q'))"
2149 " ORDER BY e.mtime DESC LIMIT 1",
2150 zETime, zETime);
2151 }
2152 return rid;
2153 }
2154
2155 /*
2156

Keyboard Shortcuts

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