move lttv_merge_facility_event_name in tracecontext.h

git-svn-id: http://ltt.polymtl.ca/svn@2675 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.c b/ltt/branches/poly/lttv/lttv/tracecontext.c
index 71c9598730053c7aed0337d714cb806c000cddd2..e6fb8fdfeaa46e27ae8f02c10ab8a13fa247bb9d 100644 (file)
--- 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 ed882b253a7b6f8883112ad843437f7c45722a7f..3c1a015530cecc0a5617146232f015e0f5dd64ca 100644 (file)
--- 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 <string.h>
 #include <lttv/traceset.h>
 #include <lttv/attribute.h>
 #include <lttv/hook.h>
@@ -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);