From: K.Kosako Date: Sun, 11 Mar 2018 12:02:07 +0000 (+0900) Subject: no needs to allocate contents string X-Git-Tag: v6.8.0~29 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92e8ebaec9571e63fcff08ba133055a5c367b08f;p=onig no needs to allocate contents string --- diff --git a/sample/callout.c b/sample/callout.c index 4a8531c..54d6bc9 100644 --- a/sample/callout.c +++ b/sample/callout.c @@ -18,9 +18,7 @@ callout_body(OnigCalloutArgs* args, void* user_data) int used_bytes; OnigCalloutIn in; int name_id; - UChar* contents; - const UChar* acontents; - const UChar* acontents_end; + const UChar* contents; const UChar* start; const UChar* current; regex_t* regex; @@ -31,13 +29,7 @@ callout_body(OnigCalloutArgs* args, void* user_data) current = onig_get_current_by_callout_args(args); regex = onig_get_regex_by_callout_args(args); - contents = 0; - acontents = onig_get_contents_by_callout_args(args); - if (acontents != 0) { - OnigEncoding enc = onig_get_encoding(regex); - acontents_end = onig_get_contents_end_by_callout_args(args); - contents = onigenc_strdup(enc, acontents, acontents_end); - } + contents = onig_get_contents_by_callout_args(args); if (name_id != ONIG_NON_NAME_ID) { UChar* name = onig_get_callout_name_by_name_id(name_id); @@ -49,8 +41,6 @@ callout_body(OnigCalloutArgs* args, void* user_data) in == ONIG_CALLOUT_IN_PROGRESS ? "PROGRESS" : "RETRACTION", contents, start, current); - if (contents != 0) free(contents); - (void )onig_get_used_stack_size_in_callout(args, &used_num, &used_bytes); fprintf(stdout, "stack: used_num: %d, used_bytes: %d\n", used_num, used_bytes);