From 2f5f08179825c87ffa72cc59b250b20bdef671ef Mon Sep 17 00:00:00 2001
From: Mark Haverkamp <markh@osdl.org>
Date: Tue, 28 Sep 2004 18:29:14 +0000
Subject: [PATCH] Replace SaNameTisNameT with name_match from util.[ch]

(Logical change 1.84)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@308 fd59a12c-fef9-0310-b244-a6a79926bd2f
---
 exec/amf.c  | 9 +++++----
 exec/ckpt.c | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/exec/amf.c b/exec/amf.c
index 1a0aaea0..d3b6669b 100644
--- a/exec/amf.c
+++ b/exec/amf.c
@@ -50,6 +50,7 @@
 #include "gmi.h"
 #include "aispoll.h"
 #include "mempool.h"
+#include "util.h"
 #include "parse.h"
 #include "main.h"
 #include "print.h"
@@ -1417,7 +1418,7 @@ struct saAmfProtectionGroup *findProtectionGroup (
 			AmfProtectionGroup = list_entry (AmfProtectionGroupList,
 				struct saAmfProtectionGroup, saAmfProtectionGroupList);
 
-			if (SaNameTisNameT (csiName, &AmfProtectionGroup->name)) {
+			if (name_match (csiName, &AmfProtectionGroup->name)) {
 				return (AmfProtectionGroup);
 			}
 		}
@@ -1459,7 +1460,7 @@ struct saAmfComponent *findComponentInProtectionGroup (
 			AmfProtectionGroup = list_entry (AmfProtectionGroupList,
 				struct saAmfProtectionGroup, saAmfProtectionGroupList);
 
-			if (SaNameTisNameT (csiName, &AmfProtectionGroup->name)) {
+			if (name_match (csiName, &AmfProtectionGroup->name)) {
 				/*
 				 * Search all components
 				 */
@@ -1470,7 +1471,7 @@ struct saAmfComponent *findComponentInProtectionGroup (
 					AmfComponent = list_entry (AmfComponentList,
 						struct saAmfComponent, saAmfProtectionGroupList);
 
-					if (SaNameTisNameT (compName, &AmfComponent->name)) {
+					if (name_match (compName, &AmfComponent->name)) {
 						found = 1;
 					}
 				}
@@ -2180,7 +2181,7 @@ static int message_handler_req_amf_protectiongrouptrackstop (struct conn_info *c
 	int i;
 
 	for (i = 0; i < conn_info->ais_ci.u.libamf_ci.trackEntries; i++) {
-		if (SaNameTisNameT (&req_amf_protectiongrouptrackstop->csiName,
+		if (name_match (&req_amf_protectiongrouptrackstop->csiName,
 			&conn_info->ais_ci.u.libamf_ci.tracks[i].csiName)) {
 
 			track = &conn_info->ais_ci.u.libamf_ci.tracks[i];
diff --git a/exec/ckpt.c b/exec/ckpt.c
index 61aef4f2..ab0aefb0 100644
--- a/exec/ckpt.c
+++ b/exec/ckpt.c
@@ -50,6 +50,7 @@
 #include "../include/queue.h"
 #include "aispoll.h"
 #include "mempool.h"
+#include "util.h"
 #include "parse.h"
 #include "main.h"
 #include "print.h"
@@ -339,7 +340,7 @@ static struct saCkptCheckpoint *findCheckpoint (SaNameT *name)
         checkpoint = list_entry (checkpointList,
             struct saCkptCheckpoint, list);
 
-		if (SaNameTisNameT (name, &checkpoint->name)) {
+		if (name_match (name, &checkpoint->name)) {
 			return (checkpoint);
 		}
 	}