This is the mail archive of the cluster-cvs@sourceware.org mailing list for the cluster.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

master - libfence: whitespace cleanup


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=69b3ecac8da9ce4a34efb6702b253e52ea87e063
Commit:        69b3ecac8da9ce4a34efb6702b253e52ea87e063
Parent:        968d2218fec8b29e4a6f3a6db70a0dd9f8e6aff3
Author:        Ryan McCabe <rmccabe@redhat.com>
AuthorDate:    Fri Nov 7 16:33:20 2008 -0500
Committer:     Ryan McCabe <rmccabe@redhat.com>
CommitterDate: Fri Nov 7 16:33:20 2008 -0500

libfence: whitespace cleanup

---
 fence/libfence/agent.c |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/fence/libfence/agent.c b/fence/libfence/agent.c
index f06ff6a..3454ec7 100644
--- a/fence/libfence/agent.c
+++ b/fence/libfence/agent.c
@@ -15,11 +15,11 @@
 #define MAX_DEVICES		8
 #define MAX_AGENT_ARGS_LEN	512
 
-#define METHOD_NAME_PATH        "/cluster/clusternodes/clusternode[@name=\"%s\"]/fence/method[%d]/@name"
-#define DEVICE_NAME_PATH        "/cluster/clusternodes/clusternode[@name=\"%s\"]/fence/method[@name=\"%s\"]/device[%d]/@name"
-#define NODE_FENCE_ARGS_PATH    "/cluster/clusternodes/clusternode[@name=\"%s\"]/fence/method[@name=\"%s\"]/device[%d]/@*"
-#define AGENT_NAME_PATH         "/cluster/fencedevices/fencedevice[@name=\"%s\"]/@agent"
-#define FENCE_DEVICE_ARGS_PATH  "/cluster/fencedevices/fencedevice[@name=\"%s\"]/@*"
+#define METHOD_NAME_PATH		"/cluster/clusternodes/clusternode[@name=\"%s\"]/fence/method[%d]/@name"
+#define DEVICE_NAME_PATH		"/cluster/clusternodes/clusternode[@name=\"%s\"]/fence/method[@name=\"%s\"]/device[%d]/@name"
+#define NODE_FENCE_ARGS_PATH	"/cluster/clusternodes/clusternode[@name=\"%s\"]/fence/method[@name=\"%s\"]/device[%d]/@*"
+#define AGENT_NAME_PATH			"/cluster/fencedevices/fencedevice[@name=\"%s\"]/@agent"
+#define FENCE_DEVICE_ARGS_PATH	"/cluster/fencedevices/fencedevice[@name=\"%s\"]/@*"
 
 
 
@@ -57,17 +57,17 @@ static int run_agent(char *agent, char *args)
 
 	if (pipe(fd1))
 		goto fail;
-  	pr_fd = fd1[0];
-  	cw_fd = fd1[1];
+	pr_fd = fd1[0];
+	cw_fd = fd1[1];
 
-  	if (pipe(fd2))
-   		goto fail;
-  	cr_fd = fd2[0];
-  	pw_fd = fd2[1];
+	if (pipe(fd2))
+		goto fail;
+	cr_fd = fd2[0];
+	pw_fd = fd2[1];
 
 	pid = fork();
 	if (pid < 0)
-   		goto fail;
+		goto fail;
 
 	if (pid) {
 		/* parent */
@@ -125,7 +125,7 @@ static int run_agent(char *agent, char *args)
 }
 
 static int make_args(int cd, char *victim, char *method, int d,
-		     char *device, char **args_out)
+				char *device, char **args_out)
 {
 	char path[256], *args, *str;
 	int error;
@@ -249,7 +249,7 @@ static int count_devices(int cd, char *victim, char *method)
 }
 
 static int use_device(int cd, char *victim, char *method, int d,
-		      char *device)
+				char *device)
 {
 	char path[256], *agent, *args = NULL;
 	int error;
@@ -306,9 +306,8 @@ int fence_node(char *victim)
 				sleep(1);
 			
 			error = get_method(cd, victim, m, &method);
-
-		if (error)
-			continue;
+			if (error)
+				continue;
 		} else if (error)
 			continue;
 
@@ -344,4 +343,3 @@ int fence_node(char *victim)
 
 	return error;
 }
-


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]