Rename -v / --verbose parameter to -d / --debug.

ChangeLog

@@ -1,4 +1,7 @@
 |-----------------------------------------------------------------------|
+xxxx-xx-xx : Version next
+ * Rename -v / --verbose parameter to -d / --debug.
+
 2014-11-27 : Version 0.2
  * Fix port routing. Previously it was reversed and incorrect.
  * Fix command parsing of multiple commands comming in one packet.

README

@@ -81,7 +81,7 @@ Main options:
  -p --port <port_number>    | Set device port (default: 9990).
 
 Misc options:
- -v --verbose               | Increase logging verbosity.
+ -d --debug                 | Increase logging verbosity.
  -q --quiet                 | Suppress warnings.
  -h --help                  | Show help screen.
  -V --version               | Show program version.
@@ -157,7 +157,7 @@ If you think you have found bug in videohubctrl, please report it to
 the e-mail listed in Contact section (see below) of this README file.
 
 When reporting bugs, please send the whole output that videohubctrl
-generated (preferably by using --verbose option) and also the full
+generated (preferably by using --debug option) and also the full
 command line which you used and describe what you think the videohubctrl
 does wrong.
 

cmd.c

@@ -164,9 +164,9 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 		return false;
 	}
 
-	v("verbose: Got '%s' command.\n", v->txt);
-	if (verbose > 1)
-		v("----\n%s\n----\n", cmd);
+	d("debug: Got '%s' command.\n", v->txt);
+	if (debug > 1)
+		d("----\n%s\n----\n", cmd);
 
 	bool cmd_response = false;
 	char *p, *cmd_data = xstrdup( cmd + strlen(v->txt) + 2 ); // +2 to compensate for :\n at the end of the command

data.h

@@ -52,13 +52,13 @@ struct videohub_data {
 	struct output_desc		outputs[MAX_OUTPUTS];
 };
 
-extern int verbose;
+extern int debug;
 extern int quiet;
 
-#define v(fmt, arguments...) \
+#define d(fmt, arguments...) \
 	do { \
-		if (verbose) \
-			printf("verbose: " fmt, ## arguments); \
+		if (debug) \
+			printf("debug: " fmt, ## arguments); \
 	} while(0)
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

net.c

@@ -53,7 +53,7 @@ int connect_client(int socktype, const char *hostname, const char *service) {
 	hints.ai_family = ai_family;
 	hints.ai_socktype = socktype;
 
-	v("Connecting to server %s port %s\n", hostname, service);
+	d("Connecting to server %s port %s\n", hostname, service);
 
 	n = getaddrinfo(hostname, service, &hints, &res);
 
@@ -94,7 +94,7 @@ int connect_client(int socktype, const char *hostname, const char *service) {
 		setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int));
 	}
 
-	v("Connected to server %s port %s (addr=%s fd=%d).\n",
+	d("Connected to server %s port %s (addr=%s fd=%d).\n",
 		hostname, service, str_addr, sockfd);
 
 	set_sock_nonblock(sockfd);

videohubctrl.c

@@ -22,7 +22,7 @@
 
 #include "libfuncs/libfuncs.h"
 
-int verbose;
+int debug;
 int quiet;
 
 static struct videohub_data maindata;
@@ -31,13 +31,13 @@ static int show_monitor = 0;
 
 static const char *program_id = PROGRAM_NAME " Version: " VERSION " Git: " GIT_VER;
 
-static const char short_options[] = "s:p:qvhVim";
+static const char short_options[] = "s:p:qdhVim";
 
 static const struct option long_options[] = {
 	{ "host",				required_argument, NULL, 's' },
 	{ "port",				required_argument, NULL, 'p' },
 	{ "quiet",				no_argument,       NULL, 'q' },
-	{ "verbose",			no_argument,       NULL, 'v' },
+	{ "debug",				no_argument,       NULL, 'd' },
 	{ "help",				no_argument,       NULL, 'h' },
 	{ "version",			no_argument,       NULL, 'V' },
 	{ "info",				no_argument,       NULL, 'i' },
@@ -54,7 +54,7 @@ static void show_help(struct videohub_data *data) {
 	printf(" -p --port <port_number>    | Set device port (default: 9990).\n");
 	printf("\n");
 	printf("Misc options:\n");
-	printf(" -v --verbose               | Increase logging verbosity.\n");
+	printf(" -d --debug                 | Increase logging verbosity.\n");
 	printf(" -q --quiet                 | Suppress warnings.\n");
 	printf(" -h --help                  | Show help screen.\n");
 	printf(" -V --version               | Show program version.\n");
@@ -77,9 +77,9 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 			case 'p': // --port
 				data->dev_port = optarg;
 				break;
-			case 'v': // --verbose
-				verbose++;
-				if (verbose)
+			case 'd': // --debug
+				debug++;
+				if (debug)
 					quiet = 0; // Disable quiet
 				break;
 			case 'q': // --quiet
@@ -110,7 +110,7 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 		exit(EXIT_FAILURE);
 	}
 
-	v("Device address: %s:%s\n", data->dev_host, data->dev_port);
+	d("Device address: %s:%s\n", data->dev_host, data->dev_port);
 }
 
 static void print_device_desc(struct device_desc *d) {