From 0206bb4ab13c24263966d56fbe5bda7b1645de51 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 28 Sep 2015 10:13:27 -0400 Subject: [PATCH] Port: Replace NAME_MAX by MAXNAMLEN MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit MAXNAMLEN is defined on Linux, Solaris and BSD Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- formats/lttng-live/lttng-live-comm.c | 12 ++++++------ formats/lttng-live/lttng-live-plugin.c | 6 +++--- formats/lttng-live/lttng-live.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c index ae4f00b7..eb9b8da4 100644 --- a/formats/lttng-live/lttng-live-comm.c +++ b/formats/lttng-live/lttng-live-comm.c @@ -263,9 +263,9 @@ void update_session_list(GPtrArray *session_list, char *hostname, for (i = 0; i < session_list->len; i++) { relay_session = g_ptr_array_index(session_list, i); - if ((strncmp(relay_session->hostname, hostname, NAME_MAX) == 0) && + if ((strncmp(relay_session->hostname, hostname, MAXNAMLEN) == 0) && strncmp(relay_session->name, - session_name, NAME_MAX) == 0) { + session_name, MAXNAMLEN) == 0) { relay_session->streams += streams; if (relay_session->clients < clients) relay_session->clients = clients; @@ -277,8 +277,8 @@ void update_session_list(GPtrArray *session_list, char *hostname, return; relay_session = g_new0(struct lttng_live_relay_session, 1); - relay_session->hostname = strndup(hostname, NAME_MAX); - relay_session->name = strndup(session_name, NAME_MAX); + relay_session->hostname = strndup(hostname, MAXNAMLEN); + relay_session->name = strndup(session_name, MAXNAMLEN); relay_session->clients = clients; relay_session->streams = streams; relay_session->timer = timer; @@ -352,8 +352,8 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path) be32toh(lsession.live_timer)); } else { if ((strncmp(lsession.session_name, ctx->session_name, - NAME_MAX) == 0) && (strncmp(lsession.hostname, - ctx->traced_hostname, NAME_MAX) == 0)) { + MAXNAMLEN) == 0) && (strncmp(lsession.hostname, + ctx->traced_hostname, MAXNAMLEN) == 0)) { printf_verbose("Reading from session %" PRIu64 "\n", session_id); g_array_append_val(ctx->session_ids, diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c index 643129c8..adb7249d 100644 --- a/formats/lttng-live/lttng-live-plugin.c +++ b/formats/lttng-live/lttng-live-plugin.c @@ -90,12 +90,12 @@ int setup_sighandler(void) } /* - * hostname parameter needs to hold NAME_MAX chars. + * hostname parameter needs to hold MAXNAMLEN chars. */ static int parse_url(const char *path, struct lttng_live_ctx *ctx) { - char remain[3][NAME_MAX]; + char remain[3][MAXNAMLEN]; int ret = -1, proto, proto_offset = 0; size_t path_len = strlen(path); /* not accounting \0 */ @@ -104,7 +104,7 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx) * against a size defined by a macro. Test it beforehand on the * input. We know the output is always <= than the input length. */ - if (path_len >= NAME_MAX) { + if (path_len >= MAXNAMLEN) { goto end; } ret = sscanf(path, "net%d://", &proto); diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h index c4641df7..4ab641d5 100644 --- a/formats/lttng-live/lttng-live.h +++ b/formats/lttng-live/lttng-live.h @@ -33,9 +33,9 @@ #define LTTNG_LIVE_MINOR 4 struct lttng_live_ctx { - char traced_hostname[NAME_MAX]; - char session_name[NAME_MAX]; - char relay_hostname[NAME_MAX]; + char traced_hostname[MAXNAMLEN]; + char session_name[MAXNAMLEN]; + char relay_hostname[MAXNAMLEN]; int control_sock; int port; /* Protocol version to use for this connection. */ -- 2.34.1