summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-02-03 16:31:55 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-02-03 16:31:55 +0000
commit46a9c8c8821582ded1157d8a221638327f0bbaf8 (patch)
treeabe5a523dfdb4a6372bab6ee3cb653245227262d /src
parent514a9684972102eccf5a8a85c65febcc3966e21f (diff)
downloadxine-lib-46a9c8c8821582ded1157d8a221638327f0bbaf8.tar.gz
xine-lib-46a9c8c8821582ded1157d8a221638327f0bbaf8.tar.bz2
A few const-correctness fixes.
CVS patchset: 8587 CVS date: 2007/02/03 16:31:55
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/alphablend.c2
-rw-r--r--src/xine-engine/xine_interface.c4
-rw-r--r--src/xine-utils/array.c6
-rw-r--r--src/xine-utils/array.h6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index a0ff6ccf3..9947da365 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -66,7 +66,7 @@ static void mem_blend24(uint8_t *mem, uint8_t r, uint8_t g, uint8_t b,
}
}
-static void mem_blend32(uint8_t *mem, uint8_t *src, uint8_t o, int len) {
+static void mem_blend32(uint8_t *mem, const uint8_t *src, uint8_t o, int len) {
uint8_t *limit = mem + len*4;
while (mem < limit) {
*mem = BLEND_BYTE(*mem, src[0], o);
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 7e7527de7..afbd15051 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_interface.c,v 1.100 2006/12/19 19:10:52 dsalt Exp $
+ * $Id: xine_interface.c,v 1.101 2007/02/03 16:31:55 dsalt Exp $
*
* convenience/abstraction layer, functions to implement
* libxine's public interface
@@ -929,7 +929,7 @@ int _x_message(xine_stream_t *stream, int type, ...) {
va_list ap;
char *s, *params;
char *args[1025];
- static char *std_explanation[] = {
+ static const char *std_explanation[] = {
"",
N_("Warning:"),
N_("Unknown host:"),
diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c
index 4fcecbb4b..ed529515b 100644
--- a/src/xine-utils/array.c
+++ b/src/xine-utils/array.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $
+ * $Id: array.c,v 1.4 2007/02/03 16:31:55 dsalt Exp $
*
*/
#ifdef HAVE_CONFIG_H
@@ -78,7 +78,7 @@ void xine_array_delete(xine_array_t *array) {
free(array);
}
-size_t xine_array_size(xine_array_t *array) {
+size_t xine_array_size(const xine_array_t *array) {
return array->size;
}
@@ -116,7 +116,7 @@ void xine_array_remove(xine_array_t *array, unsigned int position) {
}
}
-void *xine_array_get(xine_array_t *array, unsigned int position) {
+void *xine_array_get(const xine_array_t *array, unsigned int position) {
if (position < array->size)
return array->chunk[position];
else
diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h
index 45fc7b137..80b7d3c9b 100644
--- a/src/xine-utils/array.h
+++ b/src/xine-utils/array.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: array.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $
+ * $Id: array.h,v 1.3 2007/02/03 16:31:55 dsalt Exp $
*
* Array that can grow automatically when you add elements.
* Inserting an element in the middle of the array implies memory moves.
@@ -35,7 +35,7 @@ xine_array_t *xine_array_new(size_t initial_size) XINE_PROTECTED;
void xine_array_delete(xine_array_t *array) XINE_PROTECTED;
/* Returns the number of element stored in the array */
-size_t xine_array_size(xine_array_t *array) XINE_PROTECTED;
+size_t xine_array_size(const xine_array_t *array) XINE_PROTECTED;
/* Removes all elements from an array */
void xine_array_clear(xine_array_t *array) XINE_PROTECTED;
@@ -50,7 +50,7 @@ void xine_array_insert(xine_array_t *array, unsigned int position, void *value)
void xine_array_remove(xine_array_t *array, unsigned int position) XINE_PROTECTED;
/* Get the element at the position specified */
-void *xine_array_get(xine_array_t *array, unsigned int position) XINE_PROTECTED;
+void *xine_array_get(const xine_array_t *array, unsigned int position) XINE_PROTECTED;
/* Set the element at the position specified */
void xine_array_set(xine_array_t *array, unsigned int position, void *value) XINE_PROTECTED;