From f5f1bfbef1e4f777a5928da901d0ec4cb063b3f1 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 27 Nov 2011 19:54:09 +0100
Subject: pcm_buffer: un-inline pcm_buffer_get()

This method is too complex for inlining.
---
 src/pcm_buffer.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/pcm_buffer.c

(limited to 'src/pcm_buffer.c')

diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c
new file mode 100644
index 000000000..126a4e036
--- /dev/null
+++ b/src/pcm_buffer.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "pcm_buffer.h"
+
+void *
+pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
+{
+	if (buffer->size < size) {
+		/* free the old buffer */
+		g_free(buffer->buffer);
+
+		/* allocate a new buffer; align at 8 kB boundaries */
+		buffer->size = ((size - 1) | 0x1fff) + 1;
+		buffer->buffer = g_malloc(buffer->size);
+	}
+
+	return buffer->buffer;
+}
-- 
cgit v1.2.3


From a1e824ada0a08c0065a8a85a2e2aa979f6e97121 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 27 Nov 2011 20:04:56 +0100
Subject: pcm_buffer: move formula to new function align_8k()

---
 src/pcm_buffer.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/pcm_buffer.c')

diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c
index 126a4e036..75b76a5d3 100644
--- a/src/pcm_buffer.c
+++ b/src/pcm_buffer.c
@@ -19,6 +19,16 @@
 
 #include "pcm_buffer.h"
 
+/**
+ * Align the specified size to the next 8k boundary.
+ */
+G_GNUC_CONST
+static size_t
+align_8k(size_t size)
+{
+	return ((size - 1) | 0x1fff) + 1;
+}
+
 void *
 pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
 {
@@ -26,8 +36,7 @@ pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
 		/* free the old buffer */
 		g_free(buffer->buffer);
 
-		/* allocate a new buffer; align at 8 kB boundaries */
-		buffer->size = ((size - 1) | 0x1fff) + 1;
+		buffer->size = align_8k(size);
 		buffer->buffer = g_malloc(buffer->size);
 	}
 
-- 
cgit v1.2.3


From 07067f8b958d52699526f4f757bca2714da183f4 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 27 Nov 2011 20:05:57 +0100
Subject: pcm_buffer: add assertions

---
 src/pcm_buffer.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/pcm_buffer.c')

diff --git a/src/pcm_buffer.c b/src/pcm_buffer.c
index 75b76a5d3..b0449d44e 100644
--- a/src/pcm_buffer.c
+++ b/src/pcm_buffer.c
@@ -32,6 +32,8 @@ align_8k(size_t size)
 void *
 pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
 {
+	assert(buffer != NULL);
+
 	if (buffer->size < size) {
 		/* free the old buffer */
 		g_free(buffer->buffer);
@@ -40,5 +42,7 @@ pcm_buffer_get(struct pcm_buffer *buffer, size_t size)
 		buffer->buffer = g_malloc(buffer->size);
 	}
 
+	assert(buffer->size >= size);
+
 	return buffer->buffer;
 }
-- 
cgit v1.2.3