projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Unchecked NULL string in logging statement
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 0c7ef8d76c0449afba1aa314cf33db87a3af2368..7fc2fb50374afd3840376726d067c15f2cacffb2 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-18,7
+18,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <getopt.h>
#include <grp.h>
#define _LGPL_SOURCE
#include <getopt.h>
#include <grp.h>
@@
-40,7
+39,6
@@
#include <urcu/uatomic.h>
#include <unistd.h>
#include <fcntl.h>
#include <urcu/uatomic.h>
#include <unistd.h>
#include <fcntl.h>
-#include <config.h>
#include <lttng/lttng.h>
#include <common/common.h>
#include <lttng/lttng.h>
#include <common/common.h>
@@
-56,7
+54,7
@@
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
-#include <common/config/config.h>
+#include <common/config/
session-
config.h>
#include <urcu/rculist.h>
#include "cmd.h"
#include <urcu/rculist.h>
#include "cmd.h"
@@
-307,7
+305,7
@@
end:
/*
* config_entry_handler_cb used to handle options read from a config file.
/*
* config_entry_handler_cb used to handle options read from a config file.
- * See config_entry_handler_cb comment in common/config/config.h for the
+ * See config_entry_handler_cb comment in common/config/
session-
config.h for the
* return value conventions.
*/
static int config_entry_handler(const struct config_entry *entry, void *unused)
* return value conventions.
*/
static int config_entry_handler(const struct config_entry *entry, void *unused)
@@
-1068,13
+1066,13
@@
static int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr,
int ret = 0, send_ret;
struct relay_session *session;
struct lttcomm_relayd_status_session reply;
int ret = 0, send_ret;
struct relay_session *session;
struct lttcomm_relayd_status_session reply;
- char session_name[NAME_MAX];
- char hostname[HOST_NAME_MAX];
+ char session_name[
LTTNG_
NAME_MAX];
+ char hostname[
LTTNG_
HOST_NAME_MAX];
uint32_t live_timer = 0;
bool snapshot = false;
uint32_t live_timer = 0;
bool snapshot = false;
- memset(session_name, 0, NAME_MAX);
- memset(hostname, 0, HOST_NAME_MAX);
+ memset(session_name, 0,
LTTNG_
NAME_MAX);
+ memset(hostname, 0,
LTTNG_
HOST_NAME_MAX);
memset(&reply, 0, sizeof(reply));
memset(&reply, 0, sizeof(reply));
This page took
0.033144 seconds
and
4
git commands to generate.