Compare commits

...

1 Commits

Author SHA1 Message Date
coah
201c182666 cleanup(CDBDatabase): name error message string labels
Rename Matching lbl_* CDBReportError messages to scCdbMsg_*.
2026-10-01 18:01:27 -05:00
2 changed files with 29 additions and 29 deletions

View File

@@ -18235,13 +18235,13 @@ jumptable_8166B3D0 = .data:0x8166B3D0; // type:object size:0x30 scope:local
@1137 = .data:0x8166B450; // type:object size:0x22 scope:local data:string @1137 = .data:0x8166B450; // type:object size:0x22 scope:local data:string
jumptable_8166B478 = .data:0x8166B478; // type:object size:0x30 scope:local jumptable_8166B478 = .data:0x8166B478; // type:object size:0x30 scope:local
lbl_8166B4B8 = .data:0x8166B4B8; // type:object size:0x70 lbl_8166B4B8 = .data:0x8166B4B8; // type:object size:0x70
lbl_8166B528 = .data:0x8166B528; // type:object size:0x25 data:string scCdbMsg_DatabaseClosed = .data:0x8166B528; // type:object size:0x25 data:string
lbl_8166B550 = .data:0x8166B550; // type:object size:0x29 data:string scCdbMsg_CantCreateRecordClosed = .data:0x8166B550; // type:object size:0x29 data:string
lbl_8166B57C = .data:0x8166B57C; // type:object size:0x2B data:string scCdbMsg_CantCreateRecordReadonly = .data:0x8166B57C; // type:object size:0x2B data:string
lbl_8166B5A8 = .data:0x8166B5A8; // type:object size:0xD data:string scCdbMsg_InvalidKey = .data:0x8166B5A8; // type:object size:0xD data:string
lbl_8166B5B8 = .data:0x8166B5B8; // type:object size:0x15 data:string scCdbMsg_FileNotFound = .data:0x8166B5B8; // type:object size:0x15 data:string
lbl_8166B5D0 = .data:0x8166B5D0; // type:object size:0x46 data:string scCdbMsg_CantCleanupDirsClosed = .data:0x8166B5D0; // type:object size:0x46 data:string
lbl_8166B618 = .data:0x8166B618; // type:object size:0x48 data:string scCdbMsg_CantCleanupDirsReadonly = .data:0x8166B618; // type:object size:0x48 data:string
@1360 = .data:0x8166B660; // type:object size:0x12 scope:local data:string @1360 = .data:0x8166B660; // type:object size:0x12 scope:local data:string
...data.0 = .data:0x8166B660; // type:label scope:local ...data.0 = .data:0x8166B660; // type:label scope:local
@1362 = .data:0x8166B674; // type:object size:0x1C scope:local data:string @1362 = .data:0x8166B674; // type:object size:0x1C scope:local data:string

View File

