From: compudj Date: Wed, 14 Jun 2006 04:35:20 +0000 (+0000) Subject: update brand X-Git-Tag: v0.12.20~1559 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=0292757b8dbc9107de3cdf01eb6dd1d8fe726663;p=lttv.git update brand git-svn-id: http://ltt.polymtl.ca/svn@1930 04897980-b3bd-0310-b5e0-8ef037075253 --- diff --git a/ltt/branches/poly/lttv/lttv/print.c b/ltt/branches/poly/lttv/lttv/print.c index 953326ab..f51e7b6e 100644 --- a/ltt/branches/poly/lttv/lttv/print.c +++ b/ltt/branches/poly/lttv/lttv/print.c @@ -236,7 +236,7 @@ void lttv_event_to_string(LttEvent *e, GString *s, guint i, num_fields; - g_string_set_size(s,0); + s = g_string_set_size(s,0); facility = ltt_event_facility(e); event_type = ltt_event_eventtype(e); diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c index a3a3102a..33b4c2f4 100644 --- a/ltt/branches/poly/lttv/lttv/state.c +++ b/ltt/branches/poly/lttv/lttv/state.c @@ -1660,8 +1660,9 @@ static gboolean process_fork(void *hook_data, void *call_data) before the fork event */ child_process->ppid = process->pid; } - g_assert(child_process->name == LTTV_STATE_UNNAMED); - child_process->name = process->name; + g_assert(child_process->name == LTTV_STATE_UNNAMED); + child_process->name = process->name; + child_process->brand = process->brand; return FALSE; } @@ -1779,6 +1780,7 @@ static gboolean process_exec(void *hook_data, void *call_data) null_term_name[name_len] = '\0'; process->name = g_quark_from_string(null_term_name); + process->brand = LTTV_STATE_UNBRANDED; g_free(null_term_name); return FALSE; }