Fix "const char *" to "void *" conversion warnings

Functions returning a heap-allocated string should return a "char *",
not a "const char *": Because the result is heap-allocated and becomes
the responsibility of the caller, it is certainly modifiable.  And the
pointer will likely get passed to free(), triggering a conversion
warning from gcc.  So remove all the relevant consts.

7 files changed, 9 insertions, 9 deletions

diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h
index 58d042c..7f4593f 100644
--- a/librabbitmq/amqp.h
+++ b/librabbitmq/amqp.h
@@ -506,7 +506,7 @@ extern amqp_rpc_reply_t amqp_get_rpc_reply(amqp_connection_state_t state);
  * The returned string resides on the heap; the caller is responsible
  * for freeing it.
  */
-extern const char *amqp_error_string(int err);
+extern char *amqp_error_string(int err);
 
 #ifdef __cplusplus
 }
diff --git a/librabbitmq/amqp_api.c b/librabbitmq/amqp_api.c
index 722bc86..2b1ed54 100644
--- a/librabbitmq/amqp_api.c
+++ b/librabbitmq/amqp_api.c
@@ -69,7 +69,7 @@ static const char *client_error_strings[ERROR_MAX] = {
   "connection closed unexpectedly", /* ERROR_CONNECTION_CLOSED */
 };
 
-const char *amqp_error_string(int err)
+char *amqp_error_string(int err)
 {
   const char *str;
   int category = (err & ERROR_CATEGORY_MASK);
diff --git a/librabbitmq/amqp_private.h b/librabbitmq/amqp_private.h
index a9969be..c30663a 100644
--- a/librabbitmq/amqp_private.h
+++ b/librabbitmq/amqp_private.h
@@ -76,7 +76,7 @@ extern "C" {
 #define ERROR_CONNECTION_CLOSED 7
 #define ERROR_MAX 7
 
-extern const char *amqp_os_error_string(int err);
+extern char *amqp_os_error_string(int err);
 
 /*
  * Connection states:
diff --git a/librabbitmq/unix/socket.c b/librabbitmq/unix/socket.c
index f4a7195..9d37dfc 100644
--- a/librabbitmq/unix/socket.c
+++ b/librabbitmq/unix/socket.c
@@ -79,7 +79,7 @@ int amqp_socket_socket(int domain, int type, int proto)
 	return s;
 }	
 
-const char *amqp_os_error_string(int err)
+char *amqp_os_error_string(int err)
 {
 	return strdup(strerror(err));
 }
diff --git a/librabbitmq/windows/socket.c b/librabbitmq/windows/socket.c
index 62a1e50..9c026bd 100644
--- a/librabbitmq/windows/socket.c
+++ b/librabbitmq/windows/socket.c
@@ -71,7 +71,7 @@ int amqp_socket_init(void)
 	return 0;
 }
 
-const char *amqp_os_error_string(int err)
+char *amqp_os_error_string(int err)
 {
 	char *msg, *copy;
 
diff --git a/tools/common.c b/tools/common.c
index 2a640be..c5bda77 100644
--- a/tools/common.c
+++ b/tools/common.c
@@ -105,7 +105,7 @@ void die_amqp_error(int err, const char *fmt, ...)
 	exit(1);
 }
 
-const char *amqp_server_exception_string(amqp_rpc_reply_t r)
+char *amqp_server_exception_string(amqp_rpc_reply_t r)
 {
 	int res;
 	char *s;
@@ -140,7 +140,7 @@ const char *amqp_server_exception_string(amqp_rpc_reply_t r)
 	return res >= 0 ? s : NULL;
 }
 
-const char *amqp_rpc_reply_string(amqp_rpc_reply_t r)
+char *amqp_rpc_reply_string(amqp_rpc_reply_t r)
 {
 	switch (r.reply_type) {
 	case AMQP_RESPONSE_NORMAL:
diff --git a/tools/common.h b/tools/common.h
index 0caee98..84889d3 100644
--- a/tools/common.h
+++ b/tools/common.h
@@ -55,8 +55,8 @@
 #include <amqp.h>
 #include <amqp_framing.h>
 
-extern const char *amqp_server_exception_string(amqp_rpc_reply_t r);
-extern const char *amqp_rpc_reply_string(amqp_rpc_reply_t r);
+extern char *amqp_server_exception_string(amqp_rpc_reply_t r);
+extern char *amqp_rpc_reply_string(amqp_rpc_reply_t r);
 
 extern void die(const char *fmt, ...)
 	__attribute__ ((format (printf, 1, 2)));