From 1c12b87999f60ce45a7239ece7a749ddea5826c0 Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Fri, 23 Jun 2000 20:30:28 +0000
Subject: [PATCH] "remove" structure member renamed to "delete" renamed to
 avoid reserved word conflict, and renamed object_methodremove to
 object_methoddelete for consistency

---
 lib/omapi/include/omapi/omapi.h   |  4 ++--
 lib/omapi/include/omapi/private.h |  6 +++---
 lib/omapi/message.c               |  4 ++--
 lib/omapi/object.c                | 14 +++++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/omapi/include/omapi/omapi.h b/lib/omapi/include/omapi/omapi.h
index 787f2fd51c..99358351e7 100644
--- a/lib/omapi/include/omapi/omapi.h
+++ b/lib/omapi/include/omapi/omapi.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: omapi.h,v 1.11 2000/06/22 22:00:12 tale Exp $ */
+/* $Id: omapi.h,v 1.12 2000/06/23 20:30:27 tale Exp $ */
 
 /*
  * Definitions for the object management API and protocol.
@@ -220,7 +220,7 @@ omapi_object_register(omapi_objecttype_t **type, const char *name,
 
 		      isc_result_t	((*create)(omapi_object_t **)),
 
-		      isc_result_t	((*remove)(omapi_object_t *)));
+		      isc_result_t	((*delete)(omapi_object_t *)));
 
 isc_result_t
 omapi_object_set(omapi_object_t *handle, omapi_string_t *name,
diff --git a/lib/omapi/include/omapi/private.h b/lib/omapi/include/omapi/private.h
index 7359cf625b..74f59699ad 100644
--- a/lib/omapi/include/omapi/private.h
+++ b/lib/omapi/include/omapi/private.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: private.h,v 1.18 2000/06/23 20:19:02 tale Exp $ */
+/* $Id: private.h,v 1.19 2000/06/23 20:30:28 tale Exp $ */
 
 /*****
  ***** Private master include file for the OMAPI library.
@@ -405,9 +405,9 @@ object_methodlookup(omapi_objecttype_t *type, omapi_object_t **object,
 isc_result_t
 object_methodcreate(omapi_objecttype_t *type, omapi_object_t **object);
 
-#define object_methodremove omapi__object_methodremove
+#define object_methoddelete omapi__object_methoddelete
 isc_result_t
-object_methodremove(omapi_objecttype_t *type, omapi_object_t *object);
+object_methoddelete(omapi_objecttype_t *type, omapi_object_t *object);
 
 #define object_destroytypes omapi__object_destroytypes
 void
diff --git a/lib/omapi/message.c b/lib/omapi/message.c
index 2dab35f86e..d320470a18 100644
--- a/lib/omapi/message.c
+++ b/lib/omapi/message.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: message.c,v 1.23 2000/06/22 22:00:00 tale Exp $ */
+/* $Id: message.c,v 1.24 2000/06/23 20:30:25 tale Exp $ */
 
 /*
  * Subroutines for dealing with message objects.
@@ -723,7 +723,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
 			return (send_status(po, result, message->id,
 					    "no matching handle"));
 
-		result = object_methodremove(object->type, object);
+		result = object_methoddelete(object->type, object);
 		if (result == ISC_R_NOTIMPLEMENTED)
 			return (send_status(po, ISC_R_NOTIMPLEMENTED,
 					    message->id,
diff --git a/lib/omapi/object.c b/lib/omapi/object.c
index 9ed3b327b0..9da73fa410 100644
--- a/lib/omapi/object.c
+++ b/lib/omapi/object.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: object.c,v 1.17 2000/06/21 22:01:22 tale Exp $ */
+/* $Id: object.c,v 1.18 2000/06/23 20:30:26 tale Exp $ */
 
 /* Principal Author: Ted Lemon */
 
@@ -55,7 +55,7 @@ struct omapi_objecttype {
 
 	isc_result_t		(*create)(omapi_object_t **object);
 
-	isc_result_t		(*remove)(omapi_object_t *object);
+	isc_result_t		(*delete)(omapi_object_t *object);
 };
 
 isc_result_t
@@ -246,7 +246,7 @@ omapi_object_register(omapi_objecttype_t **type, const char *name,
 
 		      isc_result_t (*create)(omapi_object_t **),
 
-		      isc_result_t (*remove)(omapi_object_t *))
+		      isc_result_t (*delete)(omapi_object_t *))
 {
 	omapi_objecttype_t *t;
 
@@ -264,7 +264,7 @@ omapi_object_register(omapi_objecttype_t **type, const char *name,
 	t->stuff_values = stuff_values;
 	t->lookup = lookup;
 	t->create = create;
-	t->remove = remove;
+	t->delete = delete;
 
 	t->next = omapi_object_types;
 	omapi_object_types = t;
@@ -590,9 +590,9 @@ object_methodcreate(omapi_objecttype_t *type, omapi_object_t **object) {
 }
 
 isc_result_t
-object_methodremove(omapi_objecttype_t *type, omapi_object_t *object) {
-	if (type->remove != NULL)
-		return ((*(type->remove))(object));
+object_methoddelete(omapi_objecttype_t *type, omapi_object_t *object) {
+	if (type->delete != NULL)
+		return ((*(type->delete))(object));
 	else
 		return (ISC_R_NOTIMPLEMENTED);
 }