mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

"remove" structure member renamed to "delete" renamed to avoid reserved word

Browse Source 
conflict, and renamed object_methodremove to object_methoddelete for
consistency
This commit is contained in:
David Lawrence
2000-06-23 20:30:28 +00:00
parent 17d91fddb3
commit 1c12b87999
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/omapi/include/omapi/omapi.h
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * 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. * 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 ((*create)(omapi_object_t **)),
isc_result_t ((*remove)(omapi_object_t *))); isc_result_t ((*delete)(omapi_object_t *)));
isc_result_t isc_result_t
omapi_object_set(omapi_object_t *handle, omapi_string_t *name, omapi_object_set(omapi_object_t *handle, omapi_string_t *name,

6
lib/omapi/include/omapi/private.h
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * 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. ***** 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 isc_result_t
object_methodcreate(omapi_objecttype_t *type, omapi_object_t **object); 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 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 #define object_destroytypes omapi__object_destroytypes
void void

4
lib/omapi/message.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * 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. * 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, return (send_status(po, result, message->id,
"no matching handle")); "no matching handle"));
result = object_methodremove(object->type, object); result = object_methoddelete(object->type, object);
if (result == ISC_R_NOTIMPLEMENTED) if (result == ISC_R_NOTIMPLEMENTED)
return (send_status(po, ISC_R_NOTIMPLEMENTED, return (send_status(po, ISC_R_NOTIMPLEMENTED,
message->id, message->id,

14
lib/omapi/object.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * 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 */ /* Principal Author: Ted Lemon */
@@ -55,7 +55,7 @@ struct omapi_objecttype {
isc_result_t (*create)(omapi_object_t **object); 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 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 (*create)(omapi_object_t **),
isc_result_t (*remove)(omapi_object_t *)) isc_result_t (*delete)(omapi_object_t *))
{ {
omapi_objecttype_t *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->stuff_values = stuff_values;
t->lookup = lookup; t->lookup = lookup;
t->create = create; t->create = create;
t->remove = remove; t->delete = delete;
t->next = omapi_object_types; t->next = omapi_object_types;
omapi_object_types = t; omapi_object_types = t;
@@ -590,9 +590,9 @@ object_methodcreate(omapi_objecttype_t *type, omapi_object_t **object) {
} }
isc_result_t isc_result_t
object_methodremove(omapi_objecttype_t *type, omapi_object_t *object) { object_methoddelete(omapi_objecttype_t *type, omapi_object_t *object) {
if (type->remove != NULL) if (type->delete != NULL)
return ((*(type->remove))(object)); return ((*(type->delete))(object));
else else
return (ISC_R_NOTIMPLEMENTED); return (ISC_R_NOTIMPLEMENTED);
} }