diff options
| author | Sanju Rakonde <srakonde@redhat.com> | 2018-07-24 14:27:02 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2018-07-24 23:55:12 +0000 |
| commit | 8ad159b2a7e302320a24d1d4f5d0b90302e0f25b (patch) | |
| tree | 05d90618ff41ecd8d70f94473564ab38dfca9ea6 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 59401e705b9432345f3b449b50cfa4095ce2169a (diff) | |
glusterd: Coverity issues with type FORWARD_NULL
This patch fixes coverity issues 102, 103, 112 and 119 from [1]
[1] https://download.gluster.org/pub/gluster/glusterfs/static-analysis/master/glusterfs-coverity/2018-07-23-5fa004f3/html/
Updates: bz#789278
Change-Id: I99762eb0bcbd974a5250434777db63520f2ce2e6
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index dc8e1bdfd80..d791dc3b977 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -5243,6 +5243,10 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count, svc = &(priv->bitd_svc); else if (strcmp(server, priv->scrub_svc.name) == 0) svc = &(priv->scrub_svc); + else { + ret = 0; + goto out; + } //Consider service to be running only when glusterd sees it Online if (svc->online) @@ -5258,11 +5262,6 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count, * when output. */ - if (!strcmp(server, "")) { - ret = 0; - goto out; - } - snprintf (key, sizeof (key), "brick%d.hostname", count); if (!strcmp (server, priv->nfs_svc.name)) ret = dict_set_str (dict, key, "NFS Server"); @@ -5313,7 +5312,6 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count, if (ret) goto out; - out: gf_msg_debug (THIS->name, 0, "Returning %d", ret); return ret; |