From: David Goulet Date: Fri, 27 May 2011 19:56:40 +0000 (-0400) Subject: Fix errors due to lttng.h cleanup X-Git-Tag: v2.0-pre1~105 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=64a23ac4e22093a782b87fe615fabf20edacedd2 Fix errors due to lttng.h cleanup Rename lttng/lttng.h to options.h in order to avoid confusion with the public lttng.h header file. Signed-off-by: David Goulet --- diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c index ab44efe90..c27ce0928 100644 --- a/liblttngctl/liblttngctl.c +++ b/liblttngctl/liblttngctl.c @@ -588,5 +588,5 @@ end: static void __attribute__((constructor)) init() { /* Set default session group */ - lttng_set_tracing_group(DEFAULT_TRACING_GROUP); + lttng_set_tracing_group(LTTNG_DEFAULT_TRACING_GROUP); } diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 722402311..4b2fb52c2 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -55,7 +55,7 @@ /* Const values */ const char default_home_dir[] = DEFAULT_HOME_DIR; -const char default_tracing_group[] = DEFAULT_TRACING_GROUP; +const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP; const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR; const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE; diff --git a/lttng/lttng.c b/lttng/lttng.c index 5319c13d3..ab8995274 100644 --- a/lttng/lttng.c +++ b/lttng/lttng.c @@ -32,8 +32,8 @@ #include -#include "lttng.h" #include "lttngerr.h" +#include "options.h" /* Variables */ static char *progname; diff --git a/lttng/lttng.h b/lttng/lttng.h deleted file mode 100644 index efaed09b5..000000000 --- a/lttng/lttng.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright (C) 2011 - David Goulet - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef _LTTNG_H -#define _LTTNG_H - -/* Function prototypes */ -int parse_args(int argc, const char **argv); -void clean_exit(int code); - -/* Command line options */ -extern int opt_trace_kernel; -extern int opt_verbose; -extern int opt_quiet; -extern char *opt_tracing_group; -extern char *opt_session_uuid; -extern char *opt_sessiond_path; -extern char *opt_session_name; -extern char *opt_event_list; -extern char *opt_trace_name; -extern int opt_destroy_trace; -extern int opt_enable_event; -extern int opt_disable_event; -extern int opt_destroy_session; -extern int opt_create_session; -extern int opt_kern_create_channel; -extern int opt_list_apps; -extern int opt_no_sessiond; -extern int opt_list_session; -extern int opt_list_traces; -extern int opt_create_trace; -extern int opt_start_trace; -extern int opt_stop_trace; -extern pid_t opt_trace_pid; - -#endif /* _LTTNG_H */ diff --git a/lttng/options.c b/lttng/options.c index bb3ecbb0c..643ea5194 100644 --- a/lttng/options.c +++ b/lttng/options.c @@ -19,7 +19,7 @@ #include #include -#include "lttng.h" +#include "options.h" /* Option variables */ char *opt_event_list; diff --git a/lttng/options.h b/lttng/options.h new file mode 100644 index 000000000..d5c0b5372 --- /dev/null +++ b/lttng/options.h @@ -0,0 +1,50 @@ +/* Copyright (C) 2011 - David Goulet + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef _LTTNG_OPTIONS_H +#define _LTTNG_OPTIONS_H_ + +/* Function prototypes */ +int parse_args(int argc, const char **argv); +void clean_exit(int code); + +/* Command line options */ +extern int opt_trace_kernel; +extern int opt_verbose; +extern int opt_quiet; +extern char *opt_tracing_group; +extern char *opt_session_uuid; +extern char *opt_sessiond_path; +extern char *opt_session_name; +extern char *opt_event_list; +extern char *opt_trace_name; +extern int opt_destroy_trace; +extern int opt_enable_event; +extern int opt_disable_event; +extern int opt_destroy_session; +extern int opt_create_session; +extern int opt_kern_create_channel; +extern int opt_list_apps; +extern int opt_no_sessiond; +extern int opt_list_session; +extern int opt_list_traces; +extern int opt_create_trace; +extern int opt_start_trace; +extern int opt_stop_trace; +extern pid_t opt_trace_pid; + +#endif /* _LTTNG_OPTIONS_H */