diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-cmd-probe.c | 12 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 2 | ||||
| -rw-r--r-- | cli/src/cli-cmd.c | 4 | ||||
| -rw-r--r-- | cli/src/cli.c | 6 | ||||
| -rw-r--r-- | cli/src/cli3_1-cops.c | 8 | ||||
| -rw-r--r-- | cli/src/input.c | 2 |
6 files changed, 18 insertions, 16 deletions
diff --git a/cli/src/cli-cmd-probe.c b/cli/src/cli-cmd-probe.c index 9f7a1da7758..7d1c6eee7da 100644 --- a/cli/src/cli-cmd-probe.c +++ b/cli/src/cli-cmd-probe.c @@ -40,19 +40,19 @@ extern rpc_clnt_prog_t *cli_rpc_prog; void cli_cmd_probe_usage () { - cli_out ("Usage: probe <hostname> [port]\n"); + cli_out ("Usage: probe <hostname> [port]"); } void cli_cmd_deprobe_usage () { - cli_out ("Usage: detach <hostname> [port]\n"); + cli_out ("Usage: detach <hostname> [port]"); } void cli_cmd_peer_status_usage () { - cli_out ("Usage: peer status <hostname> [port]\n"); + cli_out ("Usage: peer status <hostname> [port]"); } int @@ -95,7 +95,7 @@ cli_cmd_probe_cbk (struct cli_state *state, struct cli_cmd_word *word, out: if (ret) - cli_out ("Probe failed\n"); + cli_out ("Probe failed"); return ret; } @@ -138,7 +138,7 @@ cli_cmd_deprobe_cbk (struct cli_state *state, struct cli_cmd_word *word, out: if (ret) - cli_out ("Detach failed\n"); + cli_out ("Detach failed"); return ret; } @@ -168,7 +168,7 @@ cli_cmd_peer_status_cbk (struct cli_state *state, struct cli_cmd_word *word, out: if (ret) - cli_out ("Command Execution failed\n"); + cli_out ("Command Execution failed"); return ret; } diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 7aafddccc4c..d3960d06575 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -426,7 +426,7 @@ cli_cmd_volume_set_transport_cbk (struct cli_state *state, struct cli_cmd_word *word, const char **words, int wordcount) { - cli_out ("volume set-transport not implemented\n"); + cli_out ("volume set-transport not implemented"); return 0; } diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index 24c7dea0e00..4ef8e86cd2a 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -63,13 +63,13 @@ cli_cmd_process (struct cli_state *state, int argc, char **argv) } if (!word) { - cli_out ("unrecognized word: %s (position %d)\n", + cli_out ("unrecognized word: %s (position %d)", argv[i], i); return -1; } if (!word->cbkfn) { - cli_out ("unrecognized command\n"); + cli_out ("unrecognized command"); return -1; } diff --git a/cli/src/cli.c b/cli/src/cli.c index 5bf32ec894c..b31e9feda45 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -368,6 +368,7 @@ cli_out (const char *fmt, ...) { struct cli_state *state = NULL; va_list ap; + int ret = 0; state = global_state; @@ -378,7 +379,10 @@ cli_out (const char *fmt, ...) return cli_rl_out(state, fmt, ap); #endif - return vprintf (fmt, ap); + ret = vprintf (fmt, ap); + printf ("\n"); + + return ret; } struct rpc_clnt * diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c index 1f9feeac0b8..dc9241bc60a 100644 --- a/cli/src/cli3_1-cops.c +++ b/cli/src/cli3_1-cops.c @@ -178,7 +178,7 @@ gf_cli3_1_list_friends_cbk (struct rpc_req *req, struct iovec *iov, if (ret) goto out; - cli_out ("hostname:%s, port:%d, uuid:%s, state:%d\n", + cli_out ("hostname:%s, port:%d, uuid:%s, state:%d", hostname_buf, port, uuid_buf, state); i++; } @@ -192,7 +192,7 @@ gf_cli3_1_list_friends_cbk (struct rpc_req *req, struct iovec *iov, out: if (ret) - cli_out ("Command Execution Failed\n"); + cli_out ("Command Execution Failed"); if (dict) dict_destroy (dict); @@ -285,7 +285,7 @@ gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, goto out; cli_out ("Volume Name:%s, type:%d, status:%d," - "brick_count: %d\n", + "brick_count: %d", volname, type, status, brick_count); i++; } @@ -300,7 +300,7 @@ gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, out: cli_cmd_broadcast_response (); if (ret) - cli_out ("Command Execution Failed\n"); + cli_out ("Command Execution Failed"); if (dict) dict_destroy (dict); diff --git a/cli/src/input.c b/cli/src/input.c index 62bd8c4063d..314058e052a 100644 --- a/cli/src/input.c +++ b/cli/src/input.c @@ -33,8 +33,6 @@ #define CMDBUFSIZ 1024 -#define cli_out(fmt...) fprintf (stdout, ##fmt) - void * cli_batch (void *d) { |