Skip to content

Commit 1ec5164

Browse files
hahuja2mfulb
authored andcommitted
chore(axiom): remove helper function and add additional if statements
1 parent 92b0d2d commit 1ec5164

File tree

1 file changed

+26
-35
lines changed

1 file changed

+26
-35
lines changed

axiom/nr_segment.c

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,43 +1170,13 @@ void nr_segment_record_exception(nr_segment_t* segment,
11701170
nr_segment_set_error(segment, error_message, error_class);
11711171
}
11721172

1173-
static void nr_segment_set_error_helper(nr_segment_t* segment,
1174-
const char* error_message,
1175-
const char* error_class,
1176-
const char* error_file,
1177-
int error_line,
1178-
char* error_context,
1179-
int error_no) {
1180-
if (NULL == segment->error) {
1181-
segment->error = nr_zalloc(sizeof(nr_segment_error_t));
1182-
}
1183-
1184-
nr_free(segment->error->error_message);
1185-
nr_free(segment->error->error_class);
1186-
if (NULL != error_file && NULL != error_context) {
1187-
nr_free(segment->error->error_file);
1188-
nr_free(segment->error->error_context);
1189-
}
1190-
1191-
segment->error->error_message
1192-
= error_message ? nr_strdup(error_message) : NULL;
1193-
segment->error->error_class = error_class ? nr_strdup(error_class) : NULL;
1194-
if (NULL != error_file && NULL != error_context) {
1195-
segment->error->error_file = error_file ? nr_strdup(error_file) : NULL;
1196-
segment->error->error_line = error_line ? error_line : 0;
1197-
segment->error->error_context
1198-
= error_context ? nr_strdup(error_context) : NULL;
1199-
segment->error->error_no = error_no ? error_no : 0;
1200-
}
1201-
}
1202-
12031173
void nr_segment_set_error(nr_segment_t* segment,
12041174
const char* error_message,
12051175
const char* error_class) {
12061176
if ((NULL == segment) || (NULL == error_message && NULL == error_class)) {
12071177
return;
12081178
}
1209-
nr_segment_set_error_helper(segment, error_message, error_class, NULL, 0,
1179+
nr_segment_set_error_with_additional_params(segment, error_message, error_class, NULL, 0,
12101180
NULL, 0);
12111181
}
12121182

@@ -1217,12 +1187,33 @@ void nr_segment_set_error_with_additional_params(nr_segment_t* segment,
12171187
int error_line,
12181188
char* error_context,
12191189
int error_no) {
1220-
if ((NULL == segment) || (NULL == error_message) || (NULL == error_class)
1221-
|| NULL == error_file || (NULL == error_context)) {
1190+
if (NULL == segment || NULL == error_class) {
12221191
return;
12231192
}
1224-
nr_segment_set_error_helper(segment, error_message, error_class, error_file,
1225-
error_line, error_context, error_no);
1193+
1194+
if (NULL == segment->error) {
1195+
segment->error = nr_zalloc(sizeof(nr_segment_error_t));
1196+
}
1197+
1198+
nr_free(segment->error->error_message);
1199+
nr_free(segment->error->error_class);
1200+
nr_free(segment->error->error_file);
1201+
nr_free(segment->error->error_context);
1202+
nr_free(segment->error->error_file);
1203+
nr_free(segment->error->error_context);
1204+
1205+
segment->error->error_class = error_class ? nr_strdup(error_class) : NULL;
1206+
segment->error->error_no = error_no;
1207+
segment->error->error_line = error_line;
1208+
if (NULL != error_message) {
1209+
segment->error->error_message = error_message ? nr_strdup(error_message) : NULL;
1210+
}
1211+
if (NULL != error_file) {
1212+
segment->error->error_file = error_file ? nr_strdup(error_file) : NULL;
1213+
}
1214+
if (NULL != error_context) {
1215+
segment->error->error_context = error_context ? nr_strdup(error_context) : NULL;
1216+
}
12261217
}
12271218

12281219
bool nr_segment_attributes_user_add(nr_segment_t* segment,

0 commit comments

Comments
 (0)