Fossil SCM

Style cleanup for return code to name mappings.

mistachkin 2014-09-05 06:12 trunk
Commit 2212ac40a8d4e2f8f5f86debc44a96ae877b4f99
Parent 06e5595a06a62fd…
2 files changed +13 -5 +3 -2
~ src/main.c ~ src/th_main.c
M src/main.c
+13 -5
--- src/main.c
+++ src/main.c
@@ -495,40 +495,48 @@
495495
 return zNewArgv;
496496
 }
497497
 #endif
498498
499499
 /*
500
-** Return a name for an SQLite error code
500
+** Returns a name for a SQLite return code.
501501
 */
502
-static const char *sqlite_error_code_name(int iCode){
502
+static const char *fossil_sqlite_return_code_name(int rc){
503503
 static char zCode[30];
504
- switch( iCode & 0xff ){
504
+ switch( rc & 0xff ){
505505
 case SQLITE_OK: return "SQLITE_OK";
506506
 case SQLITE_ERROR: return "SQLITE_ERROR";
507
+ case SQLITE_INTERNAL: return "SQLITE_INTERNAL";
507508
 case SQLITE_PERM: return "SQLITE_PERM";
508509
 case SQLITE_ABORT: return "SQLITE_ABORT";
509510
 case SQLITE_BUSY: return "SQLITE_BUSY";
511
+ case SQLITE_LOCKED: return "SQLITE_LOCKED";
510512
 case SQLITE_NOMEM: return "SQLITE_NOMEM";
511513
 case SQLITE_READONLY: return "SQLITE_READONLY";
512514
 case SQLITE_INTERRUPT: return "SQLITE_INTERRUPT";
513515
 case SQLITE_IOERR: return "SQLITE_IOERR";
514516
 case SQLITE_CORRUPT: return "SQLITE_CORRUPT";
517
+ case SQLITE_NOTFOUND: return "SQLITE_NOTFOUND";
515518
 case SQLITE_FULL: return "SQLITE_FULL";
516519
 case SQLITE_CANTOPEN: return "SQLITE_CANTOPEN";
517520
 case SQLITE_PROTOCOL: return "SQLITE_PROTOCOL";
518521
 case SQLITE_EMPTY: return "SQLITE_EMPTY";
519522
 case SQLITE_SCHEMA: return "SQLITE_SCHEMA";
523
+ case SQLITE_TOOBIG: return "SQLITE_TOOBIG";
520524
 case SQLITE_CONSTRAINT: return "SQLITE_CONSTRAINT";
521525
 case SQLITE_MISMATCH: return "SQLITE_MISMATCH";
522526
 case SQLITE_MISUSE: return "SQLITE_MISUSE";
523527
 case SQLITE_NOLFS: return "SQLITE_NOLFS";
528
+ case SQLITE_AUTH: return "SQLITE_AUTH";
524529
 case SQLITE_FORMAT: return "SQLITE_FORMAT";
525530
 case SQLITE_RANGE: return "SQLITE_RANGE";
526531
 case SQLITE_NOTADB: return "SQLITE_NOTADB";
532
+ case SQLITE_NOTICE: return "SQLITE_NOTICE";
527533
 case SQLITE_WARNING: return "SQLITE_WARNING";
534
+ case SQLITE_ROW: return "SQLITE_ROW";
535
+ case SQLITE_DONE: return "SQLITE_DONE";
528536
 default: {
529
- sqlite3_snprintf(sizeof(zCode),zCode,"error code %d",iCode);
537
+ sqlite3_snprintf(sizeof(zCode), zCode, "SQLite return code %d", rc);
530538
 }
531539
 }
532540
 return zCode;
533541
 }
534542
@@ -538,11 +546,11 @@
538546
 /* Disable the file alias warning on apple products because Time Machine
539547
 ** creates lots of aliases and the warning alarms people. */
540548
 if( iCode==SQLITE_WARNING ) return;
541549
 #endif
542550
 if( iCode==SQLITE_SCHEMA ) return;
543
- fossil_warning("%s: %s", sqlite_error_code_name(iCode), zErrmsg);
551
+ fossil_warning("%s: %s", fossil_sqlite_return_code_name(iCode), zErrmsg);
544552
 }
545553
546554
 /*
547555
 ** This function attempts to find command line options known to contain
548556
 ** bitwise flags and initializes the associated global variables. After
549557
--- src/main.c
+++ src/main.c
@@ -495,40 +495,48 @@
495 return zNewArgv;
496 }
497 #endif
498
499 /*
500 ** Return a name for an SQLite error code
501 */
502 static const char *sqlite_error_code_name(int iCode){
503 static char zCode[30];
504 switch( iCode & 0xff ){
505 case SQLITE_OK: return "SQLITE_OK";
506 case SQLITE_ERROR: return "SQLITE_ERROR";
 
507 case SQLITE_PERM: return "SQLITE_PERM";
508 case SQLITE_ABORT: return "SQLITE_ABORT";
509 case SQLITE_BUSY: return "SQLITE_BUSY";
 
510 case SQLITE_NOMEM: return "SQLITE_NOMEM";
511 case SQLITE_READONLY: return "SQLITE_READONLY";
512 case SQLITE_INTERRUPT: return "SQLITE_INTERRUPT";
513 case SQLITE_IOERR: return "SQLITE_IOERR";
514 case SQLITE_CORRUPT: return "SQLITE_CORRUPT";
 
515 case SQLITE_FULL: return "SQLITE_FULL";
516 case SQLITE_CANTOPEN: return "SQLITE_CANTOPEN";
517 case SQLITE_PROTOCOL: return "SQLITE_PROTOCOL";
518 case SQLITE_EMPTY: return "SQLITE_EMPTY";
519 case SQLITE_SCHEMA: return "SQLITE_SCHEMA";
 
520 case SQLITE_CONSTRAINT: return "SQLITE_CONSTRAINT";
521 case SQLITE_MISMATCH: return "SQLITE_MISMATCH";
522 case SQLITE_MISUSE: return "SQLITE_MISUSE";
523 case SQLITE_NOLFS: return "SQLITE_NOLFS";
 
524 case SQLITE_FORMAT: return "SQLITE_FORMAT";
525 case SQLITE_RANGE: return "SQLITE_RANGE";
526 case SQLITE_NOTADB: return "SQLITE_NOTADB";
 
527 case SQLITE_WARNING: return "SQLITE_WARNING";
 
 
528 default: {
529 sqlite3_snprintf(sizeof(zCode),zCode,"error code %d",iCode);
530 }
531 }
532 return zCode;
533 }
534
@@ -538,11 +546,11 @@
538 /* Disable the file alias warning on apple products because Time Machine
539 ** creates lots of aliases and the warning alarms people. */
540 if( iCode==SQLITE_WARNING ) return;
541 #endif
542 if( iCode==SQLITE_SCHEMA ) return;
543 fossil_warning("%s: %s", sqlite_error_code_name(iCode), zErrmsg);
544 }
545
546 /*
547 ** This function attempts to find command line options known to contain
548 ** bitwise flags and initializes the associated global variables. After
549
--- src/main.c
+++ src/main.c
@@ -495,40 +495,48 @@
495 return zNewArgv;
496 }
497 #endif
498
499 /*
500 ** Returns a name for a SQLite return code.
501 */
502 static const char *fossil_sqlite_return_code_name(int rc){
503 static char zCode[30];
504 switch( rc & 0xff ){
505 case SQLITE_OK: return "SQLITE_OK";
506 case SQLITE_ERROR: return "SQLITE_ERROR";
507 case SQLITE_INTERNAL: return "SQLITE_INTERNAL";
508 case SQLITE_PERM: return "SQLITE_PERM";
509 case SQLITE_ABORT: return "SQLITE_ABORT";
510 case SQLITE_BUSY: return "SQLITE_BUSY";
511 case SQLITE_LOCKED: return "SQLITE_LOCKED";
512 case SQLITE_NOMEM: return "SQLITE_NOMEM";
513 case SQLITE_READONLY: return "SQLITE_READONLY";
514 case SQLITE_INTERRUPT: return "SQLITE_INTERRUPT";
515 case SQLITE_IOERR: return "SQLITE_IOERR";
516 case SQLITE_CORRUPT: return "SQLITE_CORRUPT";
517 case SQLITE_NOTFOUND: return "SQLITE_NOTFOUND";
518 case SQLITE_FULL: return "SQLITE_FULL";
519 case SQLITE_CANTOPEN: return "SQLITE_CANTOPEN";
520 case SQLITE_PROTOCOL: return "SQLITE_PROTOCOL";
521 case SQLITE_EMPTY: return "SQLITE_EMPTY";
522 case SQLITE_SCHEMA: return "SQLITE_SCHEMA";
523 case SQLITE_TOOBIG: return "SQLITE_TOOBIG";
524 case SQLITE_CONSTRAINT: return "SQLITE_CONSTRAINT";
525 case SQLITE_MISMATCH: return "SQLITE_MISMATCH";
526 case SQLITE_MISUSE: return "SQLITE_MISUSE";
527 case SQLITE_NOLFS: return "SQLITE_NOLFS";
528 case SQLITE_AUTH: return "SQLITE_AUTH";
529 case SQLITE_FORMAT: return "SQLITE_FORMAT";
530 case SQLITE_RANGE: return "SQLITE_RANGE";
531 case SQLITE_NOTADB: return "SQLITE_NOTADB";
532 case SQLITE_NOTICE: return "SQLITE_NOTICE";
533 case SQLITE_WARNING: return "SQLITE_WARNING";
534 case SQLITE_ROW: return "SQLITE_ROW";
535 case SQLITE_DONE: return "SQLITE_DONE";
536 default: {
537 sqlite3_snprintf(sizeof(zCode), zCode, "SQLite return code %d", rc);
538 }
539 }
540 return zCode;
541 }
542
@@ -538,11 +546,11 @@
546 /* Disable the file alias warning on apple products because Time Machine
547 ** creates lots of aliases and the warning alarms people. */
548 if( iCode==SQLITE_WARNING ) return;
549 #endif
550 if( iCode==SQLITE_SCHEMA ) return;
551 fossil_warning("%s: %s", fossil_sqlite_return_code_name(iCode), zErrmsg);
552 }
553
554 /*
555 ** This function attempts to find command line options known to contain
556 ** bitwise flags and initializes the associated global variables. After
557
M src/th_main.c
+3 -2
--- src/th_main.c
+++ src/th_main.c
@@ -190,22 +190,23 @@
190190
 }
191191
 return rc;
192192
 }
193193
194194
 /*
195
-** Return a name for a TH1 return code.
195
+** Returns a name for a TH1 return code.
196196
 */
