From 7f5c1e5777d77570be0f9698de39d2f1905c509f Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Tue, 10 Apr 2012 17:12:05 -0400 Subject: Fix compiler warnings and typos from Debian build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 for pointing these out. Change-Id: Ia32d1111d7c10b1f213df85d86b17a1326248ffd BUG: 811387 Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.com/3117 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- cli/src/cli-rpc-ops.c | 6 +++--- doc/glusterfs.8 | 2 +- doc/glusterfsd.8 | 2 +- glusterfsd/src/glusterfsd-mgmt.c | 2 +- xlators/cluster/afr/src/afr-self-heal-algorithm.c | 2 +- xlators/cluster/afr/src/afr-self-heald.c | 2 +- xlators/features/marker/utils/syncdaemon/resource.py | 2 +- xlators/mgmt/glusterd/src/glusterd-utils.c | 4 ++-- xlators/mgmt/glusterd/src/glusterd-volgen.c | 2 +- xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 2 +- xlators/protocol/server/src/server-handshake.c | 2 +- xlators/storage/posix/src/posix.c | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 779508ad7..4deb14e6e 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -329,7 +329,7 @@ gf_cli3_1_list_friends_cbk (struct rpc_req *req, struct iovec *iov, NULL); if (ret) gf_log ("cli", GF_LOG_ERROR, - "Error ouputting to xml"); + "Error outputting to xml"); goto out; } #endif @@ -5383,7 +5383,7 @@ gf_cli3_1_status_cbk (struct rpc_req *req, struct iovec *iov, continue; /* Brick/not-brick is handled seperately here as all - * types of nodes are contained in the default ouput + * types of nodes are contained in the default output */ memset (status.brick, 0, PATH_MAX + 255); if (!strcmp (hostname, "NFS Server") || @@ -5888,7 +5888,7 @@ gf_cli3_1_statedump_volume_cbk (struct rpc_req *req, struct iovec *iov, gf_log (THIS->name, GF_LOG_ERROR, "XDR decoding failed"); goto out; } - gf_log ("cli", GF_LOG_DEBUG, "Recieved response to statedump"); + gf_log ("cli", GF_LOG_DEBUG, "Received response to statedump"); if (rsp.op_ret) snprintf (msg, sizeof(msg), "%s", rsp.op_errstr); else diff --git a/doc/glusterfs.8 b/doc/glusterfs.8 index b21fd675e..37bf67d18 100644 --- a/doc/glusterfs.8 +++ b/doc/glusterfs.8 @@ -115,7 +115,7 @@ Print the program version. mount a volume named foo on server bar with log level DEBUG on mount point /mnt/foo -# glusterfs --log-level=DEBUG --volfile-id=foo --volfile-server=bar /mnt/foo +# glusterfs \-\-log\-level=DEBUG \-\-volfile\-id=foo \-\-volfile\-server=bar /mnt/foo .SH SEE ALSO .nf diff --git a/doc/glusterfsd.8 b/doc/glusterfsd.8 index f4261e3ad..17d053a5c 100644 --- a/doc/glusterfsd.8 +++ b/doc/glusterfsd.8 @@ -131,7 +131,7 @@ Print program version .SH EXAMPLES Start a GlusterFS server on localhost with volume name foo -glusterfsd -s localhost --volfile-id foo.server.media-disk-1 -p /etc/glusterd/vols/foo/run/server-media-disk-1.pid -S /tmp/.socket --brick-name /media/disk-1 -l /var/log/glusterfs/bricks/media-disk-1.log --brick-port 24009 --xlator-option foo-server.listen-port=24009 +glusterfsd \-s localhost \-\-volfile\-id foo.server.media-disk\-1 \-p /etc/glusterd/vols/foo/run/server\-media\-disk\-1.pid \-S /tmp/.socket \-\-brick-name /media/disk\-1 \-l /var/log/glusterfs/bricks/media\-disk\-1.log \-\-brick\-port 24009 \-\-xlator\-option foo\-server.listen-port=24009 .SH SEE ALSO .nf diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index e2622d35d..3a7c395be 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -1210,7 +1210,7 @@ glusterfs_handle_nfs_profile (rpcsvc_request_t *req) (size_t *)&rsp.output.output_len); if (ret) { gf_log (THIS->name, GF_LOG_ERROR, - "Failed to serialize ouput dict to rsp"); + "Failed to serialize output dict to rsp"); goto out; } diff --git a/xlators/cluster/afr/src/afr-self-heal-algorithm.c b/xlators/cluster/afr/src/afr-self-heal-algorithm.c index 99a210836..d340acc75 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 3dd268eba..9fc3c964a 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 7fcc53964..c850e1fe3 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 71616ebb8..77bc472c7 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 c5b41441e..9b8daa16a 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 0a076e721..b30c46318 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 8478a27ba..920a73ffc 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 0987075e1..43bfb0bed 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; -- cgit