summaryrefslogtreecommitdiffstats
path: root/cli/src/cli.c
diff options
context:
space:
mode:
authorAnand Avati <avati@gluster.com>2010-07-21 04:23:15 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-07-21 03:00:26 -0700
commit7ad75da5e8cb57336380f688650547275b939c3a (patch)
tree35eb77c9cccafb3929e96c04277875d25afc6214 /cli/src/cli.c
parent066778ac7994bb574bd49281e8b225c3cd378f44 (diff)
cli: fix consistent behaviour with newlines in cli_out()
Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'cli/src/cli.c')
-rw-r--r--cli/src/cli.c6
1 files changed, 5 insertions, 1 deletions
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 *
tmp_str = strdup (str);
if (str == NULL || delim == NULL || match == NULL || tmp_str == NULL) {
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
ret = -1;
goto out;
}
@@ -557,7 +557,7 @@ gf_volume_name_validate (const char *volume_name)
const char *vname = NULL;
if (volume_name == NULL) {
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
return -1;
}
@@ -586,7 +586,7 @@ gf_string2time (const char *str, uint32_t *n)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -641,7 +641,7 @@ gf_string2percent (const char *str, uint32_t *n)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -694,7 +694,7 @@ _gf_string2long (const char *str, long *n, int base)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -734,7 +734,7 @@ _gf_string2ulong (const char *str, unsigned long *n, int base)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -789,7 +789,7 @@ _gf_string2uint (const char *str, unsigned int *n, int base)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -842,7 +842,7 @@ _gf_string2double (const char *str, double *n)
int old_errno = 0;
if (str == NULL || n == NULL) {
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -877,7 +877,7 @@ _gf_string2longlong (const char *str, long long *n, int base)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -917,7 +917,7 @@ _gf_string2ulonglong (const char *str, unsigned long long *n, int base)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -1308,7 +1308,7 @@ gf_string2bytesize (const char *str, uint64_t *n)
if (str == NULL || n == NULL)
{
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
errno = EINVAL;
return -1;
}
@@ -1419,7 +1419,7 @@ int
gf_string2boolean (const char *str, gf_boolean_t *b)
{
if (str == NULL) {
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
return -1;
}
@@ -1666,7 +1666,7 @@ valid_internet_address (char *address)
int length = 0;
if (address == NULL) {
- gf_log_callingfn (THIS->name, GF_LOG_WARNING, "arguement invalid");
+ gf_log_callingfn (THIS->name, GF_LOG_WARNING, "argument invalid");
goto out;
}