mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 06:15:55 +00:00
Code Issues Releases Wiki Activity

Merge changes between 3.0rc7 and 3.0rc8pl2.

Browse Source
This commit is contained in:
Ted Lemon
2001-06-27 00:31:20 +00:00
parent 07b958004f
commit d758ad8cac
99 changed files with 5909 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
omapip/message.c
View File

@@ -230,11 +230,13 @@ isc_result_t omapi_message_destroy (omapi_object_t *h,
if (!m -> prev && omapi_registered_messages != m)
omapi_message_unregister (h);
if (m -> id_object)
omapi_object_dereference ((omapi_object_t **)&m -> id_object,
file, line);
omapi_object_dereference (&m -> id_object, file, line);
if (m -> object)
omapi_object_dereference ((omapi_object_t **)&m -> object,
file, line);
omapi_object_dereference (&m -> object, file, line);
if (m -> notify_object)
omapi_object_dereference (&m -> notify_object, file, line);
if (m -> protocol_object)
omapi_protocol_dereference (&m -> protocol_object, file, line);
return ISC_R_SUCCESS;
}
@@ -384,7 +386,7 @@ isc_result_t omapi_message_process (omapi_object_t *mo, omapi_object_t *po)
dmalloc_outstanding - previous_outstanding,
dmalloc_outstanding, dmalloc_longterm);
#endif
#if (defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL)) && 0
#if defined (DEBUG_MEMORY_LEAKAGE) && 0
dmalloc_dump_outstanding ();
#endif
#if defined (DEBUG_RC_HISTORY_EXHAUSTIVELY) && 0
@@ -545,12 +547,6 @@ omapi_message_process_internal (omapi_object_t *mo, omapi_object_t *po)
"unsearchable object type");
}
if (!message -> object) {
return omapi_protocol_send_status
(po, message -> id_object,
ISC_R_NOTFOUND, message -> id,
"no lookup key specified");
}
status = (*(type -> lookup)) (&object, message -> id_object,
message -> object);