From: Jim Meyering <meyer...@redhat.com>
---
exec/objdb.c | 48 +++++++++++++++++++-------------------
include/corosync/engine/objdb.h | 3 +-
lib/sa-confdb.c | 2 +-
services/confdb.c | 28 +++++++++++-----------
services/testquorum.c | 6 ++--
test/testconfdb.c | 8 +++---
tools/corosync-objctl.c | 8 +++---
7 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/exec/objdb.c b/exec/objdb.c
index 7c4af4d..609fe5d 100644
--- a/exec/objdb.c
+++ b/exec/objdb.c
@@ -48,9 +48,9 @@
struct object_key {
void *key_name;
- int key_len;
+ size_t key_len;
void *value;
- int value_len;
+ size_t value_len;
struct list_head list;
};
@@ -68,7 +68,7 @@ struct object_tracker {
struct object_instance {
void *object_name;
- int object_name_len;
+ size_t object_name_len;
hdb_handle_t object_handle;
hdb_handle_t parent_handle;
struct list_head key_head;
@@ -89,7 +89,7 @@ struct object_find_instance {
struct list_head *find_child_list;
struct list_head *child_head;
void *object_name;
- int object_len;
+ size_t object_len;
};
struct objdb_iface_ver0 objdb_iface;
@@ -225,7 +225,7 @@ static int _object_notify_deleted_children(struct
object_instance *parent_pt)
static void object_created_notification(
hdb_handle_t object_handle,
hdb_handle_t parent_object_handle,
- void *name_pt, int name_len)
+ const void *name_pt, size_t name_len)
{
struct list_head * list;
struct object_instance * obj_pt;
@@ -258,7 +258,7 @@ static void object_created_notification(
static void object_pre_deletion_notification(hdb_handle_t object_handle,
hdb_handle_t parent_object_handle,
- void *name_pt, int name_len)
+ const void *name_pt, size_t name_len)
{
struct list_head * list;
struct object_instance * obj_pt;
@@ -294,8 +294,8 @@ static void object_pre_deletion_notification(hdb_handle_t
object_handle,
}
static void object_key_changed_notification(hdb_handle_t object_handle,
- const void *name_pt, int name_len,
- const void *value_pt, int value_len,
+ const void *name_pt, size_t name_len,
+ const void *value_pt, size_t value_len,
object_change_type_t type)
{
struct list_head * list;
@@ -364,7 +364,7 @@ static int object_create (
hdb_handle_t parent_object_handle,
hdb_handle_t *object_handle,
const void *object_name,
- unsigned int object_name_len)
+ size_t object_name_len)
{
struct object_instance *object_instance;
struct object_instance *parent_instance;
@@ -491,9 +491,9 @@ error_exit:
static int object_key_create (
hdb_handle_t object_handle,
const void *key_name,
- int key_len,
+ size_t key_len,
const void *value,
- int value_len)
+ size_t value_len)
{
struct object_instance *instance;
struct object_key *object_key;
@@ -732,7 +732,7 @@ error_exit:
static int object_find_create (
hdb_handle_t object_handle,
const void *object_name,
- int object_len,
+ size_t object_len,
hdb_handle_t *object_find_handle)
{
unsigned int res;
@@ -854,9 +854,9 @@ error_exit:
static int object_key_get (
hdb_handle_t object_handle,
const void *key_name,
- int key_len,
+ size_t key_len,
void **value,
- int *value_len)
+ size_t *value_len)
{
unsigned int res = 0;
struct object_instance *instance;
@@ -903,7 +903,7 @@ error_exit:
static int object_key_increment (
hdb_handle_t object_handle,
const void *key_name,
- int key_len,
+ size_t key_len,
unsigned int *value)
{
unsigned int res = 0;
@@ -949,7 +949,7 @@ error_exit:
static int object_key_decrement (
hdb_handle_t object_handle,
const void *key_name,
- int key_len,
+ size_t key_len,
unsigned int *value)
{
unsigned int res = 0;
@@ -995,7 +995,7 @@ error_exit:
static int object_key_delete (
hdb_handle_t object_handle,
const void *key_name,
- int key_len)
+ size_t key_len)
{
unsigned int res;
int ret = 0;
@@ -1047,9 +1047,9 @@ error_exit:
static int object_key_replace (
hdb_handle_t object_handle,
const void *key_name,
- int key_len,
+ size_t key_len,
const void *new_value,
- int new_value_len)
+ size_t new_value_len)
{
unsigned int res;
int ret = 0;
@@ -1248,9 +1248,9 @@ error_exit:
static int object_key_iter(hdb_handle_t parent_object_handle,
void **key_name,
- int *key_len,
+ size_t *key_len,
void **value,
- int *value_len)
+ size_t *value_len)
{
unsigned int res;
struct object_instance *instance;
@@ -1297,9 +1297,9 @@ error_exit:
static int object_key_iter_from(hdb_handle_t parent_object_handle,
hdb_handle_t start_pos,
void **key_name,
- int *key_len,
+ size_t *key_len,
void **value,
- int *value_len)
+ size_t *value_len)
{
unsigned int pos = 0;
unsigned int res;
@@ -1379,7 +1379,7 @@ static int object_parent_get(hdb_handle_t object_handle,
static int object_name_get(hdb_handle_t object_handle,
char *object_name,
- int *object_name_len)
+ size_t *object_name_len)
{
struct object_instance *instance;
unsigned int res;
diff --git a/include/corosync/engine/objdb.h b/include/corosync/engine/objdb.h
index 9ef6b0d..56cd8a7 100644
--- a/include/corosync/engine/objdb.h
+++ b/include/corosync/engine/objdb.h
@@ -74,7 +74,8 @@ const void *name_pt, size_t name_len,
void *priv_data_pt);
typedef void (*object_destroy_notify_fn_t) (unsigned int parent_object_handle,
- void *name_pt, size_t name_len,
+ const void *name_pt,
+ size_t name_len,
void *priv_data_pt);
typedef void (*object_reload_notify_fn_t) (objdb_reload_notify_type_t, int
flush,
diff --git a/lib/sa-confdb.c b/lib/sa-confdb.c
index 3b7828b..ead48d0 100644
--- a/lib/sa-confdb.c
+++ b/lib/sa-confdb.c
@@ -98,7 +98,7 @@ static int load_config(void)
hdb_handle_t config_version = 0;
void *config_p;
struct config_iface_ver0 *config;
- char *error_string;
+ const char *error_string;
/* User's bootstrap config service */
config_iface = getenv("COROSYNC_DEFAULT_CONFIG_IFACE");
diff --git a/services/confdb.c b/services/confdb.c
index 0a9b723..ad19a20 100644
--- a/services/confdb.c
+++ b/services/confdb.c
@@ -89,20 +89,20 @@ static void confdb_notify_lib_of_key_change(
object_change_type_t change_type,
hdb_handle_t parent_object_handle,
hdb_handle_t object_handle,
- const void *object_name_pt, int object_name_len,
- const void *key_name_pt, int key_name_len,
- const void *key_value_pt, int key_value_len,
+ const void *object_name_pt, size_t object_name_len,
+ const void *key_name_pt, size_t key_name_len,
+ const void *key_value_pt, size_t key_value_len,
void *priv_data_pt);
static void confdb_notify_lib_of_new_object(
hdb_handle_t parent_object_handle,
hdb_handle_t object_handle,
- const uint8_t *name_pt, int name_len,
+ const uint8_t *name_pt, size_t name_len,
void *priv_data_pt);
static void confdb_notify_lib_of_destroyed_object(
hdb_handle_t parent_object_handle,
- const uint8_t *name_pt, int name_len,
+ const uint8_t *name_pt, size_t name_len,
void *priv_data_pt);
/*
@@ -367,7 +367,7 @@ static void message_handler_req_lib_confdb_key_get (void
*conn, void *message)
{
struct req_lib_confdb_key_get *req_lib_confdb_key_get = (struct
req_lib_confdb_key_get *)message;
struct res_lib_confdb_key_get res_lib_confdb_key_get;
- int value_len;
+ size_t value_len;
void *value;
int ret = CS_OK;
@@ -485,9 +485,9 @@ static void message_handler_req_lib_confdb_key_iter (void
*conn, void *message)
struct req_lib_confdb_key_iter *req_lib_confdb_key_iter = (struct
req_lib_confdb_key_iter *)message;
struct res_lib_confdb_key_iter res_lib_confdb_key_iter;
void *key_name;
- int key_name_len;
+ size_t key_name_len;
void *value;
- int value_len;
+ size_t value_len;
int ret = CS_OK;
if
(api->object_key_iter_from(req_lib_confdb_key_iter->parent_object_handle,
@@ -514,7 +514,7 @@ static void message_handler_req_lib_confdb_object_iter
(void *conn, void *messag
{
struct req_lib_confdb_object_iter *req_lib_confdb_object_iter = (struct
req_lib_confdb_object_iter *)message;
struct res_lib_confdb_object_iter res_lib_confdb_object_iter;
- int object_name_len;
+ size_t object_name_len;
int ret = CS_OK;
if (!req_lib_confdb_object_iter->find_handle) {
@@ -620,9 +620,9 @@ static void message_handler_req_lib_confdb_reload (void
*conn, void *message)
static void confdb_notify_lib_of_key_change(object_change_type_t change_type,
hdb_handle_t parent_object_handle,
hdb_handle_t object_handle,
- const void *object_name_pt, int object_name_len,
- const void *key_name_pt, int key_name_len,
- const void *key_value_pt, int key_value_len,
+ const void *object_name_pt, size_t object_name_len,
+ const void *key_name_pt, size_t key_name_len,
+ const void *key_value_pt, size_t key_value_len,
void *priv_data_pt)
{
struct res_lib_confdb_key_change_callback res;
@@ -649,7 +649,7 @@ static void
confdb_notify_lib_of_key_change(object_change_type_t change_type,
static void confdb_notify_lib_of_new_object(hdb_handle_t parent_object_handle,
hdb_handle_t object_handle,
- const uint8_t *name_pt, int name_len,
+ const uint8_t *name_pt, size_t name_len,
void *priv_data_pt)
{
struct res_lib_confdb_object_create_callback res;
@@ -667,7 +667,7 @@ static void confdb_notify_lib_of_new_object(hdb_handle_t
parent_object_handle,
static void confdb_notify_lib_of_destroyed_object(
hdb_handle_t parent_object_handle,
- const uint8_t *name_pt, int name_len,
+ const uint8_t *name_pt, size_t name_len,
void *priv_data_pt)
{
struct res_lib_confdb_object_destroy_callback res;
diff --git a/services/testquorum.c b/services/testquorum.c
index d8ab699..5bd2960 100644
--- a/services/testquorum.c
+++ b/services/testquorum.c
@@ -105,9 +105,9 @@ static quorum_set_quorate_fn_t set_quorum;
static void key_change_notify(object_change_type_t change_type,
hdb_handle_t parent_object_handle,
hdb_handle_t object_handle,
- const void *object_name_pt, int object_name_len,
- const void *key_name_pt, int key_len,
- const void *key_value_pt, int key_value_len,
+ const void *object_name_pt, size_t
object_name_len,
+ const void *key_name_pt, size_t key_len,
+ const void *key_value_pt, size_t key_value_len,
void *priv_data_pt)
{
unsigned int members[1];
diff --git a/test/testconfdb.c b/test/testconfdb.c
index a9949e1..874e0ee 100644
--- a/test/testconfdb.c
+++ b/test/testconfdb.c
@@ -60,11 +60,11 @@ static void print_config_tree(confdb_handle_t handle,
hdb_handle_t parent_object
{
hdb_handle_t object_handle;
char object_name[1024];
- int object_name_len;
+ size_t object_name_len;
char key_name[1024];
- int key_name_len;
+ size_t key_name_len;
char key_value[1024];
- int key_value_len;
+ size_t key_value_len;
int res;
int i;
@@ -198,7 +198,7 @@ int main (int argc, char *argv[]) {
int result;
hdb_handle_t totem_handle;
char key_value[256];
- int value_len;
+ size_t value_len;
result = confdb_initialize (&handle, &callbacks);
if (result != CS_OK) {
diff --git a/tools/corosync-objctl.c b/tools/corosync-objctl.c
index 70af9f1..1bfa7d5 100644
--- a/tools/corosync-objctl.c
+++ b/tools/corosync-objctl.c
@@ -103,11 +103,11 @@ static void print_config_tree(confdb_handle_t handle,
hdb_handle_t parent_object
{
hdb_handle_t object_handle;
char object_name[OBJ_NAME_SIZE];
- int object_name_len;
+ size_t object_name_len;
char key_name[OBJ_NAME_SIZE];
- int key_name_len;
+ size_t key_name_len;
char key_value[OBJ_NAME_SIZE];
- int key_value_len;
+ size_t key_value_len;
cs_error_t res;
int children_printed;
@@ -295,7 +295,7 @@ static void write_key(confdb_handle_t handle, char *
path_pt)
char key_name[OBJ_NAME_SIZE];
char key_value[OBJ_NAME_SIZE];
char old_key_value[OBJ_NAME_SIZE];
- int old_key_value_len;
+ size_t old_key_value_len;
cs_error_t res;
/* find the parent object */
--
1.6.2.rc1.285.gc5f54
_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais
