Merge trunk revision 2545:

r2545 | asalkeld | 2009-11-21 23:29:46 -0700 (Sat, 21 Nov 2009) | 3 lines

COVERITY 11: remove dead code from cpg_iteration_next().



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

lib/cpg.c

@@ -860,7 +860,7 @@ cs_error_t cpg_iteration_next(
 			description,
 			&res_lib_cpg_iterationnext->description);
 
-	error = (error == CS_OK ? res_lib_cpg_iterationnext->header.error : error);
+	error = res_lib_cpg_iterationnext->header.error;
 
 	coroipcc_msg_send_reply_receive_in_buf_put(
 			cpg_iteration_instance->conn_handle);