projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Relayd add_stream command handle tracefile rotation
[lttng-tools.git]
/
src
/
common
/
uri.c
diff --git
a/src/common/uri.c
b/src/common/uri.c
index 3550af9755d22c5c0449cc2f11c8cb2657a4d6df..740a6d5c50fc6d7fad8e027bb024d9ff9527f8c5 100644
(file)
--- a/
src/common/uri.c
+++ b/
src/common/uri.c
@@
-140,7
+140,7
@@
error:
/*
* Build a string URL from a lttng_uri object.
*/
/*
* Build a string URL from a lttng_uri object.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
{
int ipver, ret;
int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
{
int ipver, ret;
@@
-177,7
+177,7
@@
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.
*/
-__attribute__((visibility("hidden")))
+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));
@@
-186,19
+186,16
@@
int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
/*
* Free URI memory.
*/
/*
* Free URI memory.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
void uri_free(struct lttng_uri *uri)
{
void uri_free(struct lttng_uri *uri)
{
- /* Safety check */
- if (uri != NULL) {
- free(uri);
- }
+ free(uri);
}
/*
* Return an allocated URI.
*/
}
/*
* Return an allocated URI.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
struct lttng_uri *uri_create(void)
{
struct lttng_uri *uri;
struct lttng_uri *uri_create(void)
{
struct lttng_uri *uri;
@@
-227,7
+224,7
@@
struct lttng_uri *uri_create(void)
* 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.
*/
-__attribute__((visibility("hidden")))
+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;
@@
-342,7
+339,6
@@
ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
* so we can define the control and data port.
*/
while (*purl == ':') {
* so we can define the control and data port.
*/
while (*purl == ':') {
- int port;
const char *port_b, *port_e;
char *port_f;
const char *port_b, *port_e;
char *port_f;
@@
-369,6
+365,8
@@
ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
port_e = purl;
if (port_b != port_e) {
port_e = purl;
if (port_b != port_e) {
+ int port;
+
port_f = utils_strdupdelim(port_b, port_e);
if (port_f == NULL) {
goto free_error;
port_f = utils_strdupdelim(port_b, port_e);
if (port_f == NULL) {
goto free_error;
This page took
0.023816 seconds
and
4
git commands to generate.