[Debian-ha-commits] [pacemaker] 40/69: Fix: tools: crm_resource compile issue

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch debian/master
in repository pacemaker.

commit 389bf87daf511cdd5fe997f1cc20b8b9e20948df
Author: Ken Gaillot <kgaillot at redhat.com>
Date:   Thu Jan 7 09:50:22 2016 -0600

    Fix: tools: crm_resource compile issue
---
 tools/crm_resource.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/crm_resource.c b/tools/crm_resource.c
index a60c5b9..f5b63d4 100644
--- a/tools/crm_resource.c
+++ b/tools/crm_resource.c
@@ -378,14 +378,10 @@ main(int argc, char **argv)
                     char *provider = strchr (optarg, ':');
                     lrmd_t *lrmd_conn = lrmd_api_new();
 
-                    if (!provider) {
-                        rc = lrmd_conn->cmds->list_agents(lrmd_conn, &list, optarg, NULL);
-                        provider = "*";
-
-                    } else {
+                    if (provider) {
                         *provider++ = 0;
-                        rc = lrmd_conn->cmds->list_agents(lrmd_conn, &list, optarg, provider);
                     }
+                    rc = lrmd_conn->cmds->list_agents(lrmd_conn, &list, optarg, provider);
 
                     if (rc > 0) {
                         rc = 0;
@@ -396,8 +392,8 @@ main(int argc, char **argv)
                         lrmd_list_freeall(list);
                         rc = 0;
                     } else {
-                        fprintf(stderr, "No agents found for standard=%s, provider=%s\n", optarg,
-                                provider);
+                        fprintf(stderr, "No agents found for standard=%s, provider=%s\n",
+                                optarg, (provider? provider : "*"));
                         rc = -1;
                     }
                     lrmd_api_delete(lrmd_conn);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git