ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

"delete" function pointer changed to "expunge" to avoid C++ reserved word

Browse Source 
conflict, and renamed object_methoddelete to object_methodexpunge for
consistency
This commit is contained in:
David Lawrence
2000-06-23 21:28:31 +00:00
parent 0a7c55d181
commit 4b60cab173
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: private.h,v 1.20 2000/06/23 21:05:22 tale Exp $ */
/* $Id: private.h,v 1.21 2000/06/23 21:28:31 tale Exp $ */
/*****
***** Private master include file for the OMAPI library.
@@ -406,9 +406,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_methoddelete omapi__object_methoddelete
#define object_methodexpunge omapi__object_methodexpunge
isc_result_t
object_methoddelete(omapi_objecttype_t *type, omapi_object_t *object);
object_methodexpunge(omapi_objecttype_t *type, omapi_object_t *object);
#define object_destroytypes omapi__object_destroytypes
void

4
lib/omapi/message.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: message.c,v 1.24 2000/06/23 20:30:25 tale Exp $ */
/* $Id: message.c,v 1.25 2000/06/23 21:28:30 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_methoddelete(object->type, object);
result = object_methodexpunge(object->type, object);
if (result == ISC_R_NOTIMPLEMENTED)
return (send_status(po, ISC_R_NOTIMPLEMENTED,
message->id,