Commit ccce1cc6 authored by Ted Lemon's avatar Ted Lemon

Change delete to remove for compatibility with C++

parent 0880c73c
...@@ -1654,7 +1654,7 @@ isc_result_t dhcp_lease_lookup (omapi_object_t **, ...@@ -1654,7 +1654,7 @@ isc_result_t dhcp_lease_lookup (omapi_object_t **,
omapi_object_t *, omapi_object_t *); omapi_object_t *, omapi_object_t *);
isc_result_t dhcp_lease_create (omapi_object_t **, isc_result_t dhcp_lease_create (omapi_object_t **,
omapi_object_t *); omapi_object_t *);
isc_result_t dhcp_lease_delete (omapi_object_t *, isc_result_t dhcp_lease_remove (omapi_object_t *,
omapi_object_t *); omapi_object_t *);
#if 0 #if 0
isc_result_t dhcp_group_set_value (omapi_object_t *, omapi_object_t *, isc_result_t dhcp_group_set_value (omapi_object_t *, omapi_object_t *,
...@@ -1688,7 +1688,7 @@ isc_result_t dhcp_host_lookup (omapi_object_t **, ...@@ -1688,7 +1688,7 @@ isc_result_t dhcp_host_lookup (omapi_object_t **,
omapi_object_t *, omapi_object_t *); omapi_object_t *, omapi_object_t *);
isc_result_t dhcp_host_create (omapi_object_t **, isc_result_t dhcp_host_create (omapi_object_t **,
omapi_object_t *); omapi_object_t *);
isc_result_t dhcp_host_delete (omapi_object_t *, isc_result_t dhcp_host_remove (omapi_object_t *,
omapi_object_t *); omapi_object_t *);
isc_result_t dhcp_pool_set_value (omapi_object_t *, omapi_object_t *, isc_result_t dhcp_pool_set_value (omapi_object_t *, omapi_object_t *,
omapi_data_string_t *, omapi_data_string_t *,
...@@ -1705,7 +1705,7 @@ isc_result_t dhcp_pool_lookup (omapi_object_t **, ...@@ -1705,7 +1705,7 @@ isc_result_t dhcp_pool_lookup (omapi_object_t **,
omapi_object_t *, omapi_object_t *); omapi_object_t *, omapi_object_t *);
isc_result_t dhcp_pool_create (omapi_object_t **, isc_result_t dhcp_pool_create (omapi_object_t **,
omapi_object_t *); omapi_object_t *);
isc_result_t dhcp_pool_delete (omapi_object_t *, isc_result_t dhcp_pool_remove (omapi_object_t *,
omapi_object_t *); omapi_object_t *);
isc_result_t dhcp_shared_network_set_value (omapi_object_t *, isc_result_t dhcp_shared_network_set_value (omapi_object_t *,
omapi_object_t *, omapi_object_t *,
......
...@@ -135,7 +135,7 @@ typedef struct __omapi_object_type_t { ...@@ -135,7 +135,7 @@ typedef struct __omapi_object_type_t {
isc_result_t (*lookup) (omapi_object_t **, omapi_object_t *, isc_result_t (*lookup) (omapi_object_t **, omapi_object_t *,
omapi_object_t *); omapi_object_t *);
isc_result_t (*create) (omapi_object_t **, omapi_object_t *); isc_result_t (*create) (omapi_object_t **, omapi_object_t *);
isc_result_t (*delete) (omapi_object_t *, omapi_object_t *); isc_result_t (*remove) (omapi_object_t *, omapi_object_t *);
} omapi_object_type_t; } omapi_object_type_t;
#define OMAPI_OBJECT_PREAMBLE \ #define OMAPI_OBJECT_PREAMBLE \
......
...@@ -650,13 +650,13 @@ isc_result_t omapi_message_process (omapi_object_t *mo, omapi_object_t *po) ...@@ -650,13 +650,13 @@ isc_result_t omapi_message_process (omapi_object_t *mo, omapi_object_t *po)
"no matching handle"); "no matching handle");
} }
if (!object -> type -> delete) if (!object -> type -> remove)
return omapi_protocol_send_status return omapi_protocol_send_status
(po, (omapi_object_t *)0, (po, (omapi_object_t *)0,
ISC_R_NOTIMPLEMENTED, message -> id, ISC_R_NOTIMPLEMENTED, message -> id,
"no delete method for object"); "no remove method for object");
status = (*(object -> type -> delete)) (object, status = (*(object -> type -> remove)) (object,
(omapi_object_t *)0); (omapi_object_t *)0);
omapi_object_dereference (&object, omapi_object_dereference (&object,
"omapi_message_process"); "omapi_message_process");
......
...@@ -161,7 +161,7 @@ isc_result_t omapi_object_type_register (omapi_object_type_t **type, ...@@ -161,7 +161,7 @@ isc_result_t omapi_object_type_register (omapi_object_type_t **type,
isc_result_t (*create) isc_result_t (*create)
(omapi_object_t **, (omapi_object_t **,
omapi_object_t *), omapi_object_t *),
isc_result_t (*delete) isc_result_t (*remove)
(omapi_object_t *, (omapi_object_t *,
omapi_object_t *)) omapi_object_t *))
{ {
...@@ -180,7 +180,7 @@ isc_result_t omapi_object_type_register (omapi_object_type_t **type, ...@@ -180,7 +180,7 @@ isc_result_t omapi_object_type_register (omapi_object_type_t **type,
t -> stuff_values = stuff_values; t -> stuff_values = stuff_values;
t -> lookup = lookup; t -> lookup = lookup;
t -> create = create; t -> create = create;
t -> delete = delete; t -> remove = remove;
t -> next = omapi_object_types; t -> next = omapi_object_types;
omapi_object_types = t; omapi_object_types = t;
if (type) if (type)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: omapi.c,v 1.5 1999/09/16 00:51:27 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: omapi.c,v 1.6 1999/09/16 04:53:38 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
...@@ -54,7 +54,7 @@ void dhcp_db_objects_setup () ...@@ -54,7 +54,7 @@ void dhcp_db_objects_setup ()
dhcp_lease_stuff_values, dhcp_lease_stuff_values,
dhcp_lease_lookup, dhcp_lease_lookup,
dhcp_lease_create, dhcp_lease_create,
dhcp_lease_delete); dhcp_lease_remove);
if (status != ISC_R_SUCCESS) if (status != ISC_R_SUCCESS)
log_fatal ("Can't register lease object type: %s", log_fatal ("Can't register lease object type: %s",
isc_result_totext (status)); isc_result_totext (status));
...@@ -68,7 +68,7 @@ void dhcp_db_objects_setup () ...@@ -68,7 +68,7 @@ void dhcp_db_objects_setup ()
dhcp_host_stuff_values, dhcp_host_stuff_values,
dhcp_host_lookup, dhcp_host_lookup,
dhcp_host_create, dhcp_host_create,
dhcp_host_delete); dhcp_host_remove);
if (status != ISC_R_SUCCESS) if (status != ISC_R_SUCCESS)
log_fatal ("Can't register host object type: %s", log_fatal ("Can't register host object type: %s",
isc_result_totext (status)); isc_result_totext (status));
...@@ -82,7 +82,7 @@ if (status != ISC_R_SUCCESS) ...@@ -82,7 +82,7 @@ if (status != ISC_R_SUCCESS)
dhcp_pool_stuff_values, dhcp_pool_stuff_values,
dhcp_pool_lookup, dhcp_pool_lookup,
dhcp_pool_create, dhcp_pool_create,
dhcp_pool_delete); dhcp_pool_remove);
if (status != ISC_R_SUCCESS) if (status != ISC_R_SUCCESS)
log_fatal ("Can't register pool object type: %s", log_fatal ("Can't register pool object type: %s",
isc_result_totext (status)); isc_result_totext (status));
...@@ -578,7 +578,7 @@ isc_result_t dhcp_lease_create (omapi_object_t **lp, ...@@ -578,7 +578,7 @@ isc_result_t dhcp_lease_create (omapi_object_t **lp,
return ISC_R_NOTIMPLEMENTED; return ISC_R_NOTIMPLEMENTED;
} }
isc_result_t dhcp_lease_delete (omapi_object_t *lp, isc_result_t dhcp_lease_remove (omapi_object_t *lp,
omapi_object_t *id) omapi_object_t *id)
{ {
return ISC_R_NOTIMPLEMENTED; return ISC_R_NOTIMPLEMENTED;
...@@ -1068,7 +1068,7 @@ isc_result_t dhcp_host_create (omapi_object_t **lp, ...@@ -1068,7 +1068,7 @@ isc_result_t dhcp_host_create (omapi_object_t **lp,
"dhcp_host_create"); "dhcp_host_create");
} }
isc_result_t dhcp_host_delete (omapi_object_t *lp, isc_result_t dhcp_host_remove (omapi_object_t *lp,
omapi_object_t *id) omapi_object_t *id)
{ {
struct host_decl *hp; struct host_decl *hp;
...@@ -1212,7 +1212,7 @@ isc_result_t dhcp_pool_create (omapi_object_t **lp, ...@@ -1212,7 +1212,7 @@ isc_result_t dhcp_pool_create (omapi_object_t **lp,
return ISC_R_NOTIMPLEMENTED; return ISC_R_NOTIMPLEMENTED;
} }
isc_result_t dhcp_pool_delete (omapi_object_t *lp, isc_result_t dhcp_pool_remove (omapi_object_t *lp,
omapi_object_t *id) omapi_object_t *id)
{ {
return ISC_R_NOTIMPLEMENTED; return ISC_R_NOTIMPLEMENTED;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment