diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index b1463d77525ba5f722b76e045c377e42b0fde1b1..b387cda8f345bc2e9255e9a0a7df56ee7e9c8775 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -275,7 +275,7 @@ void pack_node_info_msg ( slurm_msg_t * msg, void ** buf_ptr , int * buffer_size
 
 	 memcpy ( *buf_ptr , msg->data , msg->data_size );
 	((char*)*buf_ptr) += msg->data_size;
-	((char*)*buffer_size) -= msg->data_size;
+	(*buffer_size) -= msg->data_size;
 }
 
 int unpack_node_info_msg ( node_info_msg_t ** msg , void ** buf_ptr , int * buffer_size )
@@ -338,7 +338,7 @@ void pack_partition_info_msg ( slurm_msg_t * msg, void ** buf_ptr , int * buffer
 
 	memcpy ( *buf_ptr , msg->data , msg->data_size );
 	((char*)*buf_ptr) += msg->data_size;
-	((char*)*buffer_size) -= msg->data_size;
+	(*buffer_size) -= msg->data_size;
 }
 
 int unpack_partition_info_msg ( partition_info_msg_t ** msg , void ** buf_ptr , int * buffer_size )
@@ -417,7 +417,7 @@ void pack_job_info_msg ( slurm_msg_t * msg, void ** buf_ptr , int * buffer_size
 
 	memcpy ( *buf_ptr , msg->data , msg->data_size );
 	((char*)*buf_ptr) += msg->data_size;
-	((char*)*buffer_size) -= msg->data_size;
+	(*buffer_size) -= msg->data_size;
 }
 
 int unpack_job_info_msg ( job_info_msg_t ** msg , void ** buf_ptr , int * buffer_size )