From a496afb7ed696a1e4b0822bacab7f59d29d7e225 Mon Sep 17 00:00:00 2001 From: pmf Date: Sun, 14 Oct 2007 20:49:25 +0000 Subject: [PATCH] move lttv_merge_facility_event_name in tracecontext.h git-svn-id: http://ltt.polymtl.ca/svn@2675 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/lttv/lttv/tracecontext.c | 17 ----------------- ltt/branches/poly/lttv/lttv/tracecontext.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.c b/ltt/branches/poly/lttv/lttv/tracecontext.c index 71c95987..e6fb8fdf 100644 --- a/ltt/branches/poly/lttv/lttv/tracecontext.c +++ b/ltt/branches/poly/lttv/lttv/tracecontext.c @@ -968,23 +968,6 @@ struct marker_info *lttv_trace_hook_get_marker(LttTrace *t, LttvTraceHook *th) return marker_get_info_from_id(t, th->id); } -static inline GQuark lttv_merge_facility_event_name(GQuark fac, GQuark ev) -{ - char *tmp; - const char *sfac, *sev; - GQuark ret; - - sfac = g_quark_to_string(fac); - sev = g_quark_to_string(ev); - tmp = g_new(char, strlen(sfac) + strlen(sev) + 3); /* 3: _ \0 \0 */ - strcpy(tmp, sfac); - strcat(tmp, "_"); - strcat(tmp, sev); - ret = g_quark_from_string(tmp); - g_free(tmp); - return ret; -} - int lttv_trace_find_hook(LttTrace *t, GQuark facility_name, GQuark event_name, GQuark fields[], LttvHook h, gpointer hook_data, GArray **trace_hooks) { diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.h b/ltt/branches/poly/lttv/lttv/tracecontext.h index ed882b25..3c1a0155 100644 --- a/ltt/branches/poly/lttv/lttv/tracecontext.h +++ b/ltt/branches/poly/lttv/lttv/tracecontext.h @@ -19,6 +19,7 @@ #ifndef PROCESSTRACE_H #define PROCESSTRACE_H +#include #include #include #include @@ -307,6 +308,22 @@ lttv_trace_get_hook_field(LttvTraceHook *hook, unsigned int index) return g_ptr_array_index(hook->fields, index); } +static inline GQuark lttv_merge_facility_event_name(GQuark fac, GQuark ev) +{ + char *tmp; + const char *sfac, *sev; + GQuark ret; + + sfac = g_quark_to_string(fac); + sev = g_quark_to_string(ev); + tmp = g_new(char, strlen(sfac) + strlen(sev) + 3); /* 3: _ \0 \0 */ + strcpy(tmp, sfac); + strcat(tmp, "_"); + strcat(tmp, sev); + ret = g_quark_from_string(tmp); + g_free(tmp); + return ret; +} LttvTracefileContext *lttv_traceset_context_get_current_tfc( LttvTracesetContext *self); -- 2.34.1