From: Andre Noll <maan@systemlinux.org>
Date: Mon, 9 Nov 2009 17:31:25 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.1~118
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=1aeb12d89d5334c70be373fa1ef7a547a8fd6ba4;hp=5967b31f0e4163a9be4ed5aeb01bd2c6377ffac8

Merge branch 'master' into next
---

diff --git a/alsa_write.c b/alsa_write.c
index 679962e0..67ab59ad 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -80,18 +80,19 @@ static int alsa_init(struct private_alsa_write_data *pad,
 			pad->channels) < 0)
 		return -E_CHANNEL_COUNT;
 	if (snd_pcm_hw_params_set_rate_near(pad->handle, hwparams,
-			&pad->samplerate, 0) < 0)
+			&pad->samplerate, NULL) < 0)
 		return -E_SET_RATE;
-	err = snd_pcm_hw_params_get_buffer_time_max(hwparams, &pad->buffer_time, 0);
+	err = snd_pcm_hw_params_get_buffer_time_max(hwparams,
+		&pad->buffer_time, NULL);
 	if (err < 0 || !pad->buffer_time)
 		return -E_GET_BUFFER_TIME;
 	PARA_INFO_LOG("buffer time: %d\n", pad->buffer_time);
 	if (snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
-			&pad->buffer_time, 0) < 0)
+			&pad->buffer_time, NULL) < 0)
 		return -E_SET_BUFFER_TIME;
 	if (snd_pcm_hw_params(pad->handle, hwparams) < 0)
 		return -E_HW_PARAMS;
-	snd_pcm_hw_params_get_period_size(hwparams, &period_size, 0);
+	snd_pcm_hw_params_get_period_size(hwparams, &period_size, NULL);
 	snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
 	PARA_INFO_LOG("buffer size: %lu, period_size: %lu\n", buffer_size,
 		period_size);
diff --git a/blob.c b/blob.c
index f0133c3b..dfcb64fb 100644
--- a/blob.c
+++ b/blob.c
@@ -599,7 +599,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table,
 
 /** Define the \p close function for this blob type. */
 #define DEFINE_BLOB_CLOSE(table_name) \
-	void table_name ## _close(void) \
+	static void table_name ## _close(void) \
 	{ \
 		osl_close_table(table_name ## _table, OSL_MARK_CLEAN); \
 		table_name ## _table = NULL; \
@@ -607,7 +607,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table,
 
 /** Define the \p create function for this blob type. */
 #define DEFINE_BLOB_CREATE(table_name) \
-	int table_name ## _create(const char *dir) \
+	static int table_name ## _create(const char *dir) \
 	{ \
 		table_name ## _table_desc.dir = dir; \
 		return osl_create_table(&table_name ## _table_desc); \
@@ -629,7 +629,7 @@ static int blob_open(struct osl_table **table,
 }
 
 #define DEFINE_BLOB_OPEN(table_name) \
-	int table_name ## _open(const char *dir) \
+	static int table_name ## _open(const char *dir) \
 	{ \
 		return blob_open(&table_name ## _table, \
 			&table_name ## _table_desc, dir); \
diff --git a/fecdec_filter.c b/fecdec_filter.c
index 1ff4abbb..d7427c2b 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -104,7 +104,7 @@ struct private_fecdec_data {
 
 /** Iterate over all fecdec groups. */
 #define FOR_EACH_FECDEC_GROUP(g, d) for (g = (d)->groups; \
-	(g) - (d)->groups < NUM_FEC_GROUPS; (g)++)
+	(g) < (d)->groups + NUM_FEC_GROUPS; (g)++)
 
 static int group_complete(struct fecdec_group *fg)
 {