summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2012-04-10 17:12:05 -0400
committerAnand Avati <avati@redhat.com>2012-04-10 14:37:29 -0700
commit7f5c1e5777d77570be0f9698de39d2f1905c509f (patch)
tree15310f83198e38519ce5483199f70e42266d9b26 /xlators
parent4bb82b2c779bb984a980e371c3119254cf1cb0f8 (diff)
Fix compiler warnings and typos from Debian build.
Mostly to do with "-Werror=format-security" being buggy, but while we're here we might as well fix some typos and such. Credit goes to Patrick Matthäi <pmatthaei@debian.org> for pointing these out. Change-Id: Ia32d1111d7c10b1f213df85d86b17a1326248ffd BUG: 811387 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.com/3117 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-algorithm.c2
-rw-r--r--xlators/cluster/afr/src/afr-self-heald.c2
-rw-r--r--xlators/features/marker/utils/syncdaemon/resource.py2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-ops.c2
-rw-r--r--xlators/protocol/server/src/server-handshake.c2
-rw-r--r--xlators/storage/posix/src/posix.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-algorithm.c b/xlators/cluster/afr/src/afr-self-heal-algorithm.c
index 99a2108..d340acc 100644
--- a/xlators/cluster/afr/src/afr-self-heal-algorithm.c
+++ b/xlators/cluster/afr/src/afr-self-heal-algorithm.c
@@ -174,7 +174,7 @@ sh_loop_lock_success (call_frame_t *loop_frame, xlator_t *this)
sh_loop_finish (loop_sh->old_loop_frame, this);
loop_sh->old_loop_frame = NULL;
- gf_log (this->name, GF_LOG_DEBUG, "Aquired lock for range %"PRIu64
+ gf_log (this->name, GF_LOG_DEBUG, "Acquired lock for range %"PRIu64
" %"PRIu64, loop_sh->offset, loop_sh->block_size);
loop_sh->data_lock_held = _gf_true;
loop_sh->sh_data_algo_start (loop_frame, this);
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c
index 3dd268e..9fc3c96 100644
--- a/xlators/cluster/afr/src/afr-self-heald.c
+++ b/xlators/cluster/afr/src/afr-self-heald.c
@@ -395,7 +395,7 @@ _crawl_proceed (xlator_t *this, int child, int crawl_flags, char **reason)
shd = &priv->shd;
if (!shd->enabled) {
msg = "Self-heal daemon is not enabled";
- gf_log (this->name, GF_LOG_ERROR, msg);
+ gf_log (this->name, GF_LOG_ERROR, "%s", msg);
goto out;
}
if (!priv->child_up[child]) {
diff --git a/xlators/features/marker/utils/syncdaemon/resource.py b/xlators/features/marker/utils/syncdaemon/resource.py
index 7fcc539..c850e1f 100644
--- a/xlators/features/marker/utils/syncdaemon/resource.py
+++ b/xlators/features/marker/utils/syncdaemon/resource.py
@@ -108,7 +108,7 @@ Xattr = _MetaXattr()
class Popen(subprocess.Popen):
"""customized subclass of subprocess.Popen with a ring
- buffer for children error ouput"""
+ buffer for children error output"""
@classmethod
def init_errhandler(cls):
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 71616eb..77bc472 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -4398,7 +4398,7 @@ check_xattr:
if (uuid_compare (old_uuid, uuid)) {
uuid_utoa_r (old_uuid, old_uuid_buf);
gf_log (THIS->name, GF_LOG_WARNING,
- "%s: mismatching volume-id (%s) recieved. "
+ "%s: mismatching volume-id (%s) received. "
"already is a part of volume %s ",
path, uuid_utoa (uuid), old_uuid_buf);
snprintf (msg, sizeof (msg), "'%s:%s' has been part of "
@@ -4962,7 +4962,7 @@ glusterd_set_dump_options (char *dumpoptions_path, char *options,
goto out;
}
dup_options = gf_strdup (options);
- gf_log ("", GF_LOG_INFO, "Recieved following statedump options: %s",
+ gf_log ("", GF_LOG_INFO, "Received following statedump options: %s",
dup_options);
option = strtok_r (dup_options, " ", &tmpptr);
while (option) {
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index c5b4144..9b8daa1 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -3422,7 +3422,7 @@ done:
ret = -1;
snprintf (msg, sizeof (msg), "%s off and %s on is not "
"valid configuration", wb_key, el_key);
- gf_log ("glusterd", GF_LOG_ERROR, msg);
+ gf_log ("glusterd", GF_LOG_ERROR, "%s", msg);
if (op_errstr)
*op_errstr = gf_strdup (msg);
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index 0a076e7..b30c463 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -579,7 +579,7 @@ glusterd_handle_cli_statedump_volume (rpcsvc_request_t *req)
}
- gf_log ("glusterd", GF_LOG_INFO, "Recieved statedump request for "
+ gf_log ("glusterd", GF_LOG_INFO, "Received statedump request for "
"volume %s with options %s", volname, options);
ret = glusterd_op_begin (req, GD_OP_STATEDUMP_VOLUME, dict);
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index 8478a27..920a73f 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -414,7 +414,7 @@ server_setvolume (rpcsvc_request_t *req)
ret = dict_get_uint32 (params, "clnt-lk-version", &lk_version);
if (ret < 0) {
ret = dict_set_str (reply, "ERROR",
- "lock state verison not supplied");
+ "lock state version not supplied");
if (ret < 0)
gf_log (this->name, GF_LOG_DEBUG,
"failed to set error msg");
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 0987075..43bfb0b 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -3937,7 +3937,7 @@ init (xlator_t *this)
if (op_ret == 16) {
if (uuid_compare (old_uuid, dict_uuid)) {
gf_log (this->name, GF_LOG_ERROR,
- "mismatching volume-id (%s) recieved. "
+ "mismatching volume-id (%s) received. "
"already is a part of volume %s ",
tmp_data->data, uuid_utoa (old_uuid));
ret = -1;