projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fix: Missing message in LTTNG_DEPRECATED invocation
[lttng-tools.git]
/
src
/
common
/
uri.c
diff --git
a/src/common/uri.c
b/src/common/uri.c
index a774cb3cb70567d5c96f57e1b6878fb6d4c0d7ec..fef21b38da19639020460a498e318165d743d6ea 100644
(file)
--- a/
src/common/uri.c
+++ b/
src/common/uri.c
@@
-6,7
+6,6
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <assert.h>
#include <arpa/inet.h>
#include <common/compat/netdb.h>
#include <stdlib.h>
#include <arpa/inet.h>
#include <common/compat/netdb.h>
#include <stdlib.h>
@@
-98,8
+97,8
@@
static int set_ip_address(const char *addr, int af, char *dst, size_t size)
unsigned char buf[sizeof(struct in6_addr)];
struct hostent *record;
unsigned char buf[sizeof(struct in6_addr)];
struct hostent *record;
-
assert
(addr);
-
assert
(dst);
+
LTTNG_ASSERT
(addr);
+
LTTNG_ASSERT
(dst);
memset(dst, 0, size);
memset(dst, 0, size);
@@
-183,8
+182,8
@@
static int compare_destination(struct lttng_uri *ctrl, struct lttng_uri *data)
{
int ret;
{
int ret;
-
assert
(ctrl);
-
assert
(data);
+
LTTNG_ASSERT
(ctrl);
+
LTTNG_ASSERT
(data);
switch (ctrl->dtype) {
case LTTNG_DST_IPV4:
switch (ctrl->dtype) {
case LTTNG_DST_IPV4:
@@
-204,15
+203,14
@@
static int compare_destination(struct lttng_uri *ctrl, struct lttng_uri *data)
/*
* Build a string URL from a lttng_uri object.
*/
/*
* Build a string URL from a lttng_uri object.
*/
-LTTNG_HIDDEN
int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
{
int ipver, ret;
const char *addr;
char proto[5], port[7];
int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
{
int ipver, ret;
const char *addr;
char proto[5], port[7];
-
assert
(uri);
-
assert
(dst);
+
LTTNG_ASSERT
(uri);
+
LTTNG_ASSERT
(dst);
if (uri->dtype == LTTNG_DST_PATH) {
ipver = 0;
if (uri->dtype == LTTNG_DST_PATH) {
ipver = 0;
@@
-241,7
+239,6
@@
int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
*
* Return 0 if equal else 1.
*/
*
* Return 0 if equal else 1.
*/
-LTTNG_HIDDEN
int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
{
return memcmp(uri1, uri2, sizeof(struct lttng_uri));
int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
{
return memcmp(uri1, uri2, sizeof(struct lttng_uri));
@@
-250,7
+247,6
@@
int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
/*
* Free URI memory.
*/
/*
* Free URI memory.
*/
-LTTNG_HIDDEN
void uri_free(struct lttng_uri *uri)
{
free(uri);
void uri_free(struct lttng_uri *uri)
{
free(uri);
@@
-272,7
+268,6
@@
void uri_free(struct lttng_uri *uri)
* This code was originally licensed GPLv2 so we acknolwedge the Free Software
* Foundation here for the work and to make sure we are compliant with it.
*/
* This code was originally licensed GPLv2 so we acknolwedge the Free Software
* Foundation here for the work and to make sure we are compliant with it.
*/
-LTTNG_HIDDEN
ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
{
int ret, i = 0;
ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
{
int ret, i = 0;
@@
-514,7
+509,7
@@
end:
free(addr_f);
*uris = tmp_uris;
free(addr_f);
*uris = tmp_uris;
-
assert
(size == 1 || size == 2);
+
LTTNG_ASSERT
(size == 1 || size == 2);
return size;
free_error:
return size;
free_error:
@@
-528,7
+523,6
@@
error:
* Parse a string URL and creates URI(s) returning the size of the populated
* array.
*/
* Parse a string URL and creates URI(s) returning the size of the populated
* array.
*/
-LTTNG_HIDDEN
ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
struct lttng_uri **uris)
{
ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
struct lttng_uri **uris)
{
@@
-579,7
+573,7
@@
ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
}
/* 1 and 2 are the only expected values on success. */
}
/* 1 and 2 are the only expected values on success. */
-
assert
(ctrl_uri_count == 1 || ctrl_uri_count == 2);
+
LTTNG_ASSERT
(ctrl_uri_count == 1 || ctrl_uri_count == 2);
/* At this point, we know there is at least one URI in the array */
set_default_uri_attr(&ctrl_uris[0], LTTNG_STREAM_CONTROL);
/* At this point, we know there is at least one URI in the array */
set_default_uri_attr(&ctrl_uris[0], LTTNG_STREAM_CONTROL);
@@
-620,7
+614,7
@@
ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
goto error;
} else {
/* 1 and 2 are the only expected values on success. */
goto error;
} else {
/* 1 and 2 are the only expected values on success. */
-
assert
(data_uri_count == 1);
+
LTTNG_ASSERT
(data_uri_count == 1);
}
set_default_uri_attr(&data_uris[0], LTTNG_STREAM_DATA);
}
set_default_uri_attr(&data_uris[0], LTTNG_STREAM_DATA);
This page took
0.02579 seconds
and
4
git commands to generate.