Change delete to remove for compatibility with C++

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index bb61d552b8e15969d682e4d3a0e582df4be70f77..4af0cfee227daf544ffeaea2a466f13dee06e5cc 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -1654,7 +1654,7 @@ isc_result_t dhcp_lease_lookup (omapi_object_t **,
                                omapi_object_t *, omapi_object_t *);
 isc_result_t dhcp_lease_create (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 *);
 #if 0
 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 **,
                               omapi_object_t *, omapi_object_t *);
 isc_result_t dhcp_host_create (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 *);
 isc_result_t dhcp_pool_set_value  (omapi_object_t *, omapi_object_t *,
                                   omapi_data_string_t *,
@@ -1705,7 +1705,7 @@ isc_result_t dhcp_pool_lookup (omapi_object_t **,
                               omapi_object_t *, omapi_object_t *);
 isc_result_t dhcp_pool_create (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 *);
 isc_result_t dhcp_shared_network_set_value  (omapi_object_t *,
                                             omapi_object_t *,

diff --git a/includes/omapip/omapip.h b/includes/omapip/omapip.h
index 1425c5e92d4b1b3bcaeb5b4e1f48a5ec917f1c51..dff9bd21984f41ce4b08df18a989e49317d7b310 100644 (file)
--- a/includes/omapip/omapip.h
+++ b/includes/omapip/omapip.h
@@ -135,7 +135,7 @@ typedef struct __omapi_object_type_t {
        isc_result_t (*lookup) (omapi_object_t **, 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;
 
 #define OMAPI_OBJECT_PREAMBLE \

diff --git a/omapip/message.c b/omapip/message.c
index a9695ac24e5c79ed4e2984ddb73b03d4793099d2..8139cbc8093b5069e555ba26bf5ed697b438d13f 100644 (file)
--- a/omapip/message.c
+++ b/omapip/message.c
@@ -650,13 +650,13 @@ isc_result_t omapi_message_process (omapi_object_t *mo, omapi_object_t *po)
                                 "no matching handle");
                }
 
-               if (!object -> type -> delete)
+               if (!object -> type -> remove)
                        return omapi_protocol_send_status
                                (po, (omapi_object_t *)0,
                                 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_dereference (&object,
                                          "omapi_message_process");

diff --git a/omapip/support.c b/omapip/support.c
index 1339e1cac2fe59884c922402793745c70a454ff9..9b4827884e88e1048425efaefa34b6a6325ae7b3 100644 (file)
--- a/omapip/support.c
+++ b/omapip/support.c
@@ -161,7 +161,7 @@ isc_result_t omapi_object_type_register (omapi_object_type_t **type,
                                         isc_result_t (*create)
                                                (omapi_object_t **,
                                                 omapi_object_t *),
-                                        isc_result_t (*delete)
+                                        isc_result_t (*remove)
                                                (omapi_object_t *,
                                                 omapi_object_t *))
 {
@@ -180,7 +180,7 @@ isc_result_t omapi_object_type_register (omapi_object_type_t **type,
        t -> stuff_values = stuff_values;
        t -> lookup = lookup;
        t -> create = create;
-       t -> delete = delete;
+       t -> remove = remove;
        t -> next = omapi_object_types;
        omapi_object_types = t;
        if (type)

diff --git a/server/omapi.c b/server/omapi.c
index 50d01db43a8bca582cb835f22de09324c535e2ee..46814a004f204f2d648f493f27d54810d7c2b95b 100644 (file)
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 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 */
 
 #include "dhcpd.h"
@@ -54,7 +54,7 @@ void dhcp_db_objects_setup ()
                                             dhcp_lease_stuff_values,
                                             dhcp_lease_lookup, 
                                             dhcp_lease_create,
-                                            dhcp_lease_delete);
+                                            dhcp_lease_remove);
        if (status != ISC_R_SUCCESS)
                log_fatal ("Can't register lease object type: %s",
                           isc_result_totext (status));
@@ -68,7 +68,7 @@ void dhcp_db_objects_setup ()
                                             dhcp_host_stuff_values,
                                             dhcp_host_lookup, 
                                             dhcp_host_create,
-                                            dhcp_host_delete);
+                                            dhcp_host_remove);
 if (status != ISC_R_SUCCESS)
                log_fatal ("Can't register host object type: %s",
                           isc_result_totext (status));
@@ -82,7 +82,7 @@ if (status != ISC_R_SUCCESS)
                                             dhcp_pool_stuff_values,
                                             dhcp_pool_lookup, 
                                             dhcp_pool_create,
-                                            dhcp_pool_delete);
+                                            dhcp_pool_remove);
        if (status != ISC_R_SUCCESS)
                log_fatal ("Can't register pool object type: %s",
                           isc_result_totext (status));
@@ -578,7 +578,7 @@ isc_result_t dhcp_lease_create (omapi_object_t **lp,
        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)
 {
        return ISC_R_NOTIMPLEMENTED;
@@ -1068,7 +1068,7 @@ isc_result_t dhcp_host_create (omapi_object_t **lp,
                                       "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)
 {
        struct host_decl *hp;
@@ -1212,7 +1212,7 @@ isc_result_t dhcp_pool_create (omapi_object_t **lp,
        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)
 {
        return ISC_R_NOTIMPLEMENTED;