liblttng-ctl: use export list to define exported symbols

[lttng-tools.git] / src / common / sessiond-comm / sessiond-comm.c

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 6c00a71bcddb8529a872bec96ec6895a3a055c1a..f3680c1391eb941b32b12726d8df82ba4540beb0 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -7,7 +7,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,7 +70,6 @@ static unsigned long network_timeout;
  *
  * These code MUST be negative in other to treat that as an error value.
  */
-LTTNG_HIDDEN
 const char *lttcomm_get_readable_code(enum lttcomm_return_code code)
 {
        code = -code;
@@ -87,12 +85,11 @@ const char *lttcomm_get_readable_code(enum lttcomm_return_code code)
  * Create socket from an already allocated lttcomm socket structure and init
  * sockaddr in the lttcomm sock.
  */
-LTTNG_HIDDEN
 int lttcomm_create_sock(struct lttcomm_sock *sock)
 {
        int ret, _sock_type, _sock_proto, domain;
 
-       assert(sock);
+       LTTNG_ASSERT(sock);
 
        domain = sock->sockaddr.type;
        if (domain != LTTCOMM_INET && domain != LTTCOMM_INET6) {
@@ -127,7 +124,6 @@ error:
 /*
  * Return allocated lttcomm socket structure.
  */
-LTTNG_HIDDEN
 struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto)
 {
        struct lttcomm_sock *sock;
@@ -152,13 +148,12 @@ end:
  * This is mostly useful when lttcomm_sock are passed between process where the
  * fd and ops have to be changed within the correct address space.
  */
-LTTNG_HIDDEN
 struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src)
 {
        struct lttcomm_sock *sock;
 
        /* Safety net */
-       assert(src);
+       LTTNG_ASSERT(src);
 
        sock = lttcomm_alloc_sock(src->proto);
        if (sock == NULL) {
@@ -177,12 +172,11 @@ alloc_error:
  * This is mostly useful when lttcomm_sock are passed between process where the
  * fd and ops have to be changed within the correct address space.
  */
-LTTNG_HIDDEN
 void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src)
 {
        /* Safety net */
-       assert(dst);
-       assert(src);
+       LTTNG_ASSERT(dst);
+       LTTNG_ASSERT(src);
 
        dst->proto = src->proto;
        dst->fd = src->fd;
@@ -194,15 +188,14 @@ void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src)
 /*
  * Init IPv4 sockaddr structure.
  */
-LTTNG_HIDDEN
 int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr,
                const char *ip, unsigned int port)
 {
        int ret;
 
-       assert(sockaddr);
-       assert(ip);
-       assert(port > 0 && port <= 65535);
+       LTTNG_ASSERT(sockaddr);
+       LTTNG_ASSERT(ip);
+       LTTNG_ASSERT(port > 0 && port <= 65535);
 
        memset(sockaddr, 0, sizeof(struct lttcomm_sockaddr));
 
@@ -225,15 +218,14 @@ error:
 /*
  * Init IPv6 sockaddr structure.
  */
-LTTNG_HIDDEN
 int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr,
                const char *ip, unsigned int port)
 {
        int ret;
 
-       assert(sockaddr);
-       assert(ip);
-       assert(port > 0 && port <= 65535);
+       LTTNG_ASSERT(sockaddr);
+       LTTNG_ASSERT(ip);
+       LTTNG_ASSERT(port > 0 && port <= 65535);
 
        memset(sockaddr, 0, sizeof(struct lttcomm_sockaddr));
 
@@ -254,7 +246,6 @@ error:
 /*
  * Return allocated lttcomm socket structure from lttng URI.
  */
-LTTNG_HIDDEN
 struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri)
 {
        int ret;
@@ -262,7 +253,7 @@ struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri)
        struct lttcomm_sock *sock = NULL;
 
        /* Safety net */
-       assert(uri);
+       LTTNG_ASSERT(uri);
 
        /* Check URI protocol */
        if (uri->proto == LTTNG_TCP) {
@@ -307,7 +298,6 @@ alloc_error:
 /*
  * Destroy and free lttcomm socket.
  */
-LTTNG_HIDDEN
 void lttcomm_destroy_sock(struct lttcomm_sock *sock)
 {
        free(sock);
@@ -319,7 +309,6 @@ void lttcomm_destroy_sock(struct lttcomm_sock *sock)
  *
  * On error, NULL is returned.
  */
-LTTNG_HIDDEN
 struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(struct lttng_uri *uri,
                uint32_t major, uint32_t minor)
 {
@@ -327,7 +316,7 @@ struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(struct lttng_uri *uri,
        struct lttcomm_sock *tmp_sock = NULL;
        struct lttcomm_relayd_sock *rsock = NULL;
 
-       assert(uri);
+       LTTNG_ASSERT(uri);
 
        rsock = zmalloc(sizeof(*rsock));
        if (!rsock) {
@@ -367,7 +356,6 @@ error:
 /*
  * Set socket receiving timeout.
  */
-LTTNG_HIDDEN
 int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec)
 {
        int ret;
@@ -387,7 +375,6 @@ int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec)
 /*
  * Set socket sending timeout.
  */
-LTTNG_HIDDEN
 int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec)
 {
        int ret;
@@ -404,14 +391,13 @@ int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec)
        return ret;
 }
 
-LTTNG_HIDDEN
 int lttcomm_sock_get_port(const struct lttcomm_sock *sock, uint16_t *port)
 {
-       assert(sock);
-       assert(port);
-       assert(sock->sockaddr.type == LTTCOMM_INET ||
+       LTTNG_ASSERT(sock);
+       LTTNG_ASSERT(port);
+       LTTNG_ASSERT(sock->sockaddr.type == LTTCOMM_INET ||
                        sock->sockaddr.type == LTTCOMM_INET6);
-       assert(sock->proto == LTTCOMM_SOCK_TCP ||
+       LTTNG_ASSERT(sock->proto == LTTCOMM_SOCK_TCP ||
                        sock->proto == LTTCOMM_SOCK_UDP);
 
        switch (sock->sockaddr.type) {
@@ -428,13 +414,12 @@ int lttcomm_sock_get_port(const struct lttcomm_sock *sock, uint16_t *port)
        return 0;
 }
 
-LTTNG_HIDDEN
 int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port)
 {
-       assert(sock);
-       assert(sock->sockaddr.type == LTTCOMM_INET ||
+       LTTNG_ASSERT(sock);
+       LTTNG_ASSERT(sock->sockaddr.type == LTTCOMM_INET ||
                        sock->sockaddr.type == LTTCOMM_INET6);
-       assert(sock->proto == LTTCOMM_SOCK_TCP ||
+       LTTNG_ASSERT(sock->proto == LTTCOMM_SOCK_TCP ||
                        sock->proto == LTTCOMM_SOCK_UDP);
 
        switch (sock->sockaddr.type) {
@@ -451,7 +436,6 @@ int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port)
        return 0;
 }
 
-LTTNG_HIDDEN
 void lttcomm_init(void)
 {
        const char *env;
@@ -472,7 +456,6 @@ void lttcomm_init(void)
        }
 }
 
-LTTNG_HIDDEN
 unsigned long lttcomm_get_network_timeout(void)
 {
        return network_timeout;