@@ -79,13 +79,13 @@ typedef struct {
} CDBSearchWork; } CDBSearchWork;
extern CDBSearchWork* CDBDatabaseWorkBuf; extern CDBSearchWork* CDBDatabaseWorkBuf;
extern char lbl_8166B528[]; extern char scCdbMsg_DatabaseClosed[];
extern char lbl_8166B550[]; extern char scCdbMsg_CantCreateRecordClosed[];
extern char lbl_8166B57C[]; extern char scCdbMsg_CantCreateRecordReadonly[];
extern char lbl_8166B5A8[]; extern char scCdbMsg_InvalidKey[];
extern char lbl_8166B5B8[]; extern char scCdbMsg_FileNotFound[];
extern char lbl_8166B5D0[]; extern char scCdbMsg_CantCleanupDirsClosed[];
extern char lbl_8166B618[]; extern char scCdbMsg_CantCleanupDirsReadonly[];
extern CDBErr CDBDatabaseInit(); extern CDBErr CDBDatabaseInit();
extern CDBErr CDBDatabaseOpen(); extern CDBErr CDBDatabaseOpen();
@@ -165,7 +165,7 @@ CDBErr CDBDatabaseClose(CDBDatabase* database) {
CDBLock(); CDBLock();
instance = database->instance; instance = database->instance;
if (instance == NULL || instance->flags == 0) { if (instance == NULL || instance->flags == 0) {
CDBReportError(lbl_8166B528); CDBReportError(scCdbMsg_DatabaseClosed);
result = CDB_ERROR_27; result = CDB_ERROR_27;
} else { } else {
status = CDBDatabaseFree(database); status = CDBDatabaseFree(database);
@@ -403,17 +403,17 @@ CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record
instance = database->instance; instance = database->instance;
if (instance == NULL) { if (instance == NULL) {
CDBReportError(lbl_8166B550); CDBReportError(scCdbMsg_CantCreateRecordClosed);
return CDB_ERROR_27; return CDB_ERROR_27;
} }
flags = instance->flags; flags = instance->flags;
if ((flags & 2) == 0) { if ((flags & 2) == 0) {
if (flags == 0) { if (flags == 0) {
CDBReportError(lbl_8166B550); CDBReportError(scCdbMsg_CantCreateRecordClosed);
return CDB_ERROR_27; return CDB_ERROR_27;
} }
CDBReportError(lbl_8166B57C); CDBReportError(scCdbMsg_CantCreateRecordReadonly);
return CDB_ERROR_26; return CDB_ERROR_26;
} }
@@ -427,12 +427,12 @@ CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordK
CDBLock(); CDBLock();
if (!CDBRecordKeyIsValid(recordKey)) { if (!CDBRecordKeyIsValid(recordKey)) {
CDBReportError(lbl_8166B5A8); CDBReportError(scCdbMsg_InvalidKey);
result = CDB_ERROR_5; result = CDB_ERROR_5;
} else { } else {
CDBRecordInitDescriptor(record, database, recordKey); CDBRecordInitDescriptor(record, database, recordKey);
if (!CDBRecordIsExistFile(record)) { if (!CDBRecordIsExistFile(record)) {
CDBReportError(lbl_8166B5B8, recordKey->keyString); CDBReportError(scCdbMsg_FileNotFound, recordKey->keyString);
result = CDB_ERROR_CANNOT_OPEN_FILE; result = CDB_ERROR_CANNOT_OPEN_FILE;
} else { } else {
result = CDB_ERROR_OK; result = CDB_ERROR_OK;
@@ -2608,11 +2608,11 @@ CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocati
CDBUnlock(); CDBUnlock();
if (flags == 0) { if (flags == 0) {
CDBReportError(lbl_8166B5D0); CDBReportError(scCdbMsg_CantCleanupDirsClosed);
return CDB_ERROR_27; return CDB_ERROR_27;
} }
if (flags == 1) { if (flags == 1) {
CDBReportError(lbl_8166B618); CDBReportError(scCdbMsg_CantCleanupDirsReadonly);
return CDB_ERROR_26; return CDB_ERROR_26;
} }
@@ -2663,16 +2663,16 @@ CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocati
#pragma section data_type ".data" #pragma section data_type ".data"
#pragma align 8 #pragma align 8
extern char lbl_8166B528[] = "CDBDatabaseClose database is closed\n"; extern char scCdbMsg_DatabaseClosed[] = "CDBDatabaseClose database is closed\n";
#pragma align 8 #pragma align 8
extern char lbl_8166B550[] = "can't create record; database is closed\n"; extern char scCdbMsg_CantCreateRecordClosed[] = "can't create record; database is closed\n";
#pragma align 8 #pragma align 8
extern char lbl_8166B57C[] = "can't create record; database is readonly\n"; extern char scCdbMsg_CantCreateRecordReadonly[] = "can't create record; database is readonly\n";
#pragma align 8 #pragma align 8
extern char lbl_8166B5A8[] = "invalid key\n"; extern char scCdbMsg_InvalidKey[] = "invalid key\n";
#pragma align 8 #pragma align 8
extern char lbl_8166B5B8[] = "file not found : %s\n"; extern char scCdbMsg_FileNotFound[] = "file not found : %s\n";
#pragma align 8 #pragma align 8
extern char lbl_8166B5D0[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n"; extern char scCdbMsg_CantCleanupDirsClosed[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n";
#pragma align 8 #pragma align 8
extern char lbl_8166B618[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n"; extern char scCdbMsg_CantCleanupDirsReadonly[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n";