diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2019-06-27 10:49:30 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2019-07-01 12:29:08 +0000 |
| commit | 6fbf323d5f72db879d733af5ba9c67c7a1bfec63 (patch) | |
| tree | 6ba6809ba86e58a8174f7988fc4fff9ab80999d1 | |
| parent | 22e2d990dbbea878dba5569cc2d0df33955913b1 (diff) | |
glusterd: fix clang scan defects
Fixes following:
https://build.gluster.org/job/clang-scan/744/clangScanBuildBugs/browse/report-dd8d31.html#EndPath
https://build.gluster.org/job/clang-scan/744/clangScanBuildBugs/browse/report-89a1cd.html#EndPath
Updates: bz#1622665
Change-Id: Ibd201fb2ca54ae7ae3fed8a8d87815358b614349
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-log-ops.c | 5 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-log-ops.c b/xlators/mgmt/glusterd/src/glusterd-log-ops.c index 5e0877e836c..a48923e26e1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-log-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-log-ops.c @@ -226,8 +226,9 @@ cont: if (gf_uuid_compare(brickinfo->uuid, MY_UUID)) continue; - if (brick && (strcmp(tmpbrkinfo->hostname, brickinfo->hostname) || - strcmp(tmpbrkinfo->path, brickinfo->path))) + if (tmpbrkinfo && brick && + (strcmp(tmpbrkinfo->hostname, brickinfo->hostname) || + strcmp(tmpbrkinfo->path, brickinfo->path))) continue; valid_brick = 1; diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c index 70cc539b510..cde77e5f6af 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c @@ -294,7 +294,7 @@ glusterd_volume_svc_check_volfile_identical( this = THIS; - GF_VALIDATE_OR_GOTO(this->name, this, out); + GF_VALIDATE_OR_GOTO("glusterd", this, out); GF_VALIDATE_OR_GOTO(this->name, identical, out); /* This builds volfile for volume level dameons */ |