Add upstream revision 2748:

r2748 | jflesch | 2010-03-30 00:24:59 -0700 (Tue, 30 Mar 2010) | 1 line

Coroipcc: Make sure that coroipcc_service_connect() always return a valid cs_error_t



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2858 fd59a12c-fef9-0310-b244-a6a79926bd2f

lib/coroipcc.c

@@ -661,42 +661,42 @@ coroipcc_service_connect (
 		goto error_connect;
 	}
 
-	res = memory_map (
+	sys_res = memory_map (
 		control_map_path,
 		"control_buffer-XXXXXX",
 		(void *)&ipc_instance->control_buffer,
 		8192);
-	if (res == -1) {
+	if (sys_res == -1) {
 		res = CS_ERR_LIBRARY;
 		goto error_connect;
 	}
 
-	res = memory_map (
+	sys_res = memory_map (
 		request_map_path,
 		"request_buffer-XXXXXX",
 		(void *)&ipc_instance->request_buffer,
 		request_size);
-	if (res == -1) {
+	if (sys_res == -1) {
 		res = CS_ERR_LIBRARY;
 		goto error_request_buffer;
 	}
 
-	res = memory_map (
+	sys_res = memory_map (
 		response_map_path,
 		"response_buffer-XXXXXX",
 		(void *)&ipc_instance->response_buffer,
 		response_size);
-	if (res == -1) {
+	if (sys_res == -1) {
 		res = CS_ERR_LIBRARY;
 		goto error_response_buffer;
 	}
 
-	res = circular_memory_map (
+	sys_res = circular_memory_map (
 		dispatch_map_path,
 		"dispatch_buffer-XXXXXX",
 		(void *)&ipc_instance->dispatch_buffer,
 		dispatch_size);
-	if (res == -1) {
+	if (sys_res == -1) {
 		res = CS_ERR_LIBRARY;
 		goto error_dispatch_buffer;
 	}
@@ -706,7 +706,6 @@ coroipcc_service_connect (
 	sem_init (&ipc_instance->control_buffer->sem1, 1, 0);
 	sem_init (&ipc_instance->control_buffer->sem2, 1, 0);
 #else
-
 	/*
 	 * Allocate a semaphore segment
 	 */
@@ -725,18 +724,21 @@ coroipcc_service_connect (
 		 * an existing shared memory segment for which we have access
 		 */
 		if (errno != EEXIST && errno != EACCES) {
+			res = CS_ERR_LIBRARY;
 			goto error_exit;
 		}
 	}
 
 	semun.val = 0;
-	res = semctl (ipc_instance->semid, 0, SETVAL, semun);
-	if (res != 0) {
+	sys_res = semctl (ipc_instance->semid, 0, SETVAL, semun);
+	if (sys_res != 0) {
+		res = CS_ERR_LIBRARY;
 		goto error_exit;
 	}
 
-	res = semctl (ipc_instance->semid, 1, SETVAL, semun);
-	if (res != 0) {
+	sys_res = semctl (ipc_instance->semid, 1, SETVAL, semun);
+	if (sys_res != 0) {
+		res = CS_ERR_LIBRARY;
 		goto error_exit;
 	}
 #endif