Cleanup: Replace all perror() uses by the PERROR macro

[lttng-tools.git] / src / bin / lttng / utils.c

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index b40465b38ebef7d987381ad82a5353524ef57a7a..ef8d0235a019229cf0c4c1b92c33a58275f8a6de 100644 (file)
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -36,6 +37,8 @@
 static const char *str_kernel = "Kernel";
 static const char *str_ust = "UST";
 static const char *str_jul = "JUL";
+static const char *str_log4j = "LOG4J";
+static const char *str_python = "Python";
 
 /*
  *  get_session_name
@@ -274,6 +277,12 @@ const char *get_domain_str(enum lttng_domain_type domain)
        case LTTNG_DOMAIN_JUL:
                str_dom = str_jul;
                break;
+       case LTTNG_DOMAIN_LOG4J:
+               str_dom = str_log4j;
+               break;
+       case LTTNG_DOMAIN_PYTHON:
+               str_dom = str_python;
+               break;
        default:
                /* Should not have an unknown domain or else define it. */
                assert(0);
@@ -312,14 +321,14 @@ int spawn_relayd(const char *pathname, int port)
                if (errno == ENOENT) {
                        ERR("No relayd found. Use --relayd-path.");
                } else {
-                       perror("execlp");
+                       PERROR("execlp");
                }
                kill(getppid(), SIGTERM);       /* wake parent */
                exit(EXIT_FAILURE);
        } else if (pid > 0) {
                goto end;
        } else {
-               perror("fork");
+               PERROR("fork");
                ret = -1;
                goto end;
        }
@@ -340,15 +349,17 @@ int check_relayd(void)
 
        fd = socket(AF_INET, SOCK_STREAM, 0);
        if (fd < 0) {
-               perror("socket check relayd");
-               goto error;
+               PERROR("socket check relayd");
+               ret = -1;
+               goto error_socket;
        }
 
        sin.sin_family = AF_INET;
        sin.sin_port = htons(DEFAULT_NETWORK_VIEWER_PORT);
        ret = inet_pton(sin.sin_family, "127.0.0.1", &sin.sin_addr);
        if (ret < 1) {
-               perror("inet_pton check relayd");
+               PERROR("inet_pton check relayd");
+               ret = -1;
                goto error;
        }
 
@@ -365,8 +376,10 @@ int check_relayd(void)
                ret = 1;
        }
 
-       return ret;
-
 error:
-       return -1;
+       if (close(fd) < 0) {
+               PERROR("close relayd fd");
+       }
+error_socket:
+       return ret;
 }