Skip to content

Commit 7045930

Browse files
Qiuwen-chenQiuwen-chen
committed
Code format
1 parent 417779b commit 7045930

16 files changed

+607
-876
lines changed

‎repair/SQLiteRepairKit.h

+8-23
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ struct sqliterk_notify {
3838
// which is the column in a non-system table or the "sqlite_master"
3939
// return SQLITERK_OK to tell sqliterk that you already know that
4040
// meaning of this column
41-
int (*onParseColumn)(sqliterk *rk,
42-
sqliterk_table *table,
43-
sqliterk_column *column);
41+
int (*onParseColumn)(sqliterk *rk, sqliterk_table *table, sqliterk_column *column);
4442
void (*onEndParseTable)(sqliterk *rk, sqliterk_table *table);
4543
void (*didParsePage)(sqliterk *rk, int pageno);
4644
};
@@ -54,8 +52,8 @@ typedef struct sqliterk_cipher_conf {
5452
int use_hmac;
5553
const unsigned char *kdf_salt;
5654
} sqliterk_cipher_conf;
57-
58-
void sqliterk_cipher_conf_set_key(sqliterk_cipher_conf *conf, const void* key, int key_len);
55+
56+
void sqliterk_cipher_conf_set_key(sqliterk_cipher_conf *conf, const void *key, int key_len);
5957

6058
typedef struct sqlite3 sqlite3;
6159
typedef struct sqliterk_master_info sqliterk_master_info;
@@ -64,9 +62,7 @@ typedef struct sqliterk_master_info sqliterk_master_info;
6462
#define SQLITERK_OUTPUT_ALL_TABLES 0x0002
6563
#define SQLITERK_OUTPUT_CHECK_TABLE_COLUMNS 0x0004
6664

67-
int sqliterk_open(const char *path,
68-
const sqliterk_cipher_conf *cipher,
69-
sqliterk **rk);
65+
int sqliterk_open(const char *path, const sqliterk_cipher_conf *cipher, sqliterk **rk);
7066
int sqliterk_parse(sqliterk *rk);
7167
int sqliterk_parse_page(sqliterk *rk, int pageno);
7268
int sqliterk_parse_master(sqliterk *rk);
@@ -75,27 +71,16 @@ void *sqliterk_get_user_info(sqliterk *rk);
7571
void sqliterk_set_user_info(sqliterk *rk, void *userInfo);
7672
void sqliterk_set_recursive(sqliterk *rk, int recursive);
7773

