On Fri, Sep 25, 2015 at 11:11:49AM +0000, He Kuang wrote:

SNIP

> +char *parse_events_formats_error_string(char *additional_terms)
> +{
> +     char *str;
> +     static const char *static_terms = "config,config1,config2,name,"
> +                                       "period,freq,branch_type,time,"
> +                                       "call-graph,stack-size\n";
> +
> +     /* valid terms */
> +     if (additional_terms) {
> +             if (!asprintf(&str, "valid terms: %s,%s",
> +                           additional_terms, static_terms))
> +                     goto fail;
> +             free(additional_terms);
> +     } else {
> +             if (!asprintf(&str, "valid terms: %s", static_terms))
> +                     goto fail;
> +     }
> +     return str;
> +
> +fail:
> +     return NULL;
> +}

also please change the comment in the flex file

thanks,
jirka


---
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 936d566f48d8..c29832bce496 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -174,7 +174,7 @@ modifier_bp [rwx]{1,3}
 
 <config>{
        /*
-        * Please update formats_error_string any time
+        * Please update parse_events_formats_error_string any time
         * new static term is added.
         */
 config                 { return term(yyscanner, 
PARSE_EVENTS__TERM_TYPE_CONFIG); }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to