This patch integrates with the previously posted hdb rework patch.
Regards
-steve
Index: services/evt.c
===================================================================
--- services/evt.c (revision 1721)
+++ services/evt.c (working copy)
@@ -135,7 +135,7 @@
static struct openais_clm_services_api_ver1 *clmapi;
-static unsigned int clm_services_api_handle;
+static hdb_handle_t clm_services_api_handle;
static struct corosync_lib_handler evt_lib_engine[] = {
{
@@ -3120,8 +3120,8 @@
*/
static int evt_exec_init(struct corosync_api_v1 *corosync_api)
{
- unsigned int object_service_handle;
- unsigned int object_find_handle;
+ hdb_handle_t object_service_handle;
+ hdb_handle_t object_find_handle;
char *value;
api = corosync_api;
@@ -3483,7 +3483,7 @@
unsigned int ret = 0;
unsigned int timer_del_status = 0;
void *ptr = 0;
- uint32_t handle = 0;
+ hdb_handle_t handle = 0;
struct libevt_pd *esip;
esip = (struct libevt_pd *)api->ipc_private_data_get(ocp->ocp_conn);
@@ -3517,7 +3517,6 @@
* with this channel open instance.
*/
ret = hdb_handle_create(&esip->esi_hdb, sizeof(*eco), &handle);
-printf ("hdb handle create %p %d\n", &esip->esi_hdb, handle);
if (ret != 0) {
goto open_return;
}
Index: services/amfutil.c
===================================================================
--- services/amfutil.c (revision 1721)
+++ services/amfutil.c (working copy)
@@ -1038,10 +1038,10 @@
/* to be removed... */
int amf_enabled (struct corosync_api_v1 *coroapi)
{
- unsigned int object_service_handle;
+ hdb_handle_t object_service_handle;
char *value;
int enabled = 0;
- unsigned int object_find_handle;
+ hdb_handle_t object_find_handle;
coroapi->object_find_create (
OBJECT_PARENT_HANDLE,
Index: services/ckpt.c
===================================================================
--- services/ckpt.c (revision 1721)
+++ services/ckpt.c (working copy)
@@ -3030,7 +3030,7 @@
struct list_head *section_list;
struct iteration_instance *iteration_instance;
void *iteration_instance_p;
- unsigned int iteration_handle = 0;
+ hdb_handle_t iteration_handle = 0;
int res;
SaAisErrorT error = SA_AIS_OK;
Index: services/tmr.c
===================================================================
--- services/tmr.c (revision 1721)
+++ services/tmr.c (working copy)
@@ -353,7 +353,7 @@
struct timer_instance *timer_instance = NULL;
SaAisErrorT error = SA_AIS_OK;
- unsigned int timer_id;
+ hdb_handle_t timer_id;
struct tmr_pd *tmr_pd = (struct tmr_pd *) api->ipc_private_data_get (conn);
/* DEBUG */
Index: services/openaisparser.c
===================================================================
--- services/openaisparser.c (revision 1721)
+++ services/openaisparser.c (working copy)
@@ -107,7 +107,7 @@
static int parse_section(FILE *fp,
struct objdb_iface_ver0 *objdb,
- unsigned int parent_handle,
+ hdb_handle_t parent_handle,
char **error_string)
{
char line[512];
@@ -135,7 +135,7 @@
/* New section ? */
if ((loc = strstr_rs (line, "{"))) {
- unsigned int new_parent;
+ hdb_handle_t new_parent;
char *section = remove_whitespace(line);
loc--;
Index: services/clm.h
===================================================================
--- services/clm.h (revision 1721)
+++ services/clm.h (working copy)
@@ -44,7 +44,7 @@
static inline struct openais_clm_services_api_ver1 *
openais_clm_services_api_reference (
struct corosync_api_v1 *coroapi,
- unsigned int *handle)
+ hdb_handle_t *handle)
{
static void *clm_services_api_p;
struct openais_clm_services_api_ver1 *return_api;
Index: services/openaisserviceenable.c
===================================================================
--- services/openaisserviceenable.c (revision 1721)
+++ services/openaisserviceenable.c (working copy)
@@ -45,9 +45,9 @@
#include <signal.h>
#include <string.h>
+#include <corosync/engine/objdb.h>
#include <corosync/engine/config.h>
#include <corosync/lcr/lcr_comp.h>
-#include <corosync/engine/objdb.h>
static char error_reason[512];
@@ -71,7 +71,7 @@
char **error_string)
{
unsigned int i;
- unsigned int object_handle;
+ hdb_handle_t object_handle;
for (i = 0; i < sizeof (service_engines) / sizeof (struct service_engine); i++) {
objdb->object_create(OBJECT_PARENT_HANDLE, &object_handle,
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
