From 36e5ac33bed413c0de4e23b6b02c24a2337ef7fc Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Fri, 23 Sep 2011 11:50:11 +0200
Subject: Add cmumble_ prefix to recv/send_msg

---
 src/cmumble.c    | 6 +++---
 src/connection.c | 4 ++--
 src/messages.c   | 4 ++--
 src/messages.h   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cmumble.c b/src/cmumble.c
index 5cc61c0..3a40e21 100644
--- a/src/cmumble.c
+++ b/src/cmumble.c
@@ -66,7 +66,7 @@ pull_buffer(GstAppSink *sink, gpointer user_data)
 	mumble_proto__udptunnel__init(&tunnel);
 	tunnel.packet.data = data;
 	tunnel.packet.len = pos;
-	send_msg(ctx, &tunnel.base);
+	cmumble_send_msg(ctx, &tunnel.base);
 
 	return GST_FLOW_OK;
 }
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
 		version.version = 0x010203;
 		version.release = PACKAGE_STRING;
 		version.os = "Gentoo/Linux";
-		send_msg(&ctx, &version.base);
+		cmumble_send_msg(&ctx, &version.base);
 	}
 
 	{
@@ -406,7 +406,7 @@ int main(int argc, char **argv)
 		authenticate.password = "";
 		authenticate.n_celt_versions = 1;
 		authenticate.celt_versions = (int32_t[]) { 0x8000000b };
-		send_msg(&ctx, &authenticate.base);
+		cmumble_send_msg(&ctx, &authenticate.base);
 	}
 
 	gst_init(&argc, &argv);
diff --git a/src/connection.c b/src/connection.c
index 7cb48e6..c9b7d5c 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -12,7 +12,7 @@ read_cb(GObject *pollable_stream, gpointer data)
 	gint count;
 
 	do {
-		count = recv_msg(ctx);
+		count = cmumble_recv_msg(ctx);
 	} while (count && g_pollable_input_stream_is_readable(input));
 
 	return TRUE;
@@ -28,7 +28,7 @@ do_ping(struct context *ctx)
 	mumble_proto__ping__init(&ping);
 	ping.timestamp = tv.tv_sec;
 	ping.resync = 1;
-	send_msg(ctx, &ping.base);
+	cmumble_send_msg(ctx, &ping.base);
 
 	return TRUE;
 }
diff --git a/src/messages.c b/src/messages.c
index 253db16..bbc08f2 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -39,7 +39,7 @@ get_preamble(uint8_t *buffer, int *type, int *len)
 }
 
 void
-send_msg(struct context *ctx, ProtobufCMessage *msg)
+cmumble_send_msg(struct context *ctx, ProtobufCMessage *msg)
 {
 	uint8_t pad[128];
 	uint8_t preamble[PREAMBLE_SIZE];
@@ -72,7 +72,7 @@ send_msg(struct context *ctx, ProtobufCMessage *msg)
 }
 
 int
-recv_msg(struct context *ctx)
+cmumble_recv_msg(struct context *ctx)
 {
 	uint8_t preamble[PREAMBLE_SIZE];
 	ProtobufCMessage *msg;
diff --git a/src/messages.h b/src/messages.h
index 5d37697..fef8a92 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -13,9 +13,9 @@ enum mumble_message {
 struct context;
 
 void
-send_msg(struct context *ctx, ProtobufCMessage *msg);
+cmumble_send_msg(struct context *ctx, ProtobufCMessage *msg);
 
 int
-recv_msg(struct context *ctx);
+cmumble_recv_msg(struct context *ctx);
 
 #endif /* _MESSAGES_H_ */
-- 
cgit