78-
int sqliterk_output(sqliterk *rk,
79-
sqlite3 *db,
80-
sqliterk_master_info *master,
81-
unsigned int flags);
74+
int sqliterk_output(sqliterk *rk, sqlite3 *db, sqliterk_master_info *master, unsigned int flags);
8275
int sqliterk_output_cb(sqliterk *rk,
8376
sqlite3 *db,
8477
sqliterk_master_info *master,
8578
unsigned int flags,
86-
int (*callback)(void *user,
87-
sqliterk *rk,
88-
sqliterk_table *table,
89-
sqliterk_column *column),
79+
int (*callback)(void *user, sqliterk *rk, sqliterk_table *table, sqliterk_column *column),
9080
void *user);
9181
void sqliterk_cancel(sqliterk *rk);
92-
int sqliterk_make_master(const char **tables,
93-
int num_tables,
94-
sqliterk_master_info **out_master);
95-
int sqliterk_save_master(sqlite3 *db,
96-
const char *path,
97-
const void *key,
98-
int key_len);
82+
int sqliterk_make_master(const char **tables, int num_tables, sqliterk_master_info **out_master);
83+
int sqliterk_save_master(sqlite3 *db, const char *path, const void *key, int key_len);
9984
int sqliterk_load_master(const char *path,
10085
const void *key,
10186
int key_len,

‎repair/sqliterk.c

+48-71
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,18 @@ struct sqliterk {
3737
};
3838

3939
//declaration
40-
static void sqliterkNotify_onBeginParseBtree(sqliterk *rk,
41-
sqliterk_btree *btree);
42-
static void
43-
sqliterkNotify_onEndParseBtree(sqliterk *rk, sqliterk_btree *btree, int result);
40+
static void sqliterkNotify_onBeginParseBtree(sqliterk *rk, sqliterk_btree *btree);
41+
static void sqliterkNotify_onEndParseBtree(sqliterk *rk, sqliterk_btree *btree, int result);
4442
static int sqliterkNotify_onParseColumn(sqliterk *rk,
4543
sqliterk_btree *btree,
4644
sqliterk_page *page,
4745
sqliterk_column *column);
48-
static int sqliterkNotify_onBeginParsePage(sqliterk *rk,
49-
sqliterk_btree *btree,
50-
int pageno);
51-
static void sqliterkNotify_onEndParsePage(sqliterk *rk,
52-
sqliterk_btree *btree,
53-
int pageno,
54-
int result);
46+
static int sqliterkNotify_onBeginParsePage(sqliterk *rk, sqliterk_btree *btree, int pageno);
47+
static void
48+
sqliterkNotify_onEndParsePage(sqliterk *rk, sqliterk_btree *btree, int pageno, int result);
5549
static int sqliterkParseBtree(sqliterk *rk, sqliterk_btree *btree);
5650

57-
int sqliterkOpen(const char *path,
58-
const sqliterk_cipher_conf *cipher,
59-
sqliterk **rk)
51+
int sqliterkOpen(const char *path, const sqliterk_cipher_conf *cipher, sqliterk **rk)
6052
{
6153
if (!rk) {
6254
return SQLITERK_MISUSE;
@@ -65,8 +57,7 @@ int sqliterkOpen(const char *path,
6557
sqliterk *therk = sqliterkOSMalloc(sizeof(sqliterk));
6658
if (!therk) {
6759
rc = SQLITERK_NOMEM;
68-
sqliterkOSError(rc, "Not enough memory, required: %zu bytes",
69-
sizeof(sqliterk));
60+
sqliterkOSError(rc, "Not enough memory, required: %zu bytes", sizeof(sqliterk));
7061
goto sqliterkOpen_Failed;
7162
}
7263

@@ -83,8 +74,8 @@ int sqliterkOpen(const char *path,
8374
therk->recursive = 1;
8475

8576
*rk = therk;
86-
sqliterkOSInfo(SQLITERK_OK, "RepairKit on '%s' opened, %s.", path,
87-
cipher ? "encrypted" : "plain-text");
77+
sqliterkOSInfo(
78+
SQLITERK_OK, "RepairKit on '%s' opened, %s.", path, cipher ? "encrypted" : "plain-text");
8879
return SQLITERK_OK;
8980

9081
sqliterkOpen_Failed:
@@ -119,8 +110,7 @@ int sqliterkParsePage(sqliterk *rk, int pageno)
119110
if (!rk) {
120111
return SQLITERK_MISUSE;
121112
}
122-
if (sqliterkPagerGetStatus(rk->pager, pageno) !=
123-
sqliterk_status_unchecked) {
113+
if (sqliterkPagerGetStatus(rk->pager, pageno) != sqliterk_status_unchecked) {
124114
return SQLITERK_OK;
125115
}
126116
int rc = SQLITERK_OK;
@@ -173,21 +163,20 @@ int sqliterkClose(sqliterk *rk)
173163
return SQLITERK_OK;
174164
}
175165

176-
static void sqliterkNotify_onBeginParseBtree(sqliterk *rk,
177-
sqliterk_btree *btree)
166+
static void sqliterkNotify_onBeginParseBtree(sqliterk *rk, sqliterk_btree *btree)
178167
{
179168
if (rk->notify.onBeginParseTable) {
180169
rk->notify.onBeginParseTable(rk, (sqliterk_table *) btree);
181170
}
182171
sqliterk_page *rootpage = sqliterkBtreeGetRootPage(btree);
183-
sqliterkOSDebug(
184-
SQLITERK_OK, "Parsing B-tree -> [root: %d, name: %s, type: %s]",
185-
sqliterkPageGetPageno(rootpage), sqliterkBtreeGetName(btree),
186-
sqliterkBtreeGetTypeName(sqliterkBtreeGetType(btree)));
172+
sqliterkOSDebug(SQLITERK_OK,
173+
"Parsing B-tree -> [root: %d, name: %s, type: %s]",
174+
sqliterkPageGetPageno(rootpage),
175+
sqliterkBtreeGetName(btree),
176+
sqliterkBtreeGetTypeName(sqliterkBtreeGetType(btree)));
187177
}
188178

189-
static void
190-
sqliterkNotify_onEndParseBtree(sqliterk *rk, sqliterk_btree *btree, int result)
179+
static void sqliterkNotify_onEndParseBtree(sqliterk *rk, sqliterk_btree *btree, int result)
191180
{
192181
if (rk->notify.onEndParseTable) {
193182
rk->notify.onEndParseTable(rk, (sqliterk_table *) btree);
@@ -210,24 +199,21 @@ static int sqliterkNotify_onParseColumn(sqliterk *rk,
210199
return result;
211200
} else if (result != SQLITERK_OK) {
212201
int pageno = sqliterkPageGetPageno(page);
213-
sqliterkPagerSetStatus(rk->pager, pageno,
214-
sqliterk_status_discarded);
215-
sqliterk_values *overflowPages =
216-
sqliterkColumnGetOverflowPages(column);
202+
sqliterkPagerSetStatus(rk->pager, pageno, sqliterk_status_discarded);
203+
sqliterk_values *overflowPages = sqliterkColumnGetOverflowPages(column);
217204

218205
int i;
219206
for (i = 0; i < sqliterkValuesGetCount(overflowPages); i++) {
220-
sqliterkPagerSetStatus(
221-
rk->pager, sqliterkValuesGetInteger(overflowPages, i),
222-
sqliterk_status_discarded);
207+
sqliterkPagerSetStatus(rk->pager,
208+
sqliterkValuesGetInteger(overflowPages, i),
209+
sqliterk_status_discarded);
223210
}
224211
}
225212
} else {
226213
result = SQLITERK_OK;
227214
}
228215

229-
if (sqliterkBtreeGetType(btree) == sqliterk_btree_type_master &&
230-
rk->recursive) {
216+
if (sqliterkBtreeGetType(btree) == sqliterk_btree_type_master && rk->recursive) {
231217
// Recursively decode the page since the mapping of [table]->[rootPageno] is known
232218
sqliterk_values *values = sqliterkColumnGetValues(column);
233219
const char *type = sqliterkValuesGetText(values, 0);
@@ -239,26 +225,22 @@ static int sqliterkNotify_onParseColumn(sqliterk *rk,
239225
rc = sqliterkBtreeOpen(rk, rk->pager, rootPageno, &subbtree);
240226
if (rc == SQLITERK_OK) {
241227
if (memcmp("table", type, 5) == 0) {
242-
sqliterkBtreeSetMeta(subbtree, name,
243-
sqliterk_btree_type_table);
228+
sqliterkBtreeSetMeta(subbtree, name, sqliterk_btree_type_table);
244229
} else if (memcmp("index", type, 5) == 0) {
245-
sqliterkBtreeSetMeta(subbtree, name,
246-
sqliterk_btree_type_index);
230+
sqliterkBtreeSetMeta(subbtree, name, sqliterk_btree_type_index);
247231
} else {
248-
sqliterkBtreeSetMeta(subbtree, name,
249-
sqliterk_btree_type_unknown);
232+
sqliterkBtreeSetMeta(subbtree, name, sqliterk_btree_type_unknown);
250233
}
251234
rc = sqliterkParseBtree(rk, subbtree);
252235
}
253236
if (rc != SQLITERK_OK) {
254237
sqliterk_page *rootpage = sqliterkBtreeGetRootPage(subbtree);
255-
sqliterkOSError(
256-
rc,
257-
"sqliterkNotify_onParseColumn: failed to parse known "
258-
"table with root page no. %d, name %s, type %s",
259-
sqliterkPageGetPageno(rootpage),
260-
sqliterkBtreeGetName(subbtree),
261-
sqliterkBtreeGetTypeName(sqliterkBtreeGetType(subbtree)));
238+
sqliterkOSError(rc,
239+
"sqliterkNotify_onParseColumn: failed to parse known "
240+
"table with root page no. %d, name %s, type %s",
241+
sqliterkPageGetPageno(rootpage),
242+
sqliterkBtreeGetName(subbtree),
243+
sqliterkBtreeGetTypeName(sqliterkBtreeGetType(subbtree)));
262244
}
263245
if (subbtree) {
264246
sqliterkBtreeClose(subbtree);
@@ -269,8 +251,7 @@ static int sqliterkNotify_onParseColumn(sqliterk *rk,
269251
return result;
270252
}
271253

272-
static int
273-
sqliterkNotify_onBeginParsePage(sqliterk *rk, sqliterk_btree *btree, int pageno)
254+
static int sqliterkNotify_onBeginParsePage(sqliterk *rk, sqliterk_btree *btree, int pageno)
274255
{
275256
//sqliterkOSDebug(SQLITERK_OK, "sqliterkNotify_onBeginParsePage: %d", pageno);
276257
if (sqliterkPagerGetStatus(rk->pager, pageno) == sqliterk_status_checking) {
@@ -280,30 +261,26 @@ sqliterkNotify_onBeginParsePage(sqliterk *rk, sqliterk_btree *btree, int pageno)
280261
return SQLITERK_OK;
281262
}
282263

283-
static void sqliterkNotify_onEndParsePage(sqliterk *rk,
284-
sqliterk_btree *btree,
285-
int pageno,
286-
int result)
264+
static void
265+
sqliterkNotify_onEndParsePage(sqliterk *rk, sqliterk_btree *btree, int pageno, int result)
287266
{
288267
if (!rk) {
289268
return;
290269
}
291270
switch (result) {
292-
case SQLITERK_OK:
293-
sqliterkPagerSetStatus(rk->pager, pageno, sqliterk_status_checked);
294-
break;
295-
case SQLITERK_DAMAGED:
296-
sqliterkPagerSetStatus(rk->pager, pageno, sqliterk_status_damaged);
297-
break;
298-
case SQLITERK_CANCELLED:
299-
sqliterkOSDebug(SQLITERK_CANCELLED, "Cancelled parsing page %d.",
300-
pageno);
301-
break;
302-
default:
303-
sqliterkOSWarning(SQLITERK_MISUSE,
304-
"Cannot parse page %d. Invalid type.", pageno);
305-
sqliterkPagerSetStatus(rk->pager, pageno, sqliterk_status_invalid);
306-
break;
271+
case SQLITERK_OK:
272+
sqliterkPagerSetStatus(rk->pager, pageno, sqliterk_status_checked);
273+
break;
274+
case SQLITERK_DAMAGED:
275+
sqliterkPagerSetStatus(rk->pager, pageno, sqliterk_status_damaged);
276+
break;
277+
case SQLITERK_CANCELLED:
278+
sqliterkOSDebug(SQLITERK_CANCELLED, "Cancelled parsing page %d.", pageno);
279+
break;
280+
default:
281+
sqliterkOSWarning(SQLITERK_MISUSE, "Cannot parse page %d. Invalid type.", pageno);
282+
sqliterkPagerSetStatus(rk->pager, pageno, sqliterk_status_invalid);
283+
break;
307284
}
308285
//sqliterkOSDebug(result, "sqliterkNotify_onEndParsePage: %d", pageno);
309286
if (rk->notify.didParsePage) {

‎repair/sqliterk.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ typedef struct sqliterk sqliterk;
2525
typedef struct sqliterk_cipher_conf sqliterk_cipher_conf;
2626
typedef struct sqliterk_notify sqliterk_notify;
2727

28-
int sqliterkOpen(const char *path,
29-
const sqliterk_cipher_conf *cipher,
30-
sqliterk **rk);
28+
int sqliterkOpen(const char *path, const sqliterk_cipher_conf *cipher, sqliterk **rk);
3129
int sqliterkParse(sqliterk *rk);
3230
int sqliterkParsePage(sqliterk *rk, int pageno);
3331
int sqliterkParseMaster(sqliterk *rk);

‎repair/sqliterk_api.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ int sqliterk_register_notify(sqliterk *rk, sqliterk_notify notify)
3232
return sqliterkSetNotify(rk, notify);
3333
}
3434

35-
int sqliterk_open(const char *path,
36-
const sqliterk_cipher_conf *cipher,
37-
sqliterk **rk)
35+
int sqliterk_open(const char *path, const sqliterk_cipher_conf *cipher, sqliterk **rk)
3836
{
3937
return sqliterkOpen(path, cipher, rk);
4038
}
@@ -175,7 +173,7 @@ unsigned int sqliterk_integrity(sqliterk *rk)
175173
return sqliterkGetIntegrity(rk);
176174
}
177175

178-
void sqliterk_cipher_conf_set_key(sqliterk_cipher_conf *conf, const void* key, int key_len)
176+
void sqliterk_cipher_conf_set_key(sqliterk_cipher_conf *conf, const void *key, int key_len)
179177
{
180178
if (conf != NULL) {
181179
conf->key = key;

0 commit comments

Comments
 (0)