197197
 const char *Th_ReturnCodeName(int rc, int nullIfOk){
198198
 static char zRc[32];
199
+
199200
 switch( rc ){
200201
 case TH_OK: return nullIfOk ? 0 : "TH_OK";
201202
 case TH_ERROR: return "TH_ERROR";
202203
 case TH_BREAK: return "TH_BREAK";
203204
 case TH_RETURN: return "TH_RETURN";
204205
 case TH_CONTINUE: return "TH_CONTINUE";
205206
 default: {
206
- sqlite3_snprintf(sizeof(zRc),zRc,"return code %d",rc);
207
+ sqlite3_snprintf(sizeof(zRc), zRc, "TH1 return code %d", rc);
207208
 }
208209
 }
209210
 return zRc;
210211
 }
211212
212213
--- src/th_main.c
+++ src/th_main.c
@@ -190,22 +190,23 @@
190 }
191 return rc;
192 }
193
194 /*
195 ** Return a name for a TH1 return code.
196 */
197 const char *Th_ReturnCodeName(int rc, int nullIfOk){
198 static char zRc[32];
 
199 switch( rc ){
200 case TH_OK: return nullIfOk ? 0 : "TH_OK";
201 case TH_ERROR: return "TH_ERROR";
202 case TH_BREAK: return "TH_BREAK";
203 case TH_RETURN: return "TH_RETURN";
204 case TH_CONTINUE: return "TH_CONTINUE";
205 default: {
206 sqlite3_snprintf(sizeof(zRc),zRc,"return code %d",rc);
207 }
208 }
209 return zRc;
210 }
211
212
--- src/th_main.c
+++ src/th_main.c
@@ -190,22 +190,23 @@
190 }
191 return rc;
192 }
193
194 /*
195 ** Returns a name for a TH1 return code.
196 */
197 const char *Th_ReturnCodeName(int rc, int nullIfOk){
198 static char zRc[32];
199
200 switch( rc ){
201 case TH_OK: return nullIfOk ? 0 : "TH_OK";
202 case TH_ERROR: return "TH_ERROR";
203 case TH_BREAK: return "TH_BREAK";
204 case TH_RETURN: return "TH_RETURN";
205 case TH_CONTINUE: return "TH_CONTINUE";
206 default: {
207 sqlite3_snprintf(sizeof(zRc), zRc, "TH1 return code %d", rc);
208 }
209 }
210 return zRc;
211 }
212
213

Keyboard Shortcuts

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