upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 09:03:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

"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:05:22 +00:00
parent 6bc106bb7e
commit 8db07dbeb9
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/omapi/include/omapi/omapi.h
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: omapi.h,v 1.12 2000/06/23 20:30:27 tale Exp $ */
/* $Id: omapi.h,v 1.13 2000/06/23 21:05:21 tale Exp $ */
/*
* Definitions for the object management API and protocol.
@ -108,8 +108,8 @@ omapi_auth_use(omapi_object_t *manager, const char *name,
* Public functions defined in protocol.c.
*/
isc_result_t
omapi_protocol_connect(omapi_object_t *object, const char *server, int port,
omapi_object_t *authinfo);
omapi_protocol_connect(omapi_object_t *object, const char *server,
in_port_t port, omapi_object_t *authinfo);
void
omapi_protocol_disconnect(omapi_object_t *handle, isc_boolean_t force);
@ -152,7 +152,7 @@ omapi_connection_puthandle(omapi_object_t *connection, omapi_object_t *object);
*/
isc_result_t
omapi_listener_listen(omapi_object_t *mgr, isc_sockaddr_t *addr,
dns_acl_t *acl, int backlog,
dns_acl_t *acl, unsigned int backlog,
isc_taskaction_t destroy_action, void *destroy_arg);
void
@ -220,7 +220,7 @@ omapi_object_register(omapi_objecttype_t **type, const char *name,
isc_result_t ((*create)(omapi_object_t **)),
isc_result_t ((*delete)(omapi_object_t *)));
isc_result_t ((*expunge)(omapi_object_t *)));
isc_result_t
omapi_object_set(omapi_object_t *handle, omapi_string_t *name,

5
lib/omapi/include/omapi/private.h
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: private.h,v 1.19 2000/06/23 20:30:28 tale Exp $ */
/* $Id: private.h,v 1.20 2000/06/23 21:05:22 tale Exp $ */
/*****
***** Private master include file for the OMAPI library.
@ -309,7 +309,8 @@ connection_init(void);
#define connect_toserver omapi__connect_toserver
isc_result_t
connect_toserver(omapi_object_t *connection, const char *server, int port);
connect_toserver(omapi_object_t *connection, const char *server,
in_port_t port);
#define connection_send omapi__connection_send
isc_result_t

14
lib/omapi/object.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: object.c,v 1.18 2000/06/23 20:30:26 tale Exp $ */
/* $Id: object.c,v 1.19 2000/06/23 21:05:20 tale Exp $ */
/* Principal Author: Ted Lemon */
@ -55,7 +55,7 @@ struct omapi_objecttype {
isc_result_t (*create)(omapi_object_t **object);
isc_result_t (*delete)(omapi_object_t *object);
isc_result_t (*expunge)(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 (*delete)(omapi_object_t *))
isc_result_t (*expunge)(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->delete = delete;
t->expunge = expunge;
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_methoddelete(omapi_objecttype_t *type, omapi_object_t *object) {
if (type->delete != NULL)
return ((*(type->delete))(object));
object_methodexpunge(omapi_objecttype_t *type, omapi_object_t *object) {
if (type->expunge != NULL)
return ((*(type->expunge))(object));
else
return (ISC_R_NOTIMPLEMENTED);
}