lkml.org 
[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 03/11] parse-events: Get rid of handling concatenation on event_read_print
Date
The concatenation of subsequent DQUOTE'd strings is handled
by __read_token() already.

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;

--
1.7.10


\
 
 \ /
  Last update: 2012-04-23 07:55    [W:0.212 / U:119.452 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site