lkml.org 
[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 03/11] parse-events: Get rid of handling concatenation on event_read_print
    From
    Date
    On Mon, 2012-04-23 at 13:58 +0900, Namhyung Kim wrote:
    > The concatenation of subsequent DQUOTE'd strings is handled
    > by __read_token() already.
    >

    You missed the point of this concat. It's not connecting "xxx" it is
    connecting "xxx" "yyy" into "xxxyyy", as some events do this.

    -- Steve

    > Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
    > ---
    > parse-events.c | 16 ----------------
    > 1 file changed, 16 deletions(-)
    >
    > diff --git a/parse-events.c b/parse-events.c
    > index 0cd79c5..b4ae313 100644
    > --- a/parse-events.c
    > +++ b/parse-events.c
    > @@ -2695,7 +2695,6 @@ static int event_read_print(struct event_format *event)
    > if (read_expect_type(EVENT_DQUOTE, &token) < 0)
    > goto fail;
    >
    > - concat:
    > event->print_fmt.format = token;
    > event->print_fmt.args = NULL;
    >
    > @@ -2705,21 +2704,6 @@ static int event_read_print(struct event_format *event)
    > if (type == EVENT_NONE)
    > return 0;
    >
    > - /* Handle concatenation of print lines */
    > - if (type == EVENT_DQUOTE) {
    > - char *cat;
    > -
    > - cat = malloc_or_die(strlen(event->print_fmt.format) +
    > - strlen(token) + 1);
    > - strcpy(cat, event->print_fmt.format);
    > - strcat(cat, token);
    > - free_token(token);
    > - free_token(event->print_fmt.format);
    > - event->print_fmt.format = NULL;
    > - token = cat;
    > - goto concat;
    > - }
    > -
    > if (test_type_token(type, token, EVENT_DELIM, ","))
    > goto fail;
    >




    \
     
     \ /
      Last update: 2012-04-23 18:37    [W:0.028 / U:88.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site