Skip to content

Commit ece2926

Browse files
committed
Make return codes of file load/store api consistent, remove misleading comments.
1 parent 73c5107 commit ece2926

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

include/crm114_lib.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,10 @@ void crm114_show_result(const char name[], const CRM114_MATCHRESULT *r);
428428

429429
void crm114_free(void *p);
430430

431-
int crm114_cb_write_text_fp(const CRM114_CONTROLBLOCK *cb, FILE *fp);
432-
int crm114_cb_write_text(const CRM114_CONTROLBLOCK *cb, const char filename[]);
433-
int crm114_db_write_text_fp(const CRM114_DATABLOCK *db, FILE *fp);
434-
int crm114_db_write_text(const CRM114_DATABLOCK *db, const char filename[]);
431+
CRM114_ERR crm114_cb_write_text_fp(const CRM114_CONTROLBLOCK *cb, FILE *fp);
432+
CRM114_ERR crm114_cb_write_text(const CRM114_CONTROLBLOCK *cb, const char filename[]);
433+
CRM114_ERR crm114_db_write_text_fp(const CRM114_DATABLOCK *db, FILE *fp);
434+
CRM114_ERR crm114_db_write_text(const CRM114_DATABLOCK *db, const char filename[]);
435435
CRM114_CONTROLBLOCK *crm114_cb_read_text_fp(FILE *fp);
436436
CRM114_CONTROLBLOCK *crm114_cb_read_text(const char filename[]);
437437
CRM114_DATABLOCK *crm114_db_read_text_fp(FILE *fp);

lib/crm114_base.c

+6-10
Original file line numberDiff line numberDiff line change
@@ -1162,8 +1162,7 @@ static int read_text_string_fp(char buf[], int bufsize, FILE *fp)
11621162
return ret;
11631163
}
11641164

1165-
// Returns T/F success/failure.
1166-
int crm114_cb_write_text_fp(const CRM114_CONTROLBLOCK *cb, FILE *fp)
1165+
CRM114_ERR crm114_cb_write_text_fp(const CRM114_CONTROLBLOCK *cb, FILE *fp)
11671166
{
11681167
int row, col;
11691168
int i;
@@ -1228,11 +1227,10 @@ int crm114_cb_write_text_fp(const CRM114_CONTROLBLOCK *cb, FILE *fp)
12281227
cb->class[i].features);
12291228
}
12301229

1231-
return TRUE; // optimistic, aren't we?
1230+
return CRM114_OK; // optimistic, aren't we?
12321231
}
12331232

1234-
// Returns T/F success/failure.
1235-
int crm114_cb_write_text(const CRM114_CONTROLBLOCK *cb, const char filename[])
1233+
CRM114_ERR crm114_cb_write_text(const CRM114_CONTROLBLOCK *cb, const char filename[])
12361234
{
12371235
FILE *fp;
12381236
int ret;
@@ -1243,13 +1241,12 @@ int crm114_cb_write_text(const CRM114_CONTROLBLOCK *cb, const char filename[])
12431241
fclose(fp);
12441242
}
12451243
else
1246-
ret = FALSE;
1244+
ret = CRM114_OPEN_FAILED;
12471245

12481246
return ret;
12491247
}
12501248

1251-
// Returns T/F success/failure.
1252-
int crm114_db_write_text_fp(const CRM114_DATABLOCK *db, FILE *fp)
1249+
CRM114_ERR crm114_db_write_text_fp(const CRM114_DATABLOCK *db, FILE *fp)
12531250
{
12541251
(void)crm114_cb_write_text_fp(&db->cb, fp);
12551252
// write learned data
@@ -1283,8 +1280,7 @@ int crm114_db_write_text_fp(const CRM114_DATABLOCK *db, FILE *fp)
12831280
return CRM114_OK;
12841281
}
12851282

1286-
// Returns T/F success/failure.
1287-
int crm114_db_write_text(const CRM114_DATABLOCK *db, const char filename[])
1283+
CRM114_ERR crm114_db_write_text(const CRM114_DATABLOCK *db, const char filename[])
12881284
{
12891285
FILE *fp;
12901286
int ret;

0 commit comments

Comments
 (0)