Skip to content

Commit 0d69fea

Browse files
committed
add _get_ to getter names for DcmError
oop, sorry, I dropped this one
1 parent e81876b commit 0d69fea

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

include/dicom/dicom.h

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ void dcm_error_clear(DcmError **error);
296296
* :return: Short description of the error
297297
*/
298298
DCM_EXTERN
299-
const char *dcm_error_summary(DcmError *error);
299+
const char *dcm_error_get_summary(DcmError *error);
300300

301301
/**
302302
* Get the error message.
@@ -309,7 +309,7 @@ const char *dcm_error_summary(DcmError *error);
309309
* :return: Message stored in a error object
310310
*/
311311
DCM_EXTERN
312-
const char *dcm_error_message(DcmError *error);
312+
const char *dcm_error_get_message(DcmError *error);
313313

314314
/**
315315
* Get the error code.
@@ -319,17 +319,7 @@ const char *dcm_error_message(DcmError *error);
319319
* :return: Error code
320320
*/
321321
DCM_EXTERN
322-
DcmErrorCode dcm_error_code(DcmError *error);
323-
324-
/**
325-
* Get a symbolic name for an error.
326-
*
327-
* :param code: Error object
328-
*
329-
* :return: Error code
330-
*/
331-
DCM_EXTERN
332-
const char *dcm_error_code_name(DcmErrorCode code);
322+
DcmErrorCode dcm_error_get_code(DcmError *error);
333323

334324
/**
335325
* Log an error message using information stored on the error object.

src/dicom.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,19 +190,19 @@ void dcm_error_clear(DcmError **error)
190190
}
191191

192192

193-
DcmErrorCode dcm_error_code(DcmError *error)
193+
DcmErrorCode dcm_error_get_code(DcmError *error)
194194
{
195195
return error->code;
196196
}
197197

198198

199-
const char *dcm_error_message(DcmError *error)
199+
const char *dcm_error_get_message(DcmError *error)
200200
{
201201
return (const char *) error->message;
202202
}
203203

204204

205-
const char *dcm_error_summary(DcmError *error)
205+
const char *dcm_error_get_summary(DcmError *error)
206206
{
207207
return (const char *) error->summary;
208208
}

tests/check_dicom.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ START_TEST(test_error)
122122
ck_assert_ptr_null(filehandle);
123123
ck_assert_ptr_nonnull(error);
124124

125-
ck_assert_int_eq(dcm_error_code(error), DCM_ERROR_CODE_IO);
126-
ck_assert_ptr_nonnull(dcm_error_summary(error));
127-
ck_assert_ptr_nonnull(dcm_error_message(error));
125+
ck_assert_int_eq(dcm_error_get_code(error), DCM_ERROR_CODE_IO);
126+
ck_assert_ptr_nonnull(dcm_error_get_summary(error));
127+
ck_assert_ptr_nonnull(dcm_error_get_message(error));
128128

129129
dcm_error_clear(&error);
130130
ck_assert_ptr_null(error);

0 commit comments

Comments
 (0)