[Openais] [PATCH 11/15] testvotequorum1.c: don't shadow file-scoped global, "handle"

[Jim Meyering]

From: Jim Meyering <meyer...@redhat.com>

* test/testvotequorum1.c (main): Rename: s/handle/g_handle/.
---
 test/testvotequorum1.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/testvotequorum1.c b/test/testvotequorum1.c
index b8f0648..5050ba7 100644
--- a/test/testvotequorum1.c
+++ b/test/testvotequorum1.c
@@ -43,7 +43,7 @@
 #include <corosync/corotypes.h>
 #include <corosync/votequorum.h>

-static votequorum_handle_t handle;
+static votequorum_handle_t g_handle;

 static const char *node_state(int state)
 {
@@ -116,13 +116,13 @@ int main(int argc, char *argv[])
        callbacks.votequorum_notify_fn = votequorum_notification_fn;
        callbacks.votequorum_expectedvotes_notify_fn = 
votequorum_expectedvotes_notification_fn;

-       if ( (err=votequorum_initialize(&handle, &callbacks)) != CS_OK)
+       if ( (err=votequorum_initialize(&g_handle, &callbacks)) != CS_OK)
                fprintf(stderr, "votequorum_initialize FAILED: %d\n", err);

-       if ( (err = votequorum_trackstart(handle, handle, CS_TRACK_CHANGES)) != 
CS_OK)
+       if ( (err = votequorum_trackstart(g_handle, g_handle, 
CS_TRACK_CHANGES)) != CS_OK)
                fprintf(stderr, "votequorum_trackstart FAILED: %d\n", err);

-       if ( (err=votequorum_getinfo(handle, 0, &info)) != CS_OK)
+       if ( (err=votequorum_getinfo(g_handle, 0, &info)) != CS_OK)
                fprintf(stderr, "votequorum_getinfo FAILED: %d\n", err);
        else {
                printf("node votes       %d\n", info.node_votes);
@@ -139,16 +139,16 @@ int main(int argc, char *argv[])
        }

        if (argc >= 2 && atoi(argv[1])) {
-               if ( (err=votequorum_setexpected(handle, atoi(argv[1]))) != 
CS_OK)
+               if ( (err=votequorum_setexpected(g_handle, atoi(argv[1]))) != 
CS_OK)
                        fprintf(stderr, "set expected votes FAILED: %d\n", err);
        }
        if (argc >= 3 && atoi(argv[2])) {
-               if ( (err=votequorum_setvotes(handle, 0, atoi(argv[2]))) != 
CS_OK)
+               if ( (err=votequorum_setvotes(g_handle, 0, atoi(argv[2]))) != 
CS_OK)
                        fprintf(stderr, "set votes FAILED: %d\n", err);
        }

        if (argc >= 2) {
-               if ( (err=votequorum_getinfo(handle, 0, &info)) != CS_OK)
+               if ( (err=votequorum_getinfo(g_handle, 0, &info)) != CS_OK)
                        fprintf(stderr, "votequorum_getinfo2 FAILED: %d\n", 
err);
                else {
                        printf("-------------------\n");
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
        printf("-------------------\n");

        while (1)
-               votequorum_dispatch(handle, CS_DISPATCH_ALL);
+               votequorum_dispatch(g_handle, CS_DISPATCH_ALL);

        return 0;
 }
-- 
1.6.3.rc0.154.g06890

_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais