summaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/src/cli-cmd-parser.c4
-rw-r--r--cli/src/cli-xml-output.c41
-rw-r--r--cli/src/cli.c5
3 files changed, 26 insertions, 24 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 69b94863c15..9439724f3df 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -2834,8 +2834,8 @@ cli_cmd_volume_top_parse (const char **words, int wordcount,
int32_t list_cnt = -1;
int index = 0;
int perf = 0;
- int32_t blk_size = 0;
- uint32_t count = 0;
+ int32_t blk_size = 0;
+ int count = 0;
gf_boolean_t nfs = _gf_false;
char *delimiter = NULL;
char *opwords[] = { "open", "read", "write", "opendir",
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
index f7ae0578b15..0f501782f25 100644
--- a/cli/src/cli-xml-output.c
+++ b/cli/src/cli-xml-output.c
@@ -6258,37 +6258,37 @@ cli_quota_xml_output (cli_local_t *local, char *path, int64_t hl_str,
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"path",
- "%s", path);
+ (xmlChar *)"path",
+ "%s", path);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"hard_limit",
+ (xmlChar *)"hard_limit",
!limit_set ? "N/A" :
- "%"PRIu64, hl_str);
+ "%"PRId64, hl_str);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"soft_limit_percent",
+ (xmlChar *)"soft_limit_percent",
!limit_set ? "N/A" :
"%s", sl_final);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"soft_limit_value",
+ (xmlChar *)"soft_limit_value",
!limit_set ? "N/A" :
- "%"PRIu64, sl_num);
+ "%"PRId64, sl_num);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
(xmlChar *)"used_space",
- "%"PRIu64, used);
+ "%"PRId64, used);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
(xmlChar *)"avail_space",
!limit_set ? "N/A" :
- "%"PRIu64, avail);
+ "%"PRId64, avail);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
@@ -6327,51 +6327,52 @@ cli_quota_object_xml_output (cli_local_t *local, char *path, char *sl_str,
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"path",
+ (xmlChar *)"path",
"%s", path);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"hard_limit",
+ (xmlChar *)"hard_limit",
!limit_set ? "N/A" :
- "%"PRIu64, limits->hl);
+ "%"PRId64, limits->hl);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"soft_limit_percent",
+ (xmlChar *)"soft_limit_percent",
!limit_set ? "N/A" :
"%s", sl_str);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"soft_limit_value",
+ (xmlChar *)"soft_limit_value",
!limit_set ? "N/A" :
"%"PRIu64, sl_val);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"file_count",
- "%"PRIu64,
+ (xmlChar *)"file_count",
+ "%"PRId64,
used_space->file_count);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"dir_count", "%"PRIu64,
+ (xmlChar *)"dir_count",
+ "%"PRIu64,
used_space->dir_count);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"available",
+ (xmlChar *)"available",
!limit_set ? "N/A" :
- "%"PRIu64, avail);
+ "%"PRId64, avail);
XML_RET_CHECK_AND_GOTO (ret, out);
ret = xmlTextWriterWriteFormatElement (local->writer,
- (xmlChar *)"sl_exceeded",
+ (xmlChar *)"sl_exceeded",
!limit_set ? "N/A" :
"%s", sl);
XML_RET_CHECK_AND_GOTO (ret, out);
diff --git a/cli/src/cli.c b/cli/src/cli.c
index 118a94f0b41..fbf3e89fb78 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -363,9 +363,10 @@ cli_opt_parse (char *opt, struct cli_state *state)
oarg = strtail (opt, "log-level=");
if (oarg) {
- state->log_level = glusterd_check_log_level(oarg);
- if (state->log_level == -1)
+ int log_level = glusterd_check_log_level(oarg);
+ if (log_level == -1)
return -1;
+ state->log_level = (gf_loglevel_t) log_level;
return 0;
}