License header fixes

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

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index a637a904244979b5f8b0a310e458684a03162d19..32571bddf36cfc94483eaf0f180694ac21a99fae 100644 (file)
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -2,19 +2,18 @@
  * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -49,17 +48,17 @@
 
 #include "lttng-consumerd.h"
 
-/* TODO : support UST (all direct kernctl accesses). */
+/* TODO : support UST (all direct kernel-ctl accesses). */
 
 /* the two threads (receive fd and poll) */
 static pthread_t threads[2];
 
-/* to count the number of time the user pressed ctrl+c */
+/* to count the number of times the user pressed ctrl+c */
 static int sigintcount = 0;
 
 /* Argument variables */
-int opt_quiet;
-int opt_verbose;
+int lttng_opt_quiet;    /* not static in error.h */
+int lttng_opt_verbose;  /* not static in error.h */
 static int opt_daemon;
 static const char *progname;
 static char command_sock_path[PATH_MAX]; /* Global command socket path */
@@ -119,28 +118,28 @@ static int set_signal_handler(void)
 }
 
 /*
- * usage function on stderr
+ * Usage function on stream file.
  */
-static void usage(void)
+static void usage(FILE *fp)
 {
-       fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname);
-       fprintf(stderr, "  -h, --help                         "
+       fprintf(fp, "Usage: %s OPTIONS\n\nOptions:\n", progname);
+       fprintf(fp, "  -h, --help                         "
                        "Display this usage.\n");
-       fprintf(stderr, "  -c, --consumerd-cmd-sock PATH     "
+       fprintf(fp, "  -c, --consumerd-cmd-sock PATH     "
                        "Specify path for the command socket\n");
-       fprintf(stderr, "  -e, --consumerd-err-sock PATH     "
+       fprintf(fp, "  -e, --consumerd-err-sock PATH     "
                        "Specify path for the error socket\n");
-       fprintf(stderr, "  -d, --daemonize                    "
+       fprintf(fp, "  -d, --daemonize                    "
                        "Start as a daemon.\n");
-       fprintf(stderr, "  -q, --quiet                        "
+       fprintf(fp, "  -q, --quiet                        "
                        "No output at all.\n");
-       fprintf(stderr, "  -v, --verbose                      "
+       fprintf(fp, "  -v, --verbose                      "
                        "Verbose mode. Activate DBG() macro.\n");
-       fprintf(stderr, "  -V, --version                      "
+       fprintf(fp, "  -V, --version                      "
                        "Show version number.\n");
-       fprintf(stderr, "  -k, --kernel                       "
+       fprintf(fp, "  -k, --kernel                       "
                        "Consumer kernel buffers (default).\n");
-       fprintf(stderr, "  -u, --ust                          "
+       fprintf(fp, "  -u, --ust                          "
                        "Consumer UST buffers.%s\n",
 #ifdef HAVE_LIBLTTNG_UST_CTL
                        ""
@@ -196,13 +195,13 @@ static void parse_args(int argc, char **argv)
                        opt_daemon = 1;
                        break;
                case 'h':
-                       usage();
-                       exit(EXIT_FAILURE);
+                       usage(stdout);
+                       exit(EXIT_SUCCESS);
                case 'q':
-                       opt_quiet = 1;
+                       lttng_opt_quiet = 1;
                        break;
                case 'v':
-                       opt_verbose = 1;
+                       lttng_opt_verbose = 1;
                        break;
                case 'V':
                        fprintf(stdout, "%s\n", VERSION);
@@ -222,7 +221,7 @@ static void parse_args(int argc, char **argv)
                        break;
 #endif
                default:
-                       usage();
+                       usage(stderr);
                        exit(EXIT_FAILURE);
                }
        }
@@ -310,7 +309,7 @@ int main(int argc, char **argv)
        ret = lttcomm_connect_unix_sock(error_sock_path);
        /* not a fatal error, but all communication with lttng-sessiond will fail */
        if (ret < 0) {
-               WARN("Cannot connect to error socket, is lttng-sessiond started ?");
+               WARN("Cannot connect to error socket (is lttng-sessiond started?)");
        }
        lttng_consumer_set_error_sock(ctx, ret);