defect 1046

SaErrorT in trunk branch, but only SaAisErrorT should be used


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@902 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/amf.c

@@ -1165,7 +1165,7 @@ static void protectiongroup_notification_send (struct conn_info *conn_info,
 			sizeof (struct res_lib_amf_protectiongrouptrackcallback) +
 			(notifyEntries * sizeof (SaAmfProtectionGroupNotificationT));
 //		res_lib_amf_protectiongrouptrackcallback.header.id = MESSAGE_RES_AMF_PROTECTIONGROUPTRACKCALLBACK;
-		res_lib_amf_protectiongrouptrackcallback.header.error = SA_OK;
+		res_lib_amf_protectiongrouptrackcallback.header.error = SA_AIS_OK;
 		res_lib_amf_protectiongrouptrackcallback.numberOfItems = notifyEntries;
 		res_lib_amf_protectiongrouptrackcallback.numberOfMembers = notifyEntries;
 		memcpy (&res_lib_amf_protectiongrouptrackcallback.csiName,
@@ -1370,7 +1370,7 @@ void csi_comp_set_callback (
 
 	res_lib_amf_csisetcallback.header.id = MESSAGE_RES_AMF_CSISETCALLBACK;
 	res_lib_amf_csisetcallback.header.size = sizeof (struct res_lib_amf_csisetcallback);
-	res_lib_amf_csisetcallback.header.error = SA_OK;
+	res_lib_amf_csisetcallback.header.error = SA_AIS_OK;
 
 
 	memcpy (&res_lib_amf_csisetcallback.compName,
@@ -1446,7 +1446,7 @@ void csi_comp_remove_callback (struct amf_comp *comp, struct amf_csi *csi)
 
 	res_lib_amf_csiremovecallback.header.id = MESSAGE_RES_AMF_CSIREMOVECALLBACK;
 	res_lib_amf_csiremovecallback.header.size = sizeof (struct res_lib_amf_csiremovecallback);
-	res_lib_amf_csiremovecallback.header.error = SA_OK;
+	res_lib_amf_csiremovecallback.header.error = SA_AIS_OK;
 
 	csi_remove_callback_data = malloc (sizeof (struct csi_remove_callback_data));
 	assert (csi_remove_callback_data); // TODO failure here of malloc
@@ -2468,7 +2468,7 @@ static int message_handler_req_lib_amf_healthcheckstart (struct conn_info *conn_
 	struct amf_healthcheck *healthcheck;
 	struct healthcheck_active *healthcheck_active;
 	struct amf_comp *comp;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 printf ("healthcheck start\n");
 fflush (stdout);
@@ -2554,7 +2554,7 @@ static int message_handler_req_lib_amf_healthcheckstop (struct conn_info *conn_i
 	struct res_lib_amf_healthcheckstop res_lib_amf_healthcheckstop;
 	struct healthcheck_active *healthcheck_active;
 	struct amf_comp *comp;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	printf ("healthcheck stop\n");
 	comp = find_comp (&req_lib_amf_healthcheckstop->compName);
@@ -2607,7 +2607,7 @@ static int message_handler_req_lib_amf_hastateget (struct conn_info *conn_info,
 	if (component) {
 		memcpy (&res_lib_amf_hastateget.haState, 
 			&component->currentHAState, sizeof (SaAmfHAStateT));
-		res_lib_amf_hastateget.header.error = SA_OK;
+		res_lib_amf_hastateget.header.error = SA_AIS_OK;
 	}
 	libais_send_response (conn_info, &res_lib_amf_hastateget, sizeof (struct res_lib_amf_hastateget));
 #endif
@@ -2662,7 +2662,7 @@ static int message_handler_req_lib_amf_protectiongrouptrackstart (struct conn_in
 	res_lib_amf_protectiongrouptrackstart.header.error = SA_ERR_NOT_EXIST;
 
 	if (amfProtectionGroup) {
-		res_lib_amf_protectiongrouptrackstart.header.error = SA_OK;
+		res_lib_amf_protectiongrouptrackstart.header.error = SA_AIS_OK;
 	}
 	libais_send_response (conn_info, &res_lib_amf_protectiongrouptrackstart,
 		sizeof (struct res_lib_amf_protectiongrouptrackstart));
@@ -2720,7 +2720,7 @@ static int message_handler_req_lib_amf_protectiongrouptrackstop (struct conn_inf
 	res_lib_amf_protectiongrouptrackstop.header.error = SA_ERR_NOT_EXIST;
 
 	if (track) {
-		res_lib_amf_protectiongrouptrackstop.header.error = SA_OK;
+		res_lib_amf_protectiongrouptrackstop.header.error = SA_AIS_OK;
 	}
 	libais_send_response (conn_info, &res_lib_amf_protectiongrouptrackstop,
 		sizeof (struct res_lib_amf_protectiongrouptrackstop));
@@ -2911,7 +2911,7 @@ static int message_handler_req_exec_amf_componentregister (void *message, struct
 	struct res_lib_amf_componentregister res_lib_amf_componentregister;
 	struct amf_comp *component;
 	struct amf_comp *amfProxyComponent;
-	SaErrorT error;
+	SaAisErrorT error;
 
 	log_printf (LOG_LEVEL_FROM_GMI, "Executive: ComponentRegister for component %s\n",
 		getSaNameT (&req_exec_amf_componentregister->req_lib_amf_componentregister.compName));
@@ -2919,7 +2919,7 @@ static int message_handler_req_exec_amf_componentregister (void *message, struct
 	/*
 	 * Determine if proxy isn't registered
 	 */
-	error = SA_OK;
+	error = SA_AIS_OK;
 	component = find_comp (&req_exec_amf_componentregister->req_lib_amf_componentregister.compName);
 	amfProxyComponent = find_comp (&req_exec_amf_componentregister->req_lib_amf_componentregister.proxyCompName);
 
@@ -2951,7 +2951,7 @@ static int message_handler_req_exec_amf_componentregister (void *message, struct
 	/*
 	 * If component already registered, return error
 	 */
-	if (error == SA_OK) {
+	if (error == SA_AIS_OK) {
 		if (component->registered) {
 			error = SA_ERR_EXIST;
 		}
@@ -2961,7 +2961,7 @@ static int message_handler_req_exec_amf_componentregister (void *message, struct
 	 * Finally register component and setup links for proxy if
 	 * proxy present
 	 */
-	if (error == SA_OK) {
+	if (error == SA_AIS_OK) {
 		component->local = 0;
 		component->registered = 1;
 		component->conn_info = req_exec_amf_componentregister->source.conn_info;
@@ -2985,7 +2985,7 @@ static int message_handler_req_exec_amf_componentregister (void *message, struct
 	 * to the AMF library
 	 */
 	if (message_source_is_local(&req_exec_amf_componentregister->source)) {
-		if (error == SA_OK) {
+		if (error == SA_AIS_OK) {
 			component->local = 1;
 			req_exec_amf_componentregister->source.conn_info->component = component;
 		}
@@ -3005,7 +3005,7 @@ static int message_handler_req_exec_amf_componentregister (void *message, struct
 	/*
 	 * If no error on registration, determine if we should enter new state
 	 */
-	if (error == SA_OK) {
+	if (error == SA_AIS_OK) {
 		dsm (component);
 	}
 
@@ -3019,7 +3019,7 @@ static int message_handler_req_exec_amf_componentunregister (void *message, stru
 	struct res_lib_amf_componentunregister res_lib_amf_componentunregister;
 	struct amf_comp *component;
 	struct amf_comp *amfProxyComponent;
-	SaErrorT error;
+	SaAisErrorT error;
 
 	log_printf (LOG_LEVEL_FROM_GMI, "Executive: Component_unregister for %s\n",
 		getSaNameT (&req_exec_amf_componentunregister->req_lib_amf_componentunregister.compName));
@@ -3030,7 +3030,7 @@ static int message_handler_req_exec_amf_componentunregister (void *message, stru
 	/*
 	 * Check for proxy and component not existing in system
 	 */
-	error = SA_OK;
+	error = SA_AIS_OK;
 	if (component == 0) {
 		error = SA_ERR_NOT_EXIST;
 	}
@@ -3048,7 +3048,7 @@ static int message_handler_req_exec_amf_componentunregister (void *message, stru
 	 * If there is a proxycompname, make sure it is the proxy
 	 * of compName
 	 */
-	if (error == SA_OK && amfProxyComponent) {
+	if (error == SA_AIS_OK && amfProxyComponent) {
 		if (component->saAmfProxyComponent != amfProxyComponent) {
 			error = SA_ERR_BAD_OPERATION;
 		}
@@ -3057,7 +3057,7 @@ static int message_handler_req_exec_amf_componentunregister (void *message, stru
 	/*
 	 * Finally unregister the component
 	 */
-	if (error == SA_OK) {
+	if (error == SA_AIS_OK) {
 		component->registered = 0;
 //		dsmEnabledUnlockedTransitionDisabledUnlocked (component);
 	}
@@ -3086,7 +3086,7 @@ static int message_handler_req_exec_amf_componenterrorreport (void *message, str
 	struct req_exec_amf_componenterrorreport *req_exec_amf_componenterrorreport = (struct req_exec_amf_componenterrorreport *)message;
 	struct res_lib_amf_componenterrorreport res_lib_amf_componenterrorreport;
 	struct amf_comp *comp;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_NOTICE, "Executive: ErrorReport for %s\n", 
 		getSaNameT (&req_exec_amf_componenterrorreport->req_lib_amf_componenterrorreport.erroneousComponent));
@@ -3122,7 +3122,7 @@ static int message_handler_req_exec_amf_componenterrorclear (void *message, stru
 	struct req_exec_amf_componenterrorclear *req_exec_amf_componenterrorclear = (struct req_exec_amf_componenterrorclear *)message;
 	struct res_lib_amf_componenterrorclear res_lib_amf_componenterrorclear;
 	struct amf_comp *component;
-	SaErrorT error = SA_ERR_BAD_OPERATION;
+	SaAisErrorT error = SA_ERR_BAD_OPERATION;
 
 #ifdef COMPILE_OUT
 	log_printf (LOG_LEVEL_FROM_GMI, "Executive: ErrorCancelAll for %s\n",
@@ -3139,7 +3139,7 @@ static int message_handler_req_exec_amf_componenterrorclear (void *message, stru
 			component->disabledUnlockedState = AMF_DISABLED_UNLOCKED_REGISTEREDORERRORCANCEL;
 			dsm (component);
 		}
-		error = SA_OK;
+		error = SA_AIS_OK;
 	}
 	
 	/*
@@ -3338,7 +3338,7 @@ void ha_state_api_set (struct amf_comp *component, SaAmfHAStateT haState)
 
 	res_lib_amf_csisetcallback.header.id = MESSAGE_RES_AMF_CSISETCALLBACK;
 	res_lib_amf_csisetcallback.header.size = sizeof (struct res_lib_amf_csisetcallback);
-	res_lib_amf_csisetcallback.header.error = SA_OK;
+	res_lib_amf_csisetcallback.header.error = SA_AIS_OK;
 
 	if (res_lib_amf_csisetcallback.invocation == -1) {
 		printf ("TODO set callback\n");
@@ -3410,7 +3410,7 @@ void readiness_state_api_set (struct amf_comp *component,
 
 	res_lib_amf_readinessstatesetcallback.header.id = MESSAGE_RES_AMF_READINESSSTATESETCALLBACK;
 	res_lib_amf_readinessstatesetcallback.header.size = sizeof (struct res_lib_amf_readinessstatesetcallback);
-	res_lib_amf_readinessstatesetcallback.header.error = SA_OK;
+	res_lib_amf_readinessstatesetcallback.header.error = SA_AIS_OK;
 	res_lib_amf_readinessstatesetcallback.invocation =
 		req_lib_amf_invocation_create (
 		MESSAGE_REQ_AMF_RESPONSE_SAAMFREADINESSSTATESETCALLBACK,
@@ -4159,7 +4159,7 @@ static void response_handler_readinessstatesetcallback (struct conn_info *conn_i
 	struct req_lib_amf_response *req_lib_amf_response)
 {
 
-	if (req_lib_amf_response->error == SA_OK && conn_info->component) {
+	if (req_lib_amf_response->error == SA_AIS_OK && conn_info->component) {
 
 	log_printf (LOG_LEVEL_ENTER_FUNC, "CALLBACK sending readiness state to %s\n", 
 		getSaNameT (&conn_info->component->name));
@@ -4175,7 +4175,7 @@ static void response_handler_csisetcallback (struct conn_info *conn_info,
 	struct req_lib_amf_response *req_lib_amf_response)
 {
 
-	if (req_lib_amf_response->error == SA_OK && conn_info->component) {
+	if (req_lib_amf_response->error == SA_AIS_OK && conn_info->component) {
 		ha_state_group_set (conn_info->component, conn_info->component->newHAState);
 	}
 }
@@ -4394,7 +4394,7 @@ static int message_handler_req_amf_readinessstateget (struct conn_info *conn_inf
 	if (component) {
 		memcpy (&res_lib_amf_readinessstateget.readinessState, 
 			&component->currentReadinessState, sizeof (SaAmfReadinessStateT));
-		res_lib_amf_readinessstateget.header.error = SA_OK;
+		res_lib_amf_readinessstateget.header.error = SA_AIS_OK;
 	}
 	libais_send_response (conn_info, &res_lib_amf_readinessstateget, sizeof (struct res_lib_amf_readinessstateget));
 	return (0);
@@ -4448,7 +4448,7 @@ static int message_handler_req_lib_amf_stoppingcomplete (struct conn_info *conn_
 	res_lib_amf_protectiongrouptrackstart.header.error = SA_ERR_NOT_EXIST;
 
 	if (amfProtectionGroup) {
-		res_lib_amf_protectiongrouptrackstart.header.error = SA_OK;
+		res_lib_amf_protectiongrouptrackstart.header.error = SA_AIS_OK;
 	}
 	libais_send_response (conn_info, &res_lib_amf_protectiongrouptrackstart,
 		sizeof (struct res_lib_amf_protectiongrouptrackstart));
@@ -4499,7 +4499,7 @@ static int message_handler_req_amf_protectiongrouptrackstop (struct conn_info *c
 	res_lib_amf_protectiongrouptrackstop.header.error = SA_ERR_NOT_EXIST;
 
 	if (track) {
-		res_lib_amf_protectiongrouptrackstop.header.error = SA_OK;
+		res_lib_amf_protectiongrouptrackstop.header.error = SA_AIS_OK;
 	}
 	libais_send_response (conn_info, &res_lib_amf_protectiongrouptrackstop,
 		sizeof (struct res_lib_amf_protectiongrouptrackstop));
@@ -4584,7 +4584,7 @@ static int message_handler_req_amf_stoppingcomplete (struct conn_info *conn_info
 void response_handler_healthcheckcallback (struct conn_info *conn_info,
 	struct req_lib_amf_response *req_lib_amf_response) {
 
-	if (req_lib_amf_response->error == SA_OK) {
+	if (req_lib_amf_response->error == SA_AIS_OK) {
 		log_printf (LOG_LEVEL_DEBUG, "setting healthcheck ok\n");
 		conn_info->component->healthcheck_outstanding = 0;
 	}
@@ -4595,7 +4595,7 @@ static int message_handler_req_lib_amf_componentcapabilitymodelget (struct conn_
 	struct req_lib_amf_componentcapabilitymodelget *req_lib_amf_componentcapabilitymodelget = (struct req_lib_amf_componentcapabilitymodelget *)message;
 	struct res_lib_amf_componentcapabilitymodelget res_lib_amf_componentcapabilitymodelget;
 	struct amf_comp *component;
-	SaErrorT error = SA_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_FROM_LIB, "Handle : message_handler_req_lib_amf_componentcapabilitymodelget()\n");
 

exec/ckpt.c

@@ -1424,7 +1424,7 @@ static int message_handler_req_exec_ckpt_checkpointopen (void *message, struct t
 	struct saCkptCheckpoint *ckptCheckpoint = 0;
 	struct saCkptCheckpointSection *ckptCheckpointSection = 0;
 	struct checkpoint_cleanup *checkpoint_cleanup = 0;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	int proc_index;
 
 	log_printf (LOG_LEVEL_DEBUG, "Executive request to open checkpoint %p\n", req_exec_ckpt_checkpointopen);
@@ -1625,7 +1625,7 @@ static int recovery_checkpoint_open(SaNameT *checkpointName,
 	int i;	
 	struct saCkptCheckpoint *ckptCheckpoint = 0;
 	struct saCkptCheckpointSection *ckptCheckpointSection = 0;
-	SaErrorT error = SA_AIS_OK;	
+	SaAisErrorT error = SA_AIS_OK;	
 
 	log_printf (LOG_LEVEL_DEBUG, "CKPT: recovery_checkpoint_open %s\n", &checkpointName->value);
 	log_printf (LOG_LEVEL_DEBUG, "CKPT: recovery_checkpoint_open refcount Values\n");
@@ -1981,7 +1981,7 @@ static int message_handler_req_exec_ckpt_checkpointunlink (void *message, struct
 	struct req_lib_ckpt_checkpointunlink *req_lib_ckpt_checkpointunlink = (struct req_lib_ckpt_checkpointunlink *)&req_exec_ckpt_checkpointunlink->req_lib_ckpt_checkpointunlink;
 	struct res_lib_ckpt_checkpointunlink res_lib_ckpt_checkpointunlink;
 	struct saCkptCheckpoint *ckptCheckpoint = 0;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	
 	log_printf (LOG_LEVEL_DEBUG, "Got EXEC request to unlink checkpoint %p\n", req_exec_ckpt_checkpointunlink);
 	ckptCheckpoint = ckpt_checkpoint_find_global (&req_lib_ckpt_checkpointunlink->checkpointName);
@@ -2104,7 +2104,7 @@ static int recovery_section_create (SaCkptSectionDescriptorT *sectionDescriptor,
 	void *initialData;
 	void *sectionId;
 	struct ckpt_identifier *ckpt_id = 0;
-	SaErrorT error = SA_AIS_OK;		
+	SaAisErrorT error = SA_AIS_OK;		
 	
 	if ((int)sectionDescriptor->sectionId.idLen) {
 		log_printf (LOG_LEVEL_DEBUG, "CKPT: recovery_section_create for checkpoint %s, section %s.\n",
@@ -2249,7 +2249,7 @@ static int message_handler_req_exec_ckpt_sectioncreate (void *message, struct to
 	void *initialData;
 	void *sectionId;
 	struct ckpt_identifier *ckpt_id = 0;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_DEBUG, "Executive request to create a checkpoint section.\n");
 	ckptCheckpoint = ckpt_checkpoint_find_global (&req_exec_ckpt_sectioncreate->checkpointName);
@@ -2385,7 +2385,7 @@ static int message_handler_req_exec_ckpt_sectiondelete (void *message, struct to
 	struct res_lib_ckpt_sectiondelete res_lib_ckpt_sectiondelete;
 	struct saCkptCheckpoint *ckptCheckpoint;
 	struct saCkptCheckpointSection *ckptCheckpointSection;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	ckptCheckpoint = ckpt_checkpoint_find_global (&req_exec_ckpt_sectiondelete->checkpointName);
 	if (ckptCheckpoint == 0) {
@@ -2449,7 +2449,7 @@ static int message_handler_req_exec_ckpt_sectionexpirationtimeset (void *message
 	struct saCkptCheckpoint *ckptCheckpoint;
 	struct saCkptCheckpointSection *ckptCheckpointSection;
 	struct ckpt_identifier *ckpt_id = 0;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_DEBUG, "Executive request to set section expiratoin time\n");
 	ckptCheckpoint = ckpt_checkpoint_find_global (&req_exec_ckpt_sectionexpirationtimeset->checkpointName);
@@ -2531,7 +2531,7 @@ static int recovery_section_write(int sectionIdLen,
 	struct saCkptCheckpoint *ckptCheckpoint;
 	struct saCkptCheckpointSection *ckptCheckpointSection;
 	int sizeRequired;	
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	char *sd;	
 	
 	log_printf (LOG_LEVEL_DEBUG, "CKPT: recovery_section_write.\n");
@@ -2587,7 +2587,7 @@ static int message_handler_req_exec_ckpt_sectionwrite (void *message, struct tot
 	struct saCkptCheckpointSection *ckptCheckpointSection = 0;
 	int sizeRequired;
 	void *sectionData;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_DEBUG, "Executive request to section write.\n");
 	ckptCheckpoint = ckpt_checkpoint_find_global (&req_exec_ckpt_sectionwrite->checkpointName);
@@ -2683,7 +2683,7 @@ static int message_handler_req_exec_ckpt_sectionoverwrite (void *message, struct
 	struct saCkptCheckpoint *ckptCheckpoint;
 	struct saCkptCheckpointSection *ckptCheckpointSection;
 	void *sectionData;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_DEBUG, "Executive request to section overwrite.\n");
 	ckptCheckpoint = ckpt_checkpoint_find_global (&req_exec_ckpt_sectionoverwrite->checkpointName);
@@ -2759,7 +2759,7 @@ static int message_handler_req_exec_ckpt_sectionread (void *message, struct tote
 	struct saCkptCheckpoint *ckptCheckpoint;
 	struct saCkptCheckpointSection *ckptCheckpointSection = 0;
 	int sectionSize = 0;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_DEBUG, "Executive request for section read.\n");
 
@@ -3533,7 +3533,7 @@ static int message_handler_req_lib_ckpt_sectioniterationinitialize (struct conn_
 	struct list_head *checkpoint_section_list;
 	int addEntry = 0;
 	int iteratorEntries = 0;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	log_printf (LOG_LEVEL_DEBUG, "section iterator initialize\n");
 	ckptSectionIterator = &conn_info->ais_ci.u.libckpt_ci.sectionIterator;
@@ -3600,7 +3600,7 @@ static int message_handler_req_lib_ckpt_sectioniterationfinalize (struct conn_in
 	struct req_lib_ckpt_sectioniterationfinalize *req_lib_ckpt_sectioniterationfinalize = (struct req_lib_ckpt_sectioniterationfinalize *)message;
 	struct res_lib_ckpt_sectioniterationfinalize res_lib_ckpt_sectioniterationfinalize;
 	struct saCkptCheckpoint *ckptCheckpoint;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	ckptCheckpoint = ckpt_checkpoint_find_global (&req_lib_ckpt_sectioniterationfinalize->checkpointName);
 	if (ckptCheckpoint == 0) {
@@ -3629,7 +3629,7 @@ static int message_handler_req_lib_ckpt_sectioniteratornext (struct conn_info *c
 	struct req_lib_ckpt_sectioniteratornext *req_lib_ckpt_sectioniteratornext = (struct req_lib_ckpt_sectioniteratornext *)message;
 	struct res_lib_ckpt_sectioniteratornext res_lib_ckpt_sectioniteratornext;
 	struct saCkptSectionIterator *ckptSectionIterator;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	int sectionIdSize = 0;
 	int iteratorPos = 0;
 

exec/clm.c

@@ -310,7 +310,7 @@ void library_notification_send (SaClmClusterNotificationT *cluster_notification_
 
 	res_lib_clm_clustertrack.header.size = sizeof (struct res_lib_clm_clustertrack);
 	res_lib_clm_clustertrack.header.id = MESSAGE_RES_CLM_TRACKCALLBACK;
-	res_lib_clm_clustertrack.header.error = SA_OK;
+	res_lib_clm_clustertrack.header.error = SA_AIS_OK;
 	res_lib_clm_clustertrack.view = view_current;
 
     for (list = library_notification_send_listhead.next;
@@ -656,7 +656,7 @@ static int message_handler_req_lib_clm_trackstop (struct conn_info *conn_info, v
 	res_lib_clm_trackstop.header.id = MESSAGE_RES_CLM_TRACKSTOP;
 
 	if (conn_info->conn_info_partner->ais_ci.u.libclm_ci.tracking_enabled) {
-		res_lib_clm_trackstop.header.error = SA_OK;
+		res_lib_clm_trackstop.header.error = SA_AIS_OK;
 	} else {
 		res_lib_clm_trackstop.header.error = SA_AIS_ERR_NOT_EXIST;
 	}
@@ -697,7 +697,7 @@ static int message_handler_req_lib_clm_nodeget (struct conn_info *conn_info, voi
 
 	res_clm_nodeget.header.size = sizeof (struct res_clm_nodeget);
 	res_clm_nodeget.header.id = MESSAGE_RES_CLM_NODEGET;
-	res_clm_nodeget.header.error = SA_OK;
+	res_clm_nodeget.header.error = SA_AIS_OK;
 	res_clm_nodeget.invocation = req_lib_clm_nodeget->invocation;
 	res_clm_nodeget.valid = valid;
 	if (valid) {
@@ -737,7 +737,7 @@ static int message_handler_req_lib_clm_nodegetasync (struct conn_info *conn_info
 	 */
 	res_clm_nodegetasync.header.size = sizeof (struct res_clm_nodegetasync);
 	res_clm_nodegetasync.header.id = MESSAGE_RES_CLM_NODEGETASYNC;
-	res_clm_nodegetasync.header.error = SA_OK;
+	res_clm_nodegetasync.header.error = SA_AIS_OK;
 	libais_send_response (conn_info, &res_clm_nodegetasync,
 		sizeof (struct res_clm_nodegetasync));
 

exec/evs.c

@@ -220,7 +220,7 @@ static int evs_confchg_fn (
 	 */
 	res_evs_confchg_callback.header.size = sizeof (struct res_evs_confchg_callback);
 	res_evs_confchg_callback.header.id = MESSAGE_RES_EVS_CONFCHG_CALLBACK;
-	res_evs_confchg_callback.header.error = SA_OK;
+	res_evs_confchg_callback.header.error = SA_AIS_OK;
 
 	for (i = 0; i < member_list_entries; i++) {
 		totemip_copy((struct totem_ip_address *)&res_evs_confchg_callback.member_list[i],
@@ -285,7 +285,7 @@ static int message_handler_req_evs_join (struct conn_info *conn_info, void *mess
 		(conn_info->conn_info_partner->ais_ci.u.libevs_ci.group_entries +
 		req_lib_evs_join->group_entries));
 	if (addr == 0) {
-		error = SA_ERR_NO_MEMORY;
+		error = SA_AIS_ERR_NO_MEMORY;
 		goto exit_error;
 	}
 	conn_info->conn_info_partner->ais_ci.u.libevs_ci.groups = addr;
@@ -489,7 +489,7 @@ static int message_handler_req_exec_mcast (void *message, struct totem_ip_addres
 	res_evs_deliver_callback.header.size = sizeof (struct res_evs_deliver_callback) +
 		req_exec_evs_mcast->msg_len;
 	res_evs_deliver_callback.header.id = MESSAGE_RES_EVS_DELIVER_CALLBACK;
-	res_evs_deliver_callback.header.error = SA_OK;
+	res_evs_deliver_callback.header.error = SA_AIS_OK;
 	res_evs_deliver_callback.msglen = req_exec_evs_mcast->msg_len;
 
 	msg_addr = (char *)req_exec_evs_mcast + sizeof (struct req_exec_evs_mcast) + 

exec/evt.c

@@ -621,7 +621,7 @@ DECLARE_LIST_INIT(mnd);
  * Take the filters we received from the application via the library and 
  * make them into a real SaEvtEventFilterArrayT
  */
-static SaErrorT evtfilt_to_aisfilt(struct req_evt_event_subscribe *req,
+static SaAisErrorT evtfilt_to_aisfilt(struct req_evt_event_subscribe *req,
 		SaEvtEventFilterArrayT **evtfilters)
 {
 
@@ -1129,13 +1129,13 @@ static int remove_open_count(
 /*
  * Send a request to open a channel to the rest of the cluster.
  */
-static SaErrorT evt_open_channel(SaNameT *cn, SaUint8T flgs)
+static SaAisErrorT evt_open_channel(SaNameT *cn, SaUint8T flgs)
 {
 	struct req_evt_chan_command cpkt;
 	struct event_svr_channel_instance *eci;
 	struct iovec chn_iovec;
 	int res;
-	SaErrorT ret;
+	SaAisErrorT ret;
 
 	ret = SA_AIS_OK;
 
@@ -1180,12 +1180,12 @@ chan_open_end:
 /*
  * Send a request to close a channel with the rest of the cluster.
  */
-static SaErrorT evt_close_channel(SaNameT *cn, uint64_t unlink_id)
+static SaAisErrorT evt_close_channel(SaNameT *cn, uint64_t unlink_id)
 {
 	struct req_evt_chan_command cpkt;
 	struct iovec chn_iovec;
 	int res;
-	SaErrorT ret;
+	SaAisErrorT ret;
 
 	ret = SA_AIS_OK;
 
@@ -1257,12 +1257,12 @@ evt_find_node(struct totem_ip_address *addr)
 	return *nlp;
 }
 
-static SaErrorT
+static SaAisErrorT
 evt_add_node(struct totem_ip_address *addr, SaClmClusterNodeT *cn) 
 {
 	struct member_node_data **nlp;
 	struct member_node_data *nl;
-	SaErrorT err = SA_AIS_ERR_EXIST;
+	SaAisErrorT err = SA_AIS_ERR_EXIST;
 
 	nlp = lookup_node(addr);
 
@@ -1375,9 +1375,9 @@ static int check_last_event(struct lib_event_data *evtpkt,
  * upper 32 bits of the event ID to make sure that we can generate a cluster
  * wide unique event ID for a given event.
  */
-SaErrorT set_event_id(SaClmNodeIdT node_id)
+SaAisErrorT set_event_id(SaClmNodeIdT node_id)
 {
-	SaErrorT err = SA_AIS_OK;
+	SaAisErrorT err = SA_AIS_OK;
 	if (base_id_top) {
 		err =  SA_AIS_ERR_EXIST;
 	}
@@ -1404,7 +1404,7 @@ static int id_in_use(uint64_t id, uint64_t base)
 	return 0;
 }
 
-static SaErrorT get_event_id(uint64_t *event_id, uint64_t *msg_id)
+static SaAisErrorT get_event_id(uint64_t *event_id, uint64_t *msg_id)
 {
 	/*
 	 * Don't reuse an event ID if it is still valid because of 
@@ -1585,7 +1585,7 @@ evt_already_delivered(struct event_data *evt,
  * Compare a filter to a given pattern.
  * return SA_AIS_OK if the pattern matches a filter
  */
-static SaErrorT
+static SaAisErrorT
 filter_match(SaEvtEventPatternT *ep, SaEvtEventFilterT *ef)
 {
 	int ret;
@@ -1634,14 +1634,14 @@ filter_match(SaEvtEventPatternT *ep, SaEvtEventFilterT *ef)
  * compare the event's patterns with the subscription's filter rules.
  * SA_AIS_OK is returned if the event matches the filter rules.
  */
-static SaErrorT
+static SaAisErrorT
 event_match(struct event_data *evt, 
 			struct event_svr_channel_subscr *ecs)
 {
 	SaEvtEventFilterT *ef;
 	SaEvtEventPatternT *ep;
 	uint32_t filt_count;
-	SaErrorT ret =  SA_AIS_OK;
+	SaAisErrorT ret =  SA_AIS_OK;
 	int i;
 
 	ep = (SaEvtEventPatternT *)(&evt->ed_event.led_body[0]);
@@ -2109,7 +2109,7 @@ static int evt_initialize(struct conn_info *conn_info)
  */
 static int lib_evt_open_channel(struct conn_info *conn_info, void *message)
 {
-	SaErrorT error;
+	SaAisErrorT error;
 	struct req_evt_channel_open *req;
 	struct res_evt_channel_open res;
 	struct open_chan_pending *ocp;
@@ -2187,7 +2187,7 @@ open_return:
 static int lib_evt_open_channel_async(struct conn_info *conn_info, 
 		void *message)
 {
-	SaErrorT error;
+	SaAisErrorT error;
 	struct req_evt_channel_open *req;
 	struct res_evt_channel_open res;
 	struct open_chan_pending *ocp;
@@ -2247,7 +2247,7 @@ open_return:
  * Used by the channel close code and by the implicit close
  * when saEvtFinalize is called with channels open.
  */
-static SaErrorT
+static SaAisErrorT
 common_chan_close(struct event_svr_channel_open	*eco, struct libevt_ci *esip)
 {
 	struct event_svr_channel_subscr *ecs;
@@ -2432,7 +2432,7 @@ static int lib_evt_event_subscribe(struct conn_info *conn_info, void *message)
 	struct req_evt_event_subscribe *req;
 	struct res_evt_event_subscribe res;
 	SaEvtEventFilterArrayT *filters;
-	SaErrorT error;
+	SaAisErrorT error;
 	struct event_svr_channel_open	*eco;
 	struct event_svr_channel_instance *eci;
 	struct event_svr_channel_subscr *ecs;
@@ -2555,7 +2555,7 @@ static int lib_evt_event_unsubscribe(struct conn_info *conn_info,
 	struct event_svr_channel_instance *eci;
 	struct event_svr_channel_subscr *ecs;
 	struct libevt_ci *esip = &conn_info->ais_ci.u.libevt_ci;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	unsigned int ret;
 	void *ptr;
 
@@ -2623,7 +2623,7 @@ static int lib_evt_event_publish(struct conn_info *conn_info, void *message)
 	struct event_svr_channel_instance *eci;
 	SaEvtEventIdT event_id = 0;
 	uint64_t msg_id = 0;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	struct iovec pub_iovec;
 	void *ptr;
 	int result;
@@ -3351,7 +3351,7 @@ static void evt_chan_open_finish(struct open_chan_pending *ocp,
 {
 	uint32_t handle;
 	struct event_svr_channel_open *eco;
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	struct libevt_ci *esip = &ocp->ocp_conn_info->ais_ci.u.libevt_ci;
 	unsigned int ret = 0;
 	unsigned int timer_del_status;

exec/main.c

@@ -594,14 +594,14 @@ retry_accept:
 
 static int dispatch_init_send_response (struct conn_info *conn_info, void *message)
 {
-	SaErrorT error = SA_ERR_ACCESS;
+	SaAisErrorT error = SA_AIS_ERR_ACCESS;
 	struct req_lib_dispatch_init *req_lib_dispatch_init = (struct req_lib_dispatch_init *)message;
 	struct res_lib_dispatch_init res_lib_dispatch_init;
 	struct conn_info *msg_conn_info;
 
 	if (conn_info->authenticated) {
 		conn_info->service = req_lib_dispatch_init->resdis_header.service;
-		error = SA_OK;
+		error = SA_AIS_OK;
 
 		conn_info->conn_info_partner = (struct conn_info *)req_lib_dispatch_init->conn_info;
 
@@ -616,7 +616,7 @@ static int dispatch_init_send_response (struct conn_info *conn_info, void *messa
 	libais_send_response (conn_info, &res_lib_dispatch_init,
 		sizeof (res_lib_dispatch_init));
 
-	if (error == SA_ERR_ACCESS) {
+	if (error == SA_AIS_ERR_ACCESS) {
 		return (-1);
 	}
 
@@ -627,13 +627,13 @@ static int dispatch_init_send_response (struct conn_info *conn_info, void *messa
 
 static int response_init_send_response (struct conn_info *conn_info, void *message)
 {
-	SaErrorT error = SA_ERR_ACCESS;
+	SaAisErrorT error = SA_AIS_ERR_ACCESS;
 	struct req_lib_response_init *req_lib_response_init = (struct req_lib_response_init *)message;
 	struct res_lib_response_init res_lib_response_init;
 
 	if (conn_info->authenticated) {
 		conn_info->service = req_lib_response_init->resdis_header.service;
-		error = SA_OK;
+		error = SA_AIS_OK;
 	}
 	res_lib_response_init.header.size = sizeof (struct res_lib_response_init);
 	res_lib_response_init.header.id = MESSAGE_RES_INIT;
@@ -643,7 +643,7 @@ static int response_init_send_response (struct conn_info *conn_info, void *messa
 	libais_send_response (conn_info, &res_lib_response_init,
 		sizeof (res_lib_response_init));
 
-	if (error == SA_ERR_ACCESS) {
+	if (error == SA_AIS_ERR_ACCESS) {
 		return (-1);
 	}
 	conn_info->should_exit_fn = 0;
@@ -808,7 +808,7 @@ retry_recv:
 					ais_service_handlers[service]->libais_handlers[header->id].response_size;
 				res_overlay.header.id = 
 					ais_service_handlers[service]->libais_handlers[header->id].response_id;
-				res_overlay.header.error = SA_ERR_TRY_AGAIN;
+				res_overlay.header.error = SA_AIS_ERR_TRY_AGAIN;
 				libais_send_response (conn_info, &res_overlay,
 					res_overlay.header.size);
 			}

include/ipc_amf.h

@@ -220,7 +220,7 @@ struct res_lib_amf_componenterrorclear {
 struct req_lib_amf_response {
 	struct req_header header;
 	SaInvocationT invocation;
-	SaErrorT error;
+	SaAisErrorT error;
 };
 
 struct res_lib_amf_response {

include/ipc_clm.h

@@ -71,7 +71,7 @@ struct res_lib_clm_clustertrack {
 struct req_lib_clm_trackstop {
 	struct req_header header;
 	SaSizeT dataRead;
-	SaErrorT error;
+	SaAisErrorT error;
 };
 
 struct res_lib_clm_trackstop {

include/saAis.h

@@ -90,37 +90,6 @@ typedef enum {
 	SA_DISPATCH_BLOCKING = 3
 } SaDispatchFlagsT;
 
-typedef enum {
-	SA_OK = 1,
-	SA_ERR_LIBRARY = 2,
-	SA_ERR_VERSION = 3,
-	SA_ERR_INIT = 4,
-	SA_ERR_TIMEOUT = 5,
-	SA_ERR_TRY_AGAIN = 6,
-	SA_ERR_INVALID_PARAM = 7,
-	SA_ERR_NO_MEMORY = 8,
-	SA_ERR_BAD_HANDLE = 9,
-	SA_ERR_BUSY = 10,
-	SA_ERR_ACCESS = 11,
-	SA_ERR_NOT_EXIST = 12,
-	SA_ERR_NAME_TOO_LONG = 13,
-	SA_ERR_EXIST = 14,
-	SA_ERR_NO_SPACE = 15,
-	SA_ERR_INTERRUPT = 16,
-	SA_ERR_SYSTEM = 17,
-	SA_ERR_NAME_NOT_FOUND = 18,
-	SA_ERR_NO_RESOURCES = 19,
-	SA_ERR_NOT_SUPPORTED = 20,
-	SA_ERR_BAD_OPERATION = 21,
-	SA_ERR_FAILED_OPERATION = 22,
-	SA_ERR_MESSAGE_ERROR = 23,
-	SA_ERR_NO_MESSAGE = 24,
-	SA_ERR_QUEUE_FULL = 25,
-	SA_ERR_QUEUE_NOT_AVAILABLE = 26,
-	SA_ERR_BAD_CHECKPOINT = 27,
-	SA_ERR_BAD_FLAGS = 28
-} SaErrorT;
-
 typedef enum {
 	SA_AIS_OK = 1,
 	SA_AIS_ERR_LIBRARY = 2,

lib/amf.c

@@ -109,20 +109,20 @@ saAmfInitialize (
 	SaVersionT *version)
 {
 	struct amfInstance *amfInstance;
-	SaAisErrorT error = SA_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	error = saVersionVerify (&amfVersionDatabase, (SaVersionT *)version);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_no_destroy;
 	}
 	
 	error = saHandleCreate (&amfHandleDatabase, sizeof (struct amfInstance), amfHandle);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_no_destroy;
 	}
 
 	error = saHandleInstanceGet (&amfHandleDatabase, *amfHandle, (void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_destroy;
 	}
 
@@ -132,7 +132,7 @@ saAmfInitialize (
 	
 	error = saServiceConnectTwo (&amfInstance->response_fd,
 		&amfInstance->dispatch_fd, AMF_SERVICE);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_put_destroy;
 	}
 
@@ -144,7 +144,7 @@ saAmfInitialize (
 
 	saHandleInstancePut (&amfHandleDatabase, *amfHandle);
 
-	return (SA_OK);
+	return (SA_AIS_OK);
 
 error_put_destroy:
 	saHandleInstancePut (&amfHandleDatabase, *amfHandle);
@@ -163,14 +163,14 @@ saAmfSelectionObjectGet (
 	SaAisErrorT error;
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle, (void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
 	*selectionObject = amfInstance->dispatch_fd;
 
 	saHandleInstancePut (&amfHandleDatabase, amfHandle);
-	return (SA_OK);
+	return (SA_AIS_OK);
 }
 
 SaAisErrorT
@@ -198,7 +198,7 @@ saAmfDispatch (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -218,14 +218,14 @@ saAmfDispatch (
 		ufds.revents = 0;
 
 		error = saPollRetry (&ufds, 1, timeout);
-		if (error != SA_OK) {
+		if (error != SA_AIS_OK) {
 			goto error_nounlock;
 		}
 
 		pthread_mutex_lock (&amfInstance->dispatch_mutex);
 
 		error = saPollRetry (&ufds, 1, 0);
-		if (error != SA_OK) {
+		if (error != SA_AIS_OK) {
 			goto error_nounlock;
 		}
 
@@ -233,7 +233,7 @@ saAmfDispatch (
 		 * Handle has been finalized in another thread
 		 */
 		if (amfInstance->finalize == 1) {
-			error = SA_OK;
+			error = SA_AIS_OK;
 			pthread_mutex_unlock (&amfInstance->dispatch_mutex);
 			goto error_unlock;
 		}
@@ -254,14 +254,14 @@ saAmfDispatch (
 			 */
 			error = saRecvRetry (amfInstance->dispatch_fd, &dispatch_data.header,
 				sizeof (struct res_header), MSG_WAITALL | MSG_NOSIGNAL);
-			if (error != SA_OK) {
+			if (error != SA_AIS_OK) {
 				goto error_unlock;
 			}
 			if (dispatch_data.header.size > sizeof (struct res_header)) {
 				error = saRecvRetry (amfInstance->dispatch_fd, &dispatch_data.data,
 					dispatch_data.header.size - sizeof (struct res_header),
 					MSG_WAITALL | MSG_NOSIGNAL);
-				if (error != SA_OK) {
+				if (error != SA_AIS_OK) {
 					goto error_unlock;
 				}
 			}
@@ -332,7 +332,7 @@ saAmfDispatch (
 #endif
 			break;
 		default:
-			error = SA_ERR_LIBRARY;	
+			error = SA_AIS_ERR_LIBRARY;	
 			goto error_nounlock;
 			break;
 		}
@@ -365,7 +365,7 @@ saAmfFinalize (
 	SaAisErrorT error;
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle, (void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -380,7 +380,7 @@ saAmfFinalize (
 		pthread_mutex_unlock (&amfInstance->response_mutex);
 		pthread_mutex_unlock (&amfInstance->dispatch_mutex);
 		saHandleInstancePut (&amfHandleDatabase, amfHandle);
-		return (SA_ERR_BAD_HANDLE);
+		return (SA_AIS_ERR_BAD_HANDLE);
 	}
 
 	amfInstance->finalize = 1;
@@ -418,7 +418,7 @@ saAmfComponentRegister (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -466,7 +466,7 @@ saAmfComponentUnregister (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -508,7 +508,7 @@ saAmfComponentNameGet (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -549,7 +549,7 @@ saAmfPmStart (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -591,7 +591,7 @@ saAmfPmStop (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -633,7 +633,7 @@ saAmfHealthcheckStart (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -675,7 +675,7 @@ saAmfHealthcheckConfirm (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -715,7 +715,7 @@ saAmfHealthcheckStop (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -795,7 +795,7 @@ saAmfCSIQuiescingComplete (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -840,7 +840,7 @@ saAmfProtectionGroupTrackStart (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -871,7 +871,7 @@ saAmfProtectionGroupTrackStop (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -909,7 +909,7 @@ saAmfComponentErrorReport (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -949,7 +949,7 @@ saAmfComponentErrorClear (
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -983,7 +983,7 @@ saAmfResponse (
 
 	errorResult = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
-	if (errorResult != SA_OK) {
+	if (errorResult != SA_AIS_OK) {
 		return (error);
 	}
 

lib/ckpt.c

@@ -1562,11 +1562,11 @@ saCkptSectionOverwrite (
 	struct res_lib_ckpt_sectionoverwrite res_lib_ckpt_sectionoverwrite;
 
 	if (dataBuffer == NULL) {
-		return (SA_ERR_INVALID_PARAM);
+		return (SA_AIS_ERR_INVALID_PARAM);
 	}
 
 	if (sectionId == NULL) {
-		return (SA_ERR_INVALID_PARAM);
+		return (SA_AIS_ERR_INVALID_PARAM);
 	}
 
 	error = saHandleInstanceGet (&checkpointHandleDatabase, checkpointHandle,

lib/clm.c

@@ -327,7 +327,7 @@ saClmDispatch (
 			break;
 
 		default:
-			error = SA_ERR_LIBRARY;
+			error = SA_AIS_ERR_LIBRARY;
 			goto error_put;
 			break;
 		}
@@ -377,7 +377,7 @@ saClmFinalize (
 	if (clmInstance->finalize) {
 		pthread_mutex_unlock (&clmInstance->response_mutex);
 		saHandleInstancePut (&clmHandleDatabase, clmHandle);
-		return (SA_ERR_BAD_HANDLE);
+		return (SA_AIS_ERR_BAD_HANDLE);
 	}
 
 	clmInstance->finalize = 1;

lib/evs.c

@@ -80,23 +80,23 @@ evs_error_t evs_initialize (
 	evs_handle_t *handle,
 	evs_callbacks_t *callbacks)
 {
-	SaErrorT error;
+	SaAisErrorT error;
 	struct evs_inst *evs_inst;
 
 	error = saHandleCreate (&evs_handle_t_db, sizeof (struct evs_inst), handle);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_no_destroy;
 	}
 
 	error = saHandleInstanceGet (&evs_handle_t_db, *handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_destroy;
 	}
 
 	error = saServiceConnectTwo (&evs_inst->response_fd,
 		&evs_inst->dispatch_fd,
 		EVS_SERVICE);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_put_destroy;
 	}
 
@@ -108,7 +108,7 @@ evs_error_t evs_initialize (
 
 	saHandleInstancePut (&evs_handle_t_db, *handle);
 
-	return (SA_OK);
+	return (SA_AIS_OK);
 
 error_put_destroy:
 	saHandleInstancePut (&evs_handle_t_db, *handle);
@@ -122,10 +122,10 @@ evs_error_t evs_finalize (
 	evs_handle_t handle)
 {
 	struct evs_inst *evs_inst;
-	SaErrorT error;
+	SaAisErrorT error;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 //	  TODO is the locking right here
@@ -166,11 +166,11 @@ evs_error_t evs_fd_get (
 	evs_handle_t handle,
 	int *fd)
 {
-	SaErrorT error;
+	SaAisErrorT error;
 	struct evs_inst *evs_inst;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -178,7 +178,7 @@ evs_error_t evs_fd_get (
 
 	saHandleInstancePut (&evs_handle_t_db, handle);
 
-	return (SA_OK);
+	return (SA_AIS_OK);
 }
 
 struct res_overlay {
@@ -192,7 +192,7 @@ evs_error_t evs_dispatch (
 {
 	struct pollfd ufds;
 	int timeout = -1;
-	SaErrorT error;
+	SaAisErrorT error;
 	int cont = 1; /* always continue do loop except when set to 0 */
 	int dispatch_avail;
 	struct evs_inst *evs_inst;
@@ -203,7 +203,7 @@ evs_error_t evs_dispatch (
 	int ignore_dispatch = 0;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -221,7 +221,7 @@ evs_error_t evs_dispatch (
 		ufds.revents = 0;
 
 		error = saPollRetry (&ufds, 1, timeout);
-		if (error != SA_OK) {
+		if (error != SA_AIS_OK) {
 			goto error_nounlock;
 		}
 
@@ -231,7 +231,7 @@ evs_error_t evs_dispatch (
 		 * Regather poll data in case ufds has changed since taking lock
 		 */
 		error = saPollRetry (&ufds, 1, 0);
-		if (error != SA_OK) {
+		if (error != SA_AIS_OK) {
 			goto error_nounlock;
 		}
 
@@ -260,7 +260,7 @@ evs_error_t evs_dispatch (
 			 */
 			error = saRecvRetry (evs_inst->dispatch_fd, &dispatch_data.header,
 				sizeof (struct res_header), MSG_WAITALL | MSG_NOSIGNAL);
-			if (error != SA_OK) {
+			if (error != SA_AIS_OK) {
 				goto error_unlock;
 			}
 			if (dispatch_data.header.size > sizeof (struct res_header)) {
@@ -268,7 +268,7 @@ evs_error_t evs_dispatch (
 					dispatch_data.header.size - sizeof (struct res_header),
 					MSG_WAITALL | MSG_NOSIGNAL);
 
-				if (error != SA_OK) {
+				if (error != SA_AIS_OK) {
 					goto error_unlock;
 				}
 			}
@@ -309,7 +309,7 @@ evs_error_t evs_dispatch (
 			break;
 
 		default:
-			error = SA_ERR_LIBRARY;
+			error = SA_AIS_ERR_LIBRARY;
 			goto error_nounlock;
 			break;
 		}
@@ -353,7 +353,7 @@ evs_error_t evs_join (
 	struct res_lib_evs_join res_lib_evs_join;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -374,7 +374,7 @@ evs_error_t evs_join (
 
 	pthread_mutex_unlock (&evs_inst->response_mutex);
 
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_exit;
 	}
 
@@ -398,7 +398,7 @@ evs_error_t evs_leave (
 	struct res_lib_evs_leave res_lib_evs_leave;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -419,7 +419,7 @@ evs_error_t evs_leave (
 
 	pthread_mutex_unlock (&evs_inst->response_mutex);
 
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_exit;
 	}
 
@@ -446,7 +446,7 @@ evs_error_t evs_mcast_joined (
 	int msg_len = 0;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -472,7 +472,7 @@ evs_error_t evs_mcast_joined (
 
 	pthread_mutex_unlock (&evs_inst->response_mutex);
 
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_exit;
 	}
 
@@ -501,7 +501,7 @@ evs_error_t evs_mcast_groups (
 	int msg_len = 0;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 	for (i = 0; i < iov_len; i++) {
@@ -526,7 +526,7 @@ evs_error_t evs_mcast_groups (
 		&res_lib_evs_mcast_groups, sizeof (struct res_lib_evs_mcast_groups));
 
 	pthread_mutex_unlock (&evs_inst->response_mutex);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_exit;
 	}
 
@@ -551,7 +551,7 @@ evs_error_t evs_membership_get (
 	struct res_lib_evs_membership_get res_lib_evs_membership_get;
 
 	error = saHandleInstanceGet (&evs_handle_t_db, handle, (void *)&evs_inst);
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		return (error);
 	}
 
@@ -568,7 +568,7 @@ evs_error_t evs_membership_get (
 
 	pthread_mutex_unlock (&evs_inst->response_mutex);
 
-	if (error != SA_OK) {
+	if (error != SA_AIS_OK) {
 		goto error_exit;
 	}
 

lib/evt.c

@@ -297,9 +297,9 @@ static void eventHandleInstanceDestructor(void *instance)
 	}
 }
 
-static SaErrorT evt_recv_event(int fd, struct lib_event_data **msg)
+static SaAisErrorT evt_recv_event(int fd, struct lib_event_data **msg)
 {
-	SaErrorT error;
+	SaAisErrorT error;
 	struct res_header hdr;
 	void *data;
 

lib/util.c

@@ -67,7 +67,7 @@ struct saHandle {
 	uint32_t check;
 };
 
-SaErrorT
+SaAisErrorT
 saServiceConnect (
 	int *fdOut,
 	enum service_types service)
@@ -77,7 +77,7 @@ saServiceConnect (
 	struct sockaddr_un address;
 	struct req_lib_response_init req_lib_response_init;
 	struct res_lib_response_init res_lib_response_init;
-	SaErrorT error;
+	SaAisErrorT error;
 	gid_t egid;
 
 	/*
@@ -128,7 +128,7 @@ error_exit:
 	return (error);
 }
 
-SaErrorT
+SaAisErrorT
 saServiceConnectTwo (
 	int *responseOut,
 	int *callbackOut,
@@ -142,7 +142,7 @@ saServiceConnectTwo (
 	struct res_lib_response_init res_lib_response_init;
 	struct req_lib_dispatch_init req_lib_dispatch_init;
 	struct res_lib_dispatch_init res_lib_dispatch_init;
-	SaErrorT error;
+	SaAisErrorT error;
 	gid_t egid;
 
 	/*
@@ -237,14 +237,14 @@ error_exit:
 	return (error);
 }
 
-SaErrorT
+SaAisErrorT
 saRecvRetry (
 	int s,
 	void *msg,
 	size_t len,
 	int flags)
 {
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	int result;
 	struct msghdr msg_recv;
 	struct iovec iov_recv;
@@ -285,14 +285,14 @@ struct res_overlay {
 	char payload[0];
 };
 
-SaErrorT
+SaAisErrorT
 saSendRetry (
 	int s,
 	const void *msg,
 	size_t len,
 	int flags)
 {
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	int result;
 	struct msghdr msg_send;
 	struct iovec iov_send;
@@ -366,12 +366,12 @@ error_exit:
 	return (error);
 }
 
-SaErrorT saSendMsgRetry (
+SaAisErrorT saSendMsgRetry (
         int s,
         struct iovec *iov,
         int iov_len)
 {
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	int result;
 	int total_size = 0;
 	int i;
@@ -469,14 +469,14 @@ error_exit:
 	return (error);
 }
 
-SaErrorT saSendMsgReceiveReply (
+SaAisErrorT saSendMsgReceiveReply (
         int s,
         struct iovec *iov,
         int iov_len,
         void *responseMessage,
         int responseLen)
 {
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	error = saSendMsgRetry (s, iov, iov_len);
 	if (error != SA_AIS_OK) {
@@ -493,14 +493,14 @@ error_exit:
 	return (error);
 }
 
-SaErrorT saSendReceiveReply (
+SaAisErrorT saSendReceiveReply (
         int s,
         void *requestMessage,
         int requestLen,
         void *responseMessage,
         int responseLen)
 {
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 
 	error = saSendRetry (s, requestMessage, requestLen,
 		MSG_NOSIGNAL);
@@ -518,13 +518,13 @@ error_exit:
 	return (error);
 }
 
-SaErrorT
+SaAisErrorT
 saPollRetry (
         struct pollfd *ufds,
         unsigned int nfds,
         int timeout) 
 {
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	int result;
 
 retry_poll:
@@ -540,7 +540,7 @@ retry_poll:
 }
 
 
-SaErrorT
+SaAisErrorT
 saHandleCreate (
 	struct saHandleDatabase *handleDatabase,
 	int instanceSize,
@@ -598,7 +598,7 @@ saHandleCreate (
 }
 
 
-SaErrorT
+SaAisErrorT
 saHandleDestroy (
 	struct saHandleDatabase *handleDatabase,
 	SaUint64T inHandle)
@@ -625,7 +625,7 @@ error_exit:
 }
 
 
-SaErrorT
+SaAisErrorT
 saHandleInstanceGet (
 	struct saHandleDatabase *handleDatabase,
 	SaUint64T inHandle,
@@ -634,7 +634,7 @@ saHandleInstanceGet (
 	uint32_t check = inHandle >> 32;
 	uint32_t handle = inHandle & 0xffffffff;
 
-	SaErrorT error = SA_AIS_OK;
+	SaAisErrorT error = SA_AIS_OK;
 	pthread_mutex_lock (&handleDatabase->mutex);
 
 	if (handle >= (SaUint64T)handleDatabase->handleCount) {
@@ -662,7 +662,7 @@ error_exit:
 }
 
 
-SaErrorT
+SaAisErrorT
 saHandleInstancePut (
 	struct saHandleDatabase *handleDatabase,
 	SaUint64T inHandle)
@@ -696,13 +696,13 @@ error_exit:
 }
 
 
-SaErrorT
+SaAisErrorT
 saVersionVerify (
     struct saVersionDatabase *versionDatabase,
 	SaVersionT *version)
 {
 	int i;
-	SaErrorT error = SA_AIS_ERR_VERSION;
+	SaAisErrorT error = SA_AIS_ERR_VERSION;
 
 	if (version == 0) {
 		return (SA_AIS_ERR_INVALID_PARAM);

lib/util.h

@@ -63,86 +63,86 @@ struct queue {
 	int bytesPerItem;
 };
 
-SaErrorT
+SaAisErrorT
 saServiceConnect (
 	int *fdOut,
 	enum service_types service);
 
-SaErrorT
+SaAisErrorT
 saServiceConnectTwo (
         int *responseOut,
         int *callbackOut,
         enum service_types service);
 
-SaErrorT
+SaAisErrorT
 saRecvRetry (
 	int s,
 	void *msg,
 	size_t len,
 	int flags);
 
-SaErrorT
+SaAisErrorT
 saRecvQueue (
 	int s,
 	void *msg,
 	struct queue *queue,
 	int findMessageId);
 
-SaErrorT
+SaAisErrorT
 saSendRetry (
 	int s,
 	const void *msg,
 	size_t len,
 	int flags);
 
-SaErrorT saSendMsgRetry (
+SaAisErrorT saSendMsgRetry (
 	int s,
 	struct iovec *iov,
 	int iov_len);
 
-SaErrorT saSendMsgReceiveReply (
+SaAisErrorT saSendMsgReceiveReply (
 	int s,
 	struct iovec *iov,
 	int iov_len,
 	void *responseMessage,
 	int responseLen);
 
-SaErrorT saSendReceiveReply (
+SaAisErrorT saSendReceiveReply (
 	int s,
 	void *requestMessage,
 	int requestLen,
 	void *responseMessage,
 	int responseLen);
 
-SaErrorT
+SaAisErrorT
 saPollRetry (
 	struct pollfd *ufds,
 	unsigned int nfds,
 	int timeout);
 
-SaErrorT
+SaAisErrorT
 saHandleCreate (
 	struct saHandleDatabase *handleDatabase,
 	int instanceSize,
 	SaUint64T *handleOut);
 
-SaErrorT
+SaAisErrorT
 saHandleDestroy (
 	struct saHandleDatabase *handleDatabase,
 	SaUint64T handle);
 
-SaErrorT
+SaAisErrorT
 saHandleInstanceGet (
 	struct saHandleDatabase *handleDatabase,
 	SaUint64T handle,
 	void **instance);
 
-SaErrorT
+SaAisErrorT
 saHandleInstancePut (
 	struct saHandleDatabase *handleDatabase,
 	SaUint64T handle);
 
-SaErrorT
+SaAisErrorT
 saVersionVerify (
 	struct saVersionDatabase *versionDatabase,
 	SaVersionT *version);

test/ckptbench.c

@@ -161,7 +161,7 @@ void ckpt_benchmark (SaCkptCheckpointHandleT checkpointHandle,
 {
 	struct timeval tv1, tv2, tv_elapsed;
 	SaUint32T erroroneousVectorIndex = 0;
-	SaErrorT error;
+	SaAisErrorT error;
 	int write_count = 0;
 
 	alarm_notice = 0;
@@ -181,7 +181,7 @@ retry:
 		if (error == SA_AIS_ERR_TRY_AGAIN) {
 			goto retry;
 		}
-		if (error != SA_OK) {
+		if (error != SA_AIS_OK) {
 			printf ("saCkptCheckpointWrite result %d (should be 1)\n", error);
 			exit (1);
 		}
@@ -208,7 +208,7 @@ void sigalrm_handler (int num)
 int main (void) {
 	SaCkptHandleT ckptHandle;
 	SaCkptCheckpointHandleT checkpointHandle;
-	SaErrorT error;
+	SaAisErrorT error;
 	int size;
 	int i;
 	

test/ckptbenchth.c

@@ -166,7 +166,7 @@ void *benchmark_thread (void *arg)
 	SaCkptHandleT ckptHandle;
 	int write_count;
 	int write_size;
-	SaErrorT error;
+	SaAisErrorT error;
 	SaUint32T erroroneousVectorIndex = 0;
 	struct threaddata *td = (struct threaddata *)arg;
 	int ckptinv;
@@ -187,8 +187,8 @@ void *benchmark_thread (void *arg)
 			WriteVectorElements,
 			1,
 			&erroroneousVectorIndex);
-		} while (error == SA_ERR_TRY_AGAIN);
-		if (error != SA_OK) {
+		} while (error == SA_AIS_ERR_TRY_AGAIN);
+		if (error != SA_AIS_OK) {
 			printf ("saCkptCheckpointWrite result %d (should be 1)\n", error);
 			exit (1);
 		}
@@ -242,7 +242,7 @@ SaNameT checkpointName = { 12, "abra\0" };
 int main (void) {
 	SaCkptHandleT ckptHandles[500];
 	SaCkptCheckpointHandleT checkpointHandles[500];
-	SaErrorT error;
+	SaAisErrorT error;
 	int size;
 	int count;
 	int i, j;

test/ckptstress.c

@@ -156,7 +156,7 @@ void *th_dispatch (void *arg)
 	struct thread_data *td = (struct thread_data *)arg;
 	SaCkptHandleT ckptHandle;
 	SaCkptCheckpointHandleT handle;
-	SaErrorT error;
+	SaAisErrorT error;
 	int i;
 	SaUint32T erroroneousVectorIndex = 0;
 
@@ -175,7 +175,7 @@ void *th_dispatch (void *arg)
 			&erroroneousVectorIndex);
 		printf ("Thread %d: Attempt %d: error %d\n",
 			td->thread_no, i, error);
-		if (error != SA_OK) {
+		if (error != SA_AIS_OK) {
 			printf ("Thread %d: Error from write.\n", td->thread_no);
 		}
 	}
@@ -188,7 +188,7 @@ void *th_dispatch (void *arg)
 int main (void) {
 	SaCkptHandleT ckptHandle;
 	SaCkptCheckpointHandleT checkpointHandle;
-	SaErrorT error;
+	SaAisErrorT error;
 	int i;
 	pthread_t dispatch_thread;
 

test/sa_error.c

@@ -35,7 +35,7 @@ const char *sa_error_list[] = {
 	"SA_AIS_ERR_NO_SECTIONS",
 };
 
-int get_sa_error(SaErrorT error, char *str, int len)
+int get_sa_error(SaAisErrorT error, char *str, int len)
 {
 	if (error < SA_AIS_OK || 
 			error > SA_AIS_ERR_NO_SECTIONS || 

test/sa_error.h

@@ -1,4 +1,4 @@
-extern int get_sa_error(SaErrorT error, char *str, int len);
+extern int get_sa_error(SaAisErrorT error, char *str, int len);
 
 extern char *get_sa_error_b (SaAisErrorT error);
 

test/testamf1.c

@@ -79,7 +79,7 @@ void HealthcheckCallback (SaInvocationT invocation,
 	const SaNameT *compName,
 	SaAmfHealthcheckKeyT *healthcheckKey)
 {
-	SaErrorT res;
+	SaAisErrorT res;
 
 	healthcheck_no++;
 /*
@@ -174,7 +174,7 @@ void ProtectionGroupTrackCallback (
 	SaAmfProtectionGroupNotificationT *notificationBuffer,
 	SaUint32T numberOfItems,
 	SaUint32T numberOfMembers,
-	SaErrorT error)
+	SaAisErrorT error)
 {
 	int i;
 

test/testckpt.c

@@ -197,7 +197,7 @@ int main (void) {
 	SaCkptSectionIterationHandleT sectionIterator;
 	SaCkptSectionDescriptorT sectionDescriptor;
 	SaUint32T erroroneousVectorIndex = 0;
-	SaErrorT error;
+	SaAisErrorT error;
 	struct timeval tv_start;
 	struct timeval tv_end;
 	struct timeval tv_elapsed;
@@ -287,7 +287,7 @@ printf ("Please wait, testing expiry of checkpoint sections.\n");
 		ReadVectorElements,
 		1,
 		&erroroneousVectorIndex);
-	} while (error != SA_ERR_NOT_EXIST);
+	} while (error != SA_AIS_ERR_NOT_EXIST);
 	gettimeofday (&tv_end, NULL);
 	timersub (&tv_end, &tv_start, &tv_elapsed);
 	printf ("Elapsed Time to expiry is %ld.%ld (should be about %d seconds)\n", tv_elapsed.tv_sec, tv_elapsed.tv_usec, SECONDS_TO_EXPIRE);
@@ -351,7 +351,7 @@ printf ("Please wait, testing expiry of checkpoint sections.\n");
 		&checkpointStatus);
 	printf ("%s: Get checkpoint status\n",
 		get_test_output (error, SA_AIS_OK));
-	if (error == SA_OK) {
+	if (error == SA_AIS_OK) {
 		printf ("Memory used %d in %d sections.\n", (int)checkpointStatus.memoryUsed,
 			(int)checkpointStatus.numberOfSections);
 	}
@@ -433,7 +433,7 @@ printf ("Please wait, testing expiry of checkpoint sections.\n");
 			WriteVectorElements,
 			2,
 			&erroroneousVectorIndex);
-		if (error != SA_OK) {
+		if (error != SA_AIS_OK) {
 			printf ("Writing checkpoint loop %d\n", ckptinv);
 				printf ("saCkptCheckpointWrite result %d (should be 1)\n", error);
 		}
@@ -454,7 +454,7 @@ printf ("Please wait, testing expiry of checkpoint sections.\n");
 		&checkpointStatus);
 	printf ("%s: get checkpoint status\n",
 		get_test_output (error, SA_AIS_OK));
-	if (error == SA_OK) {
+	if (error == SA_AIS_OK) {
 		printf ("Memory used %d in %d sections.\n",
 			(int)checkpointStatus.memoryUsed,
 			(int)checkpointStatus.numberOfSections);
@@ -474,7 +474,7 @@ printf ("Please wait, testing expiry of checkpoint sections.\n");
 			&sectionDescriptor);
 		printf ("%s: Get next section in iteartion\n",
 			get_test_output (error, SA_AIS_OK));
-		if (error == SA_OK) {
+		if (error == SA_AIS_OK) {
 			printf ("Section '%s' expires %llx size %llu state %x update %llx\n",
 				sectionDescriptor.sectionId.id,
 				(unsigned long long)sectionDescriptor.expirationTime,
@@ -482,7 +482,7 @@ printf ("Please wait, testing expiry of checkpoint sections.\n");
 				sectionDescriptor.sectionState,
 				(unsigned long long)sectionDescriptor.lastUpdate);
 		}
-	} while (error == SA_OK);
+	} while (error == SA_AIS_OK);
 	printf ("The last iteration should fail\n");
 
 	error = saCkptSectionIterationFinalize (sectionIterator);

test/testclm.c

@@ -154,7 +154,7 @@ int main (void) {
 	signal (SIGINT, sigintr_handler);
 
 	result = saClmInitialize (&handle, &callbacks, &version);
-	if (result != SA_OK) {
+	if (result != SA_AIS_OK) {
 		printf ("Could not initialize Cluster Membership API instance error %d\n", result);
 		exit (1);
 	}