diff options
| author | Xavi Hernandez <xhernandez@redhat.com> | 2018-07-06 20:23:35 +0200 |
|---|---|---|
| committer | Xavi Hernandez <xhernandez@redhat.com> | 2018-07-10 16:28:24 +0200 |
| commit | 6dc5dfef819cad69d6d4b4c1c305efa74236ad84 (patch) | |
| tree | 6b325caf478689d8113279191ca1916e5f5b32ea /xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c | |
| parent | 03f1f5bdc46076178f1afdf8e2a76c5b973fe11f (diff) | |
Fix compile warnings
This patch fixes compile warnings that appear with newer compilers. The
solution applied is only to remove the warnings, but it doesn't always
solve the problem in the best way. It assumes that the problem will never
happen, as the previous code assumed.
Change-Id: I6e8470d6c2e2dbd3bd7d324b5fd2f92ffdc3d6ec
updates: bz#1193929
Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c index 340289f74e8..249d99ea3dd 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot-utils.c @@ -669,8 +669,8 @@ int32_t glusterd_add_snap_to_dict (glusterd_snap_t *snap, dict_t *peer_data, int32_t snap_count) { - char buf[NAME_MAX] = ""; - char prefix[NAME_MAX] = ""; + char buf[64] = ""; + char prefix[32] = ""; int32_t ret = -1; int32_t volcount = 0; glusterd_volinfo_t *volinfo = NULL; @@ -1551,8 +1551,8 @@ int32_t glusterd_import_friend_snap (dict_t *peer_data, int32_t snap_count, char *peer_snap_name, char *peer_snap_id) { - char buf[NAME_MAX] = ""; - char prefix[NAME_MAX] = ""; + char buf[64] = ""; + char prefix[32] = ""; dict_t *dict = NULL; glusterd_snap_t *snap = NULL; glusterd_volinfo_t *snap_vol = NULL; @@ -1792,8 +1792,8 @@ int32_t glusterd_compare_snap (dict_t *peer_data, int32_t snap_count, char *peername, uuid_t peerid) { - char buf[NAME_MAX] = ""; - char prefix[NAME_MAX] = ""; + char buf[64] = ""; + char prefix[32] = ""; char *peer_snap_name = NULL; char *peer_snap_id = NULL; glusterd_snap_t *snap = NULL; @@ -1994,8 +1994,8 @@ glusterd_update_snaps_synctask (void *opaque) int i = 1; xlator_t *this = NULL; dict_t *peer_data = NULL; - char buf[NAME_MAX] = ""; - char prefix[NAME_MAX] = ""; + char buf[64] = ""; + char prefix[32] = ""; char *peer_snap_name = NULL; char *peer_snap_id = NULL; char *peername = NULL; @@ -2205,8 +2205,8 @@ glusterd_add_snapd_to_dict (glusterd_volinfo_t *volinfo, int ret = -1; int32_t pid = -1; int32_t brick_online = -1; - char key[1024] = {0}; - char base_key[1024] = {0}; + char key[64] = {0}; + char base_key[32] = {0}; char pidfile[PATH_MAX] = {0}; xlator_t *this = NULL; @@ -2433,8 +2433,8 @@ glusterd_merge_brick_status (dict_t *dst, dict_t *src) int64_t j = 0; int64_t brick_count = 0; int64_t brick_order = 0; - char key[PATH_MAX] = {0, }; - char key_prefix[PATH_MAX] = {0, }; + char key[64] = {0, }; + char key_prefix[16] = {0, }; char snapbrckcnt[PATH_MAX] = {0, }; char snapbrckord[PATH_MAX] = {0, }; char *clonename = NULL; @@ -2510,7 +2510,7 @@ glusterd_merge_brick_status (dict_t *dst, dict_t *src) goto out; } - snprintf (key, sizeof (key) - 1, + snprintf (key, sizeof (key), "%s%"PRId64".brick%"PRId64".status", key_prefix, index+1, brick_order); ret = dict_get_int32 (src, key, &brick_online); @@ -2852,6 +2852,7 @@ glusterd_mount_lvm_snapshot (glusterd_brickinfo_t *brickinfo, int32_t ret = -1; runner_t runner = {0, }; xlator_t *this = NULL; + int32_t len = 0; this = THIS; GF_ASSERT (this); @@ -2860,8 +2861,11 @@ glusterd_mount_lvm_snapshot (glusterd_brickinfo_t *brickinfo, runinit (&runner); - snprintf (msg, sizeof (msg), "mount %s %s", - brickinfo->device_path, brick_mount_path); + len = snprintf (msg, sizeof (msg), "mount %s %s", + brickinfo->device_path, brick_mount_path); + if (len < 0) { + strcpy(msg, "<error>"); + } gf_strncpy (mnt_opts, brickinfo->mnt_opts, sizeof(mnt_opts)); |