14
14
#include "util_strings.h"
15
15
#include "util_time.h"
16
16
17
- static nr_error_t * nr_error_create_helper (int priority ,
18
- const char * message ,
19
- const char * klass ,
20
- const char * error_file ,
21
- int error_line ,
22
- const char * error_context ,
23
- int error_no ,
24
- const char * stacktrace_json ,
25
- const char * span_id ,
26
- nrtime_t when ) {
27
- nr_error_t * error ;
28
-
29
- error = (nr_error_t * )nr_zalloc (sizeof (nr_error_t ));
30
- error -> priority = priority ;
31
- error -> when = when ;
32
- error -> message = nr_strdup (message );
33
- error -> klass = nr_strdup (klass );
34
- error -> stacktrace_json = nr_strdup (stacktrace_json );
35
- if (NULL != error_file && NULL != error_context ) {
36
- error -> error_file = nr_strdup (error_file );
37
- error -> error_line = error_line ;
38
- error -> error_context = nr_strdup (error_context );
39
- error -> error_no = error_no ;
40
- }
41
-
42
- if (NULL != span_id ) {
43
- error -> span_id = nr_strdup (span_id );
44
- }
45
- return error ;
46
- }
47
-
48
17
nr_error_t * nr_error_create (int priority ,
49
18
const char * message ,
50
19
const char * klass ,
@@ -54,7 +23,7 @@ nr_error_t* nr_error_create(int priority,
54
23
if (0 == message || 0 == klass || 0 == stacktrace_json ) {
55
24
return 0 ;
56
25
}
57
- return nr_error_create_helper (priority , message , klass , NULL , 0 , NULL , 0 ,
26
+ return nr_error_create_additional_params (priority , message , klass , NULL , 0 , NULL , 0 ,
58
27
stacktrace_json , span_id , when );
59
28
}
60
29
@@ -68,12 +37,31 @@ nr_error_t* nr_error_create_additional_params(int priority,
68
37
const char * stacktrace_json ,
69
38
const char * span_id ,
70
39
nrtime_t when ) {
71
- if ( 0 == message || 0 == klass || 0 == error_file || 0 == error_context
72
- || 0 == stacktrace_json ) {
40
+ nr_error_t * error ;
41
+ if ( NULL == klass || NULL == stacktrace_json ) {
73
42
return 0 ;
74
43
}
75
- return nr_error_create_helper (priority , message , klass , error_file , error_line , error_context , error_no ,
76
- stacktrace_json , span_id , when );
44
+
45
+ error = (nr_error_t * )nr_zalloc (sizeof (nr_error_t ));
46
+ error -> priority = priority ;
47
+ error -> when = when ;
48
+ error -> klass = nr_strdup (klass );
49
+ error -> stacktrace_json = nr_strdup (stacktrace_json );
50
+ error -> error_line = error_line ;
51
+ error -> error_no = error_no ;
52
+ if (NULL != message ) {
53
+ error -> message = nr_strdup (message );
54
+ }
55
+ if (NULL != error_file ) {
56
+ error -> error_file = nr_strdup (error_file );
57
+ }
58
+ if (NULL != error_context ) {
59
+ error -> error_context = nr_strdup (error_context );
60
+ }
61
+ if (NULL != span_id ) {
62
+ error -> span_id = nr_strdup (span_id );
63
+ }
64
+ return error ;
77
65
}
78
66
79
67
const char * nr_error_get_message (const nr_error_t * error ) {
0 commit comments