LINT: fix "Assignment of ssize_t to int" warnings

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1696 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/crypto.c

@@ -1250,11 +1250,11 @@ static unsigned long rng_nix(unsigned char *buf, unsigned long len,
                              void (*callback)(void))
 {
 	int fd;
-	int rb;
+	unsigned long rb;
 
 	fd = open ("/dev/urandom", O_RDONLY);
 	
-	rb = read (fd, buf, len);
+	rb = (unsigned long)read (fd, buf, len);
 
 	close (fd);
 

exec/ipc.c

@@ -660,7 +660,7 @@ static void ipc_flow_control (struct conn_info *conn_info)
 
 static int conn_info_outq_flush (struct conn_info *conn_info) {
 	struct queue *outq;
-	int res = 0;
+	ssize_t res = 0;
 	struct outq_item *queue_item;
 	struct msghdr msg_send;
 	struct iovec iov_send;
@@ -738,7 +738,8 @@ struct ipc_res_overlay {
 
 static void libais_deliver (struct conn_info *conn_info)
 {
-	int res;
+	ssize_t res;
+	int dispatch_res;
 	mar_req_header_t *header;
 	int service;
 	struct msghdr msg_recv;
@@ -841,7 +842,7 @@ retry_recv:
 #ifdef COROSYNC_LINUX
 	if (conn_info->authenticated == 0) {
 		cmsg = CMSG_FIRSTHDR (&msg_recv);
-		assert (cmsg);
+		assert (cmsg != NULL);
 		cred = (struct ucred *)CMSG_DATA (cmsg);
 		if (cred) {
 			if (cred->uid == 0 || cred->gid == g_gid_valid) {
@@ -861,7 +862,8 @@ retry_recv:
 	conn_info->inb_inuse += res;
 	conn_info->inb_start += res;
 
-	while (conn_info->inb_inuse >= sizeof (mar_req_header_t) && res != -1) {
+	dispatch_res = 0;
+	while (conn_info->inb_inuse >= sizeof (mar_req_header_t) && dispatch_res != -1) {
 		header = (mar_req_header_t *)&conn_info->inb[conn_info->inb_start - conn_info->inb_inuse];
 
 		if (header->size > conn_info->inb_inuse) {
@@ -874,7 +876,7 @@ retry_recv:
 		 * else handle message using service service
 		 */
 		if (service == SOCKET_SERVICE_INIT) {
-			res = ais_init_service[header->id] (conn_info, header);
+			dispatch_res = ais_init_service[header->id] (conn_info, header);
 		} else  {
 			/*
 			 * Not an init service, but a standard service
@@ -1147,7 +1149,7 @@ int cs_conn_send_response (
 {
 	struct queue *outq;
 	char *cmsg;
-	int res = 0;
+	ssize_t res = 0;
 	int queue_empty;
 	struct outq_item *queue_item;
 	struct outq_item queue_item_out;

exec/logsys.c

@@ -551,9 +551,9 @@ int _logsys_rec_init (unsigned int size)
 	 * Last record ends at zero
 	 */
 	flt_data = malloc ((size + 2) * sizeof (unsigned int));
-	assert (flt_data);
+	assert (flt_data != NULL);
 	flt_data_size = size;
-	assert (flt_data);
+	assert (flt_data != NULL);
 	flt_data[FDHEAD_INDEX] = 0;
 	flt_data[FDTAIL_INDEX] = 0;
 	pthread_spin_init (&logsys_idx_spinlock, 0);
@@ -960,15 +960,18 @@ int logsys_config_subsys_get (
 int logsys_log_rec_store (char *filename)
 {
 	int fd;
-	int size;
+	ssize_t written_size;
+	size_t size_to_write = (flt_data_size + 2) * sizeof (unsigned int);
 
 	fd = open (filename, O_CREAT|O_RDWR, 0700);
 	if (fd == -1) {
 		return (-1);
 	}
 
-	size = write (fd, flt_data, (flt_data_size + 2) * sizeof (unsigned int));
-	if (size != ((flt_data_size + 2) * sizeof (unsigned int))) {
+	written_size = write (fd, flt_data, size_to_write);
+	if (written_size < 0) {
+		return (-1);
+	} else if ((size_t)written_size != size_to_write) {
 		return (-1);
 	}
 	return (0);

lcr/uic.c

@@ -98,6 +98,7 @@ int uic_msg_send (int fd, char *msg)
 	struct msghdr msg_send;
 	struct iovec iov_send[2];
 	struct uic_req_msg req_msg;
+	ssize_t send_res;
 	int res;
 
 	req_msg.len = strlen (msg) + 1;
@@ -120,12 +121,14 @@ int uic_msg_send (int fd, char *msg)
 #endif
 
 	retry_send:
-	res = sendmsg (fd, &msg_send, 0);
-	if (res == -1 && errno == EINTR) {
+	send_res = sendmsg (fd, &msg_send, 0);
+	if (send_res == -1 && errno == EINTR) {
                 goto retry_send;
         }
-	if (res == -1) {
+	if (send_res == -1) {
 		res = -errno;
+	} else {
+		res = (int)send_res;
 	}
 	return (res);
 

lib/util.c

@@ -225,7 +225,7 @@ saRecvRetry (
 	size_t len)
 {
 	cs_error_t error = CS_OK;
-	int result;
+	ssize_t result;
 	struct msghdr msg_recv;
 	struct iovec iov_recv;
 	char *rbuf = (char *)msg;
@@ -284,7 +284,7 @@ saSendRetry (
 	size_t len)
 {
 	cs_error_t error = CS_OK;
-	int result;
+	ssize_t result;
 	struct msghdr msg_send;
 	struct iovec iov_send;
 	char *rbuf = (char *)msg;
@@ -368,7 +368,7 @@ cs_error_t saSendMsgRetry (
         int iov_len)
 {
 	cs_error_t error = CS_OK;
-	int result;
+	ssize_t result;
 	int total_size = 0;
 	int i;
 	int csize;

tools/corosync-keygen.c

@@ -44,7 +44,7 @@ int main (void) {
 	int authkey_fd;
 	int random_fd;
 	unsigned char key[128];
-	int res;
+	ssize_t res;
 	
 	printf ("Corosync Cluster Engine Authentication key generator.\n");
 	if (geteuid() != 0) {
@@ -80,7 +80,7 @@ int main (void) {
 	/*
 	 * Set security of authorization key to uid = 0 uid = 0 mode = 0400
 	 */
-	res = fchown (authkey_fd, 0, 0);
+	fchown (authkey_fd, 0, 0);
 	fchmod (authkey_fd, 0400);
 
 	printf ("Writing corosync key to /etc/ais/authkey.\n");