refactor error struct

Author: ethomson

clar.c

@@ -100,11 +100,11 @@ fixture_path(const char *base, const char *fixture_name);
 #endif
 
 struct clar_error {
-	const char *file;
+	const char *message;
+	char *description;
 	const char *function;
+	const char *file;
 	uintmax_t line_number;
-	const char *error_msg;
-	char *description;
 
 	struct clar_error *next;
 };
@@ -776,7 +776,7 @@ void clar__fail(
 	const char *file,
 	const char *function,
 	size_t line,
-	const char *error_msg,
+	const char *error_message,
 	const char *error_description,
 	int should_abort)
 {
@@ -796,7 +796,7 @@ void clar__fail(
 	error->file = _clar.invoke_file ? _clar.invoke_file : file;
 	error->function = _clar.invoke_func ? _clar.invoke_func : function;
 	error->line_number = _clar.invoke_line ? _clar.invoke_line : line;
-	error->error_msg = error_msg;
+	error->message = error_message;
 
 	if (error_description != NULL &&
 	    (error->description = strdup(error_description)) == NULL)
@@ -814,14 +814,14 @@ void clar__assert(
 	const char *file,
 	const char *function,
 	size_t line,
-	const char *error_msg,
+	const char *error_message,
 	const char *error_description,
 	int should_abort)
 {
 	if (condition)
 		return;
 
-	clar__fail(file, function, line, error_msg, error_description, should_abort);
+	clar__fail(file, function, line, error_message, error_description, should_abort);
 }
 
 void clar__assert_equal(

clar/print.h

@@ -43,7 +43,7 @@ static void clar_print_clap_error(int num, const struct clar_report *report, con
 		error->file,
 		error->line_number);
 
-	clar_print_indented(error->error_msg, 2);
+	clar_print_indented(error->message, 2);
 
 	if (error->description != NULL)
 		clar_print_indented(error->description, 2);
@@ -161,7 +161,7 @@ static void clar_print_tap_test_finish(const char *suite_name, const char *test_
 
 		printf("    ---\n");
 		printf("    reason: |\n");
-		clar_print_indented(error->error_msg, 6);
+		clar_print_indented(error->message, 6);
 
 		if (error->description)
 			clar_print_indented(error->description, 6);
@@ -279,7 +279,7 @@ static void clar_print_timing_test_finish(const char *suite_name, const char *te
 		printf("\n");
 		break;
 	case CL_TEST_FAILURE:
-		printf("failed: %s\n", error->error_msg);
+		printf("failed: %s\n", error->message);
 		break;
 	case CL_TEST_SKIP:
 	case CL_TEST_NOTRUN:

clar/summary.h

@@ -123,7 +123,7 @@ int clar_summary_junit_shutdown(struct clar_summary *summary)
 
 		while (error != NULL) {
 			if (clar_summary_junit_failure(summary, "assert",
-			    error->error_msg, error->description) < 0)
+			    error->message, error->description) < 0)
 				goto on_error;
 
 			error = error->next;
@@ -243,7 +243,7 @@ int clar_summary_json_shutdown(struct clar_summary *summary)
 					fprintf(summary->fp, ",\n");
 
 				fprintf(summary->fp, "          {\n");
-				fprintf(summary->fp, "            \"message\": \"%s\",\n", error->error_msg);
+				fprintf(summary->fp, "            \"message\": \"%s\",\n", error->message);
 
 				if (error->description)
 					fprintf(summary->fp, "            \"description\": \"%s\",\n", error->description);