some to int32_t (bugs)
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
include/qb/qblist.h | 2 +-
lib/ipc_int.h | 4 ++--
lib/plugin_loader.c | 24 ++++++++++++------------
lib/poll.c | 4 ++--
lib/wthread.c | 3 ++-
tests/bmc.c | 4 ++--
tests/bmcpt.c | 8 ++++----
tests/bms.c | 18 +++++++++---------
tests/check_plugin.c | 2 +-
tests/rbwriter.c | 2 +-
10 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/include/qb/qblist.h b/include/qb/qblist.h
index d28880c..efb945e 100644
--- a/include/qb/qblist.h
+++ b/include/qb/qblist.h
@@ -140,7 +140,7 @@ static void inline qb_list_del(struct qb_list_head *_remove)
* @endcode
*/
#define qb_list_entry(ptr,type,member)\
- ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
+ ((type *)((char *)(ptr)-(char*)(&((type *)0)->member)))
/**
* A quick test to see if the list is empty (pointing to it's self).
diff --git a/lib/ipc_int.h b/lib/ipc_int.h
index bedb8d5..f208a42 100644
--- a/lib/ipc_int.h
+++ b/lib/ipc_int.h
@@ -55,8 +55,8 @@ enum req_init_types {
#define MESSAGE_RES_OUTQ_FLUSH_NR 3
struct control_buffer {
- unsigned int read;
- unsigned int write;
+ uint32_t read;
+ uint32_t write;
#if _POSIX_THREAD_PROCESS_SHARED > 0
sem_t sem1;
sem_t sem2;
diff --git a/lib/plugin_loader.c b/lib/plugin_loader.c
index 9636a6b..aa7b30f 100644
--- a/lib/plugin_loader.c
+++ b/lib/plugin_loader.c
@@ -75,7 +75,7 @@ static int plugin_select_so(const struct dirent *dirent)
static int plugin_select_so(struct dirent *dirent)
#endif
{
- unsigned int len;
+ size_t len;
/*
* TODO check .lcrso > .so
*/
@@ -103,9 +103,9 @@ static int pathlist_select(struct dirent *dirent)
static inline struct plugin_component_instance *plugin_comp_find(const char
*iface_name,
- unsigned int
+ uint32_t
version,
- unsigned int
+ uint32_t
*iface_number)
{
struct plugin_component_instance *instance;
@@ -166,7 +166,7 @@ static inline int plugin_lib_loaded(char *library_name)
enum { PATH_LIST_SIZE = 128 };
const char *path_list[PATH_LIST_SIZE];
-unsigned int path_list_entries = 0;
+uint32_t path_list_entries = 0;
static void defaults_path_build(void)
{
@@ -218,7 +218,7 @@ static int ldso_path_build(const char *path, const char *filename)
char *new_filename;
int j;
struct dirent **scandir_list;
- unsigned int scandir_entries;
+ uint32_t scandir_entries;
snprintf(filename_cat, sizeof(filename_cat), "%s/%s", path, filename);
if (filename[0] == '*') {
@@ -302,7 +302,7 @@ static int scandir(const char *dir, struct dirent ***namelist,
if (namelist_items >= namelist_size) {
struct dirent **tmp;
namelist_size += 512;
- if ((unsigned long)namelist_size > INT_MAX) {
+ if ((uint32_t)namelist_size > INT_MAX) {
errno = EOVERFLOW;
goto fail;
}
@@ -357,13 +357,13 @@ static int alphasort(const struct dirent **a, const struct dirent
**b)
static int interface_find_and_load(const char *path,
const char *iface_name,
int version, struct plugin_component_instance
- **instance_ret, unsigned int *iface_number)
+ **instance_ret, uint32_t *iface_number)
{
struct plugin_component_instance *instance;
void *dl_handle;
struct dirent **scandir_list;
int scandir_entries;
- unsigned int libs_to_scan;
+ uint32_t libs_to_scan;
char dl_name[1024];
#ifdef QB_SOLARIS
void (*comp_reg) (void);
@@ -448,7 +448,7 @@ found:
return 0;
}
-static unsigned int plugin_initialized = 0;
+static uint32_t plugin_initialized = 0;
int plugin_ifact_reference(qb_handle_t * iface_handle,
const char *iface_name,
@@ -456,9 +456,9 @@ int plugin_ifact_reference(qb_handle_t * iface_handle,
{
struct plugin_iface_instance *iface_instance;
struct plugin_component_instance *instance;
- unsigned int iface_number;
- unsigned int res;
- unsigned int i;
+ uint32_t iface_number;
+ int32_t res;
+ uint32_t i;
/*
* Determine if the component is already loaded
diff --git a/lib/poll.c b/lib/poll.c
index 023c627..9fd89df 100644
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -57,7 +57,7 @@ qb_handle_t qb_poll_create(void)
{
qb_handle_t handle;
struct qb_poll_instance *poll_instance;
- unsigned int res;
+ int32_t res;
res = qb_hdb_handle_create(&poll_instance_database,
sizeof(struct qb_poll_instance), &handle);
@@ -313,7 +313,7 @@ error_exit:
int qb_poll_stop(qb_handle_t handle)
{
struct qb_poll_instance *poll_instance;
- unsigned int res;
+ int32_t res;
res = qb_hdb_handle_get(&poll_instance_database, handle,
(void *)&poll_instance);
diff --git a/lib/wthread.c b/lib/wthread.c
index 8964463..baab797 100644
--- a/lib/wthread.c
+++ b/lib/wthread.c
@@ -26,6 +26,7 @@
#include <config.h>
+#include <stdint.h>
#include <stdlib.h>
#include <pthread.h>
#include <errno.h>
@@ -211,7 +212,7 @@ void qb_wthread_group_atsegv(struct qb_wthread_group
*worker_thread_group)
{
void *data_for_worker_fn;
struct qb_wthread_t *worker_thread;
- unsigned int i;
+ uint32_t i;
for (i = 0; i < worker_thread_group->threadcount; i++) {
worker_thread = &worker_thread_group->threads[i];
diff --git a/tests/bmc.c b/tests/bmc.c
index f071829..f8fc33a 100644
--- a/tests/bmc.c
+++ b/tests/bmc.c
@@ -86,7 +86,7 @@ qb_handle_t bmc_ipc_handle;
static void bmc_connect(void)
{
- unsigned int res;
+ uint32_t res;
res = qb_ipcc_service_connect("qb_ipcs_bm",
0,
@@ -95,7 +95,7 @@ static void bmc_connect(void)
}
static char buffer[1024 * 1024];
-static void bmc_send_nozc(unsigned int size)
+static void bmc_send_nozc(uint32_t size)
{
struct iovec iov[2];
qb_ipc_request_header_t req_header;
diff --git a/tests/bmcpt.c b/tests/bmcpt.c
index f7d40c4..01403e5 100644
--- a/tests/bmcpt.c
+++ b/tests/bmcpt.c
@@ -38,7 +38,7 @@ struct bm_ctx {
struct timeval tv_elapsed;
float mbs;
int multi;
- unsigned int counter;
+ uint32_t counter;
};
#define timersub(a, b, result) \
@@ -80,7 +80,7 @@ static void bm_finish(struct bm_ctx *ctx, const char *operation, int
size)
static void bmc_connect(struct bm_ctx *ctx)
{
- unsigned int res;
+ uint32_t res;
res = qb_ipcc_service_connect("qb_ipcs_bm",
0,
@@ -95,7 +95,7 @@ static void bmc_disconnect(struct bm_ctx *ctx)
}
static char buffer[1024 * 1024];
-static void bmc_send_nozc(struct bm_ctx *ctx, unsigned int size)
+static void bmc_send_nozc(struct bm_ctx *ctx, uint32_t size)
{
struct iovec iov[2];
qb_ipc_request_header_t req_header;
@@ -121,7 +121,7 @@ repeat_send:
}
}
-unsigned int alarm_notice = 0;
+uint32_t alarm_notice = 0;
static void sigalrm_handler(int num)
{
alarm_notice = 1;
diff --git a/tests/bms.c b/tests/bms.c
index 6aef6b1..d90bbfd 100644
--- a/tests/bms.c
+++ b/tests/bms.c
@@ -56,7 +56,7 @@ struct lib_handler {
};
struct service_engine {
- unsigned int private_data_size;
+ uint32_t private_data_size;
int (*lib_init_fn) (void *conn);
int (*lib_exit_fn) (void *conn);
struct lib_handler *lib_engine;
@@ -150,23 +150,23 @@ static void bms_serialize_unlock(void)
/*
* Provides the glue from bms to the IPC Service
*/
-static int bms_private_data_size_get(unsigned int service)
+static int bms_private_data_size_get(uint32_t service)
{
return (services[service].private_data_size);
}
-static qb_ipcs_init_fn_lvalue bms_init_fn_get(unsigned int service)
+static qb_ipcs_init_fn_lvalue bms_init_fn_get(uint32_t service)
{
return (services[service].lib_init_fn);
}
-static qb_ipcs_exit_fn_lvalue bms_exit_fn_get(unsigned int service)
+static qb_ipcs_exit_fn_lvalue bms_exit_fn_get(uint32_t service)
{
return (services[service].lib_exit_fn);
}
-static qb_ipcs_handler_fn_lvalue bms_handler_fn_get(unsigned int service,
- unsigned int id)
+static qb_ipcs_handler_fn_lvalue bms_handler_fn_get(uint32_t service,
+ uint32_t id)
{
return (services[service].lib_engine[id].lib_handler_fn);
}
@@ -180,7 +180,7 @@ static int bms_security_valid(int euid, int egid)
return (0);
}
-static int bms_service_available(unsigned int service)
+static int bms_service_available(uint32_t service)
{
if (verbose) {
printf("%s:%d %s\n", __FILE__, __LINE__, __func__);
@@ -188,8 +188,8 @@ static int bms_service_available(unsigned int service)
return (service < 1);
}
-static int bms_sending_allowed(unsigned int service,
- unsigned int id,
+static int bms_sending_allowed(uint32_t service,
+ uint32_t id,
const void *msg,
void *sending_allowed_private_data)
{
diff --git a/tests/check_plugin.c b/tests/check_plugin.c
index a3a00f6..d38a5d7 100644
--- a/tests/check_plugin.c
+++ b/tests/check_plugin.c
@@ -47,7 +47,7 @@ START_TEST(test_plugin)
void *b_iface_ver0_p;
void *b_iface_ver1_p;
- unsigned int res;
+ int32_t res;
setenv("LD_LIBRARY_PATH", ".libs", 1);
/*
diff --git a/tests/rbwriter.c b/tests/rbwriter.c
index f9f0c90..e619d42 100644
--- a/tests/rbwriter.c
+++ b/tests/rbwriter.c
@@ -101,7 +101,7 @@ static void bmc_connect(void)
}
static char buffer[1024 * 1024];
-static void bmc_send_nozc(unsigned int size)
+static void bmc_send_nozc(size_t size)
{
ssize_t res = 0;
--
1.6.6.1