summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2011-01-04 13:59:52 +0000
committerAnand V. Avati <avati@dev.gluster.com>2011-01-06 11:09:05 -0800
commitcfc387b0af174dfe303cdb3ef3ccfba979ef75ac (patch)
tree41930a4dbdcb1fd2759817e1f6c793e0dcdd723a
parentcbba1c3f55a7f73791310085b5d9bc65008f0b9b (diff)
logging: fix format warnings
Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 2211 ((re)introduce warnings for format string/parameter mismatch) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2211
-rw-r--r--libglusterfs/src/xlator.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c26
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c2
3 files changed, 15 insertions, 15 deletions
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c
index 986b533df..37ea81628 100644
--- a/libglusterfs/src/xlator.c
+++ b/libglusterfs/src/xlator.c
@@ -1014,7 +1014,7 @@ xlator_validate_rec (xlator_t *xlator, char **op_errstr)
if (xlator->validate_options) {
if (xlator->validate_options (xlator, xlator->options,
op_errstr)) {
- gf_log ("", GF_LOG_DEBUG, *op_errstr);
+ gf_log ("", GF_LOG_DEBUG, "%s", *op_errstr);
return -1;
}
gf_log (xlator->name, GF_LOG_DEBUG, "Validated option");
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index f0336c7b1..24407e8be 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -373,7 +373,7 @@ glusterd_op_stage_create_volume (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (exists) {
snprintf (msg, sizeof (msg), "Volume %s already exists",
volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -585,7 +585,7 @@ glusterd_op_stage_stop_volume (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (!exists) {
snprintf (msg, sizeof (msg), "Volume %s does not exist", volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -639,7 +639,7 @@ glusterd_op_stage_delete_volume (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (!exists) {
snprintf (msg, sizeof (msg), "Volume %s does not exist",
volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -658,7 +658,7 @@ glusterd_op_stage_delete_volume (gd1_mgmt_stage_op_req *req, char **op_errstr)
snprintf (msg, sizeof (msg), "Volume %s has been started."
"Volume needs to be stopped before deletion.",
volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -1180,7 +1180,7 @@ glusterd_op_stage_log_filename (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (!exists || ret) {
snprintf (msg, sizeof (msg), "Volume %s does not exist",
volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -1196,7 +1196,7 @@ glusterd_op_stage_log_filename (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (ret) {
snprintf (msg, sizeof (msg), "Incorrect brick %s "
"for volume %s", brick, volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
goto out;
}
@@ -1212,7 +1212,7 @@ glusterd_op_stage_log_filename (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (ret) {
snprintf (msg, sizeof (msg), "Failed to get hostname, error:%s",
strerror (errno));
- gf_log ("glusterd", GF_LOG_ERROR, "%s");
+ gf_log ("glusterd", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
goto out;
}
@@ -1262,7 +1262,7 @@ glusterd_op_stage_log_rotate (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (!exists) {
snprintf (msg, sizeof (msg), "Volume %s does not exist",
volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -1273,7 +1273,7 @@ glusterd_op_stage_log_rotate (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (ret) {
snprintf (msg, sizeof (msg), "Volume %s needs to be started before"
" log rotate.", volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -1289,7 +1289,7 @@ glusterd_op_stage_log_rotate (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (ret) {
snprintf (msg, sizeof (msg), "Incorrect brick %s "
"for volume %s", brick, volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
goto out;
}
@@ -1348,7 +1348,7 @@ glusterd_op_stage_set_volume (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (!exists) {
snprintf (errstr, sizeof (errstr), "Volume %s does not exist",
volname);
- gf_log ("", GF_LOG_ERROR, errstr);
+ gf_log ("", GF_LOG_ERROR, "%s", errstr);
*op_errstr = gf_strdup (errstr);
ret = -1;
goto out;
@@ -1505,7 +1505,7 @@ glusterd_op_stage_reset_volume (gd1_mgmt_stage_op_req *req, char **op_errstr)
if (!exists) {
snprintf (msg, sizeof (msg), "Volume %s does not "
"exist", volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
ret = -1;
goto out;
@@ -4095,7 +4095,7 @@ glusterd_op_sync_volume (gd1_mgmt_stage_op_req *req, char **op_errstr,
if (ret) {
snprintf (msg, sizeof (msg), "Volume %s does not exist",
volname);
- gf_log ("", GF_LOG_ERROR, msg);
+ gf_log ("", GF_LOG_ERROR, "%s", msg);
*op_errstr = gf_strdup (msg);
goto out;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index e0dc706b2..1794348f2 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -2336,7 +2336,7 @@ brick_validation:
if (!ret) {
snprintf(op_errstr, len, "Brick: %s already in use",
brick);
- gf_log ("", GF_LOG_ERROR, op_errstr);
+ gf_log ("", GF_LOG_ERROR, "%s", op_errstr);
ret = -1;
goto out;
} else {