[Redbutton-devel] SF.net SVN: redbutton:[509] redbutton-download/trunk

[<ski...@us...>]

Revision: 509
          http://redbutton.svn.sourceforge.net/redbutton/?rev=509&view=rev
Author:   skilvington
Date:     2008-12-09 17:01:58 +0000 (Tue, 09 Dec 2008)

Log Message:
-----------
(mostly) stop gcc 4 complaining about the sign of pointer targets

Modified Paths:
--------------
    redbutton-author/trunk/der_encode.c
    redbutton-author/trunk/parser.c.header
    redbutton-browser/trunk/ApplicationClass.c
    redbutton-browser/trunk/LinkClass.c
    redbutton-browser/trunk/MHEGApp.c
    redbutton-browser/trunk/MHEGBackend.c
    redbutton-browser/trunk/MHEGDisplay.c
    redbutton-browser/trunk/MHEGEngine.c
    redbutton-browser/trunk/MHEGFont.c
    redbutton-browser/trunk/MHEGStreamPlayer.c
    redbutton-browser/trunk/OctetStringVariableClass.c
    redbutton-browser/trunk/ResidentProgramClass.c
    redbutton-browser/trunk/si.c
    redbutton-browser/trunk/videoout_xshm.c
    redbutton-download/trunk/biop.c
    redbutton-download/trunk/fs.c
    redbutton-download/trunk/fs.h
    redbutton-download/trunk/module.c

Modified: redbutton-author/trunk/der_encode.c
===================================================================
--- redbutton-author/trunk/der_encode.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-author/trunk/der_encode.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -130,7 +130,7 @@
 	bool err;
 
 	/* max size it could be */
-	*out = safe_malloc(strlen(str));
+	*out = safe_malloc(strlen((char *) str));
 
 	/* skip the initial " */
 	str ++;
@@ -206,7 +206,7 @@
 	bool err;
 
 	/* max size it could be */
-	*out = safe_malloc(strlen(str));
+	*out = safe_malloc(strlen((char *) str));
 
 	/* skip the initial ' */
 	str ++;
@@ -272,7 +272,7 @@
 	bool err;
 
 	/* max size it could be */
-	*out = safe_malloc(strlen(str));
+	*out = safe_malloc(strlen((char *) str));
 
 	/* skip the initial ` */
 	str ++;
@@ -345,9 +345,9 @@
 next_base64_char(unsigned char **in)
 {
 	/* would be faster with a 256 byte lookup table */
-	unsigned char *alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-	unsigned char *pos;
-	unsigned char out;
+	char *alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+	char *pos;
+	char out;
 
 	while(**in != '`')
 	{

Modified: redbutton-author/trunk/parser.c.header
===================================================================
--- redbutton-author/trunk/parser.c.header	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-author/trunk/parser.c.header	2008-12-09 17:01:58 UTC (rev 509)
@@ -175,7 +175,7 @@
 	if(needs_tagging(parent->parent->asn1tag, parent->parent->asn1class))
 		parent = add_child(parent, ASN1TAGCLASS_OCTETSTRING);
 
-	der_encode_OctetString(&parent->value, &parent->length, token_text());
+	der_encode_OctetString(&parent->value, &parent->length, (unsigned char *) token_text());
 
 	return;
 }

Modified: redbutton-browser/trunk/ApplicationClass.c
===================================================================
--- redbutton-browser/trunk/ApplicationClass.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/ApplicationClass.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -396,7 +396,7 @@
 	/* get the absolute group ID of the new app */
 	absolute = MHEGEngine_absoluteFilename(&ref->u.external_reference.group_identifier);
 	quit_data.size = strlen(absolute);
-	quit_data.data = absolute;
+	quit_data.data = (unsigned char *) absolute;
 
 	MHEGEngine_quit(QuitReason_Launch, &quit_data);
 
@@ -424,7 +424,7 @@
 	/* get the absolute group ID of the new app */
 	absolute = MHEGEngine_absoluteFilename(&ref->u.external_reference.group_identifier);
 	quit_data.size = strlen(absolute);
-	quit_data.data = absolute;
+	quit_data.data = (unsigned char *) absolute;
 
 	MHEGEngine_quit(QuitReason_Spawn, &quit_data);
 
@@ -545,8 +545,8 @@
 	found = false;
 	for(i=0; features[i].func != NULL && !found; i++)
 	{
-		if(strncmp(feature->data, features[i].short_name, feature_len) == 0
-		|| strncmp(feature->data, features[i].long_name, feature_len) == 0)
+		if(strncmp((char *) feature->data, features[i].short_name, feature_len) == 0
+		|| strncmp((char *) feature->data, features[i].long_name, feature_len) == 0)
 		{
 			feature_pars.data = pars_start;
 			feature_pars.size = feature->size - feature_len;
@@ -815,7 +815,7 @@
 }
 
 #define UKEP_MATCH(STR)		if(params->size == strlen(STR)				\
-				&& strncmp(params->data, STR, params->size) == 0)	\
+				&& strncmp((char *) params->data, STR, params->size) == 0)	\
 					return true
 
 bool

Modified: redbutton-browser/trunk/LinkClass.c
===================================================================
--- redbutton-browser/trunk/LinkClass.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/LinkClass.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -192,7 +192,7 @@
 		/* make sure the event src is an absolute group id (ie starts with ~//) */
 		fullname = MHEGEngine_absoluteFilename(&link_src->u.external_reference.group_identifier);
 		absolute.size = strlen(fullname);
-		absolute.data = fullname;
+		absolute.data = (unsigned char *) fullname;
 		link_gid = &absolute;
 		if(OctetString_cmp(&src->group_identifier, link_gid) != 0
 		|| src->object_number != link_src->u.external_reference.object_number)

Modified: redbutton-browser/trunk/MHEGApp.c
===================================================================
--- redbutton-browser/trunk/MHEGApp.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/MHEGApp.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -52,7 +52,7 @@
 	int rc;
 
 	/* assert */
-	if(derfile->size < 3 || strncmp(derfile->data, "~//", 3) != 0)
+	if(derfile->size < 3 || strncmp((char *) derfile->data, "~//", 3) != 0)
 		fatal("MHEGApp_loadApplication: group ID '%.*s' is not absolute", derfile->size, derfile->data);
 
 	if(m->app != NULL)
@@ -107,7 +107,7 @@
 	int rc;
 
 	/* assert */
-	if(derfile->size < 3 || strncmp(derfile->data, "~//", 3) != 0)
+	if(derfile->size < 3 || strncmp((char *) derfile->data, "~//", 3) != 0)
 		fatal("MHEGApp_loadScene: group ID '%.*s' is not absolute", derfile->size, derfile->data);
 
 	if(m->scene != NULL)

Modified: redbutton-browser/trunk/MHEGBackend.c
===================================================================
--- redbutton-browser/trunk/MHEGBackend.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/MHEGBackend.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -593,7 +593,7 @@
 	int prefix_len;
 
 	/* assert */
-	if(service->size < 6 || strncmp(service->data, "dvb://", 6) != 0)
+	if(service->size < 6 || strncmp((char *) service->data, "dvb://", 6) != 0)
 		fatal("local_retune: unable to tune to '%.*s'", service->size, service->data);
 
 	/* extract the service_id */
@@ -643,7 +643,7 @@
 	bool exists;
 
 	/* assert */
-	if(service->size < 6 || strncmp(service->data, "dvb://", 6) != 0)
+	if(service->size < 6 || strncmp((char *) service->data, "dvb://", 6) != 0)
 		fatal("local_isServiceAvailable: invalid service '%.*s'", service->size, service->data);
 
 	/* extract the service_id */
@@ -809,7 +809,7 @@
 	FILE *sock;
 
 	/* assert */
-	if(service->size < 6 || strncmp(service->data, "dvb://", 6) != 0)
+	if(service->size < 6 || strncmp((char *) service->data, "dvb://", 6) != 0)
 		fatal("remote_retune: unable to tune to '%.*s'", service->size, service->data);
 
 	snprintf(cmd, sizeof(cmd), "retune %u\n", si_get_service_id(service));
@@ -846,7 +846,7 @@
 	bool available = true;
 
 	/* assert */
-	if(service->size < 6 || strncmp(service->data, "dvb://", 6) != 0)
+	if(service->size < 6 || strncmp((char *) service->data, "dvb://", 6) != 0)
 		fatal("remote_isServiceAvailable: invalid service '%.*s'", service->size, service->data);
 
 	snprintf(cmd, sizeof(cmd), "available %u\n", si_get_service_id(service));

Modified: redbutton-browser/trunk/MHEGDisplay.c
===================================================================
--- redbutton-browser/trunk/MHEGDisplay.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/MHEGDisplay.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -68,8 +68,8 @@
 void
 MHEGDisplay_init(MHEGDisplay *d, bool fullscreen, char *keymap, int verbose)
 {
-	unsigned int xrender_major;
-	unsigned int xrender_minor;
+	int xrender_major;
+	int xrender_minor;
 	int x, y;
 	XVisualInfo visinfo;
 	unsigned long mask;
@@ -1021,7 +1021,7 @@
 	}
 
 	/* get X to draw the XImage onto a Pixmap */
-	if((ximg = XCreateImage(d->dpy, NULL, 32, ZPixmap, 0, xdata, width, height, 32, 0)) == NULL)
+	if((ximg = XCreateImage(d->dpy, NULL, 32, ZPixmap, 0, (char *) xdata, width, height, 32, 0)) == NULL)
 		fatal("XCreateImage failed");
 	/* passed NULL Visual to XCreateImage, so set the rgb masks now */
 	ximg->red_mask = pic_format->direct.redMask;

Modified: redbutton-browser/trunk/MHEGEngine.c
===================================================================
--- redbutton-browser/trunk/MHEGEngine.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/MHEGEngine.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -210,7 +210,7 @@
 			for(i=0; !found && boot_order[i] != NULL; i++)
 			{
 				boot_obj.size = strlen(boot_order[i]);
-				boot_obj.data = boot_order[i];
+				boot_obj.data = (unsigned char *) boot_order[i];
 				found = MHEGEngine_checkContentRef(&boot_obj);
 			}
 			gettimeofday(&now, NULL);
@@ -1045,7 +1045,7 @@
 MHEGEngine_setDERObject(OctetString *gid)
 {
 	/* assert */
-	if(gid->size < 3 || strncmp(gid->data, "~//", 3) != 0)
+	if(gid->size < 3 || strncmp((char *) gid->data, "~//", 3) != 0)
 		fatal("MHEGEngine_setDERObject: group ID '%.*s' is not absolute", gid->size, gid->data);
 
 	engine.der_object = gid;
@@ -1159,7 +1159,7 @@
 	/* get the absolute group ID */
 	fullname = MHEGEngine_absoluteFilename(gid);
 	absolute.size = strlen(fullname);
-	absolute.data = fullname;
+	absolute.data = (unsigned char *) fullname;
 	gid = &absolute;
 
 	while(list)
@@ -1191,7 +1191,7 @@
 	SceneClass *scene;
 
 	/* assert */
-	if(gid->size < 3 || strncmp(gid->data, "~//", 3) != 0)
+	if(gid->size < 3 || strncmp((char *) gid->data, "~//", 3) != 0)
 		fatal("MHEGEngine_findGroupObject: group ID '%.*s' is not absolute", gid->size, gid->data);
 
 	/* is it the app */
@@ -1514,13 +1514,13 @@
 
 /* TODO */
 /* need to cope with CI: at the start */
-	if(name->size > 2 && strncmp(name->data, "CI:", 3) == 0)
+	if(name->size > 2 && strncmp((char *) name->data, "CI:", 3) == 0)
 	{
 printf("TODO: absoluteFilename '%.*s'\n", name->size, name->data);
 	}
 
 	/* DSM: at the start is equivalent to ~ */
-	if(name->size > 3 && strncmp(name->data, "DSM:", 4) == 0)
+	if(name->size > 3 && strncmp((char *) name->data, "DSM:", 4) == 0)
 	{
 		size = name->size - 4;
 		data = &name->data[4];
@@ -1532,13 +1532,13 @@
 	}
 
 	/* does it already start with a ~// */
-	if(size > 2 && strncmp(data, "~//", 3) == 0)
+	if(size > 2 && strncmp((char *) data, "~//", 3) == 0)
 		snprintf(_absolute, sizeof(_absolute), "%.*s", size, data);
 	/* starting with // is the same as starting with ~// */
-	else if(size > 1 && strncmp(data, "//", 2) == 0)
+	else if(size > 1 && strncmp((char *) data, "//", 2) == 0)
 		snprintf(_absolute, sizeof(_absolute), "~%.*s", size, data);
 	/* starting with ~/ means prepend the path to the current active app */
-	else if(size > 1 && strncmp(data, "~/", 2) == 0)
+	else if(size > 1 && strncmp((char *) data, "~/", 2) == 0)
 		snprintf(_absolute, sizeof(_absolute), "%s%.*s", active_app_path(), size - 1, &data[1]);
 	/* starting with / is the same as starting with ~/ */
 	else if(size > 0 && data[0] == '/')
@@ -1563,7 +1563,7 @@
 	char *slash;
 
 	/* assert */
-	if(gid->size < 3 || strncmp(gid->data, "~//", 3) != 0)
+	if(gid->size < 3 || strncmp((char *) gid->data, "~//", 3) != 0)
 		fatal("active_app_path: invalid group ID '%.*s'", gid->size, gid->data);
 
 	snprintf(_active_app_path, sizeof(_active_app_path), "%.*s", gid->size, gid->data);

Modified: redbutton-browser/trunk/MHEGFont.c
===================================================================
--- redbutton-browser/trunk/MHEGFont.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/MHEGFont.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -77,7 +77,7 @@
 void
 MHEGFont_setName(MHEGFont *font, FontBody *body)
 {
-	OctetString default_font = { 14, "rec://font/uk1" };
+	OctetString default_font = { 14, (unsigned char *) "rec://font/uk1" };
 	OctetString *str;
 
 	/* free any existing internal data */
@@ -145,7 +145,7 @@
 	FcPattern *p, *m;
 	FcResult result;
 
-	p = FcNameParse(wanted);
+	p = FcNameParse((FcChar8 *) wanted);
 	FcConfigSubstitute(0, p, FcMatchPattern);
 	FcDefaultSubstitute(p);
 	m = FcFontMatch(0, p, &result);
@@ -200,7 +200,7 @@
 	{
 		/* long form */
 		left = str->size;
-		p = str->data;
+		p = (char *) str->data;
 		/* style, only one possibility at the moment */
 		if(get_font_attr(&p, &left, out, sizeof(out)))
 		{
@@ -324,7 +324,7 @@
 				      FC_ASPECT, FcTypeDouble, aspect,
 				      /* may not give us a scalable font */
 				      FC_SCALABLE, FcTypeBool, FcTrue,
-				      0);
+				      NULL);
 		if(f->font == NULL)
 			fatal("Font '%s' does not exist", f->name);
 	}
@@ -511,7 +511,7 @@
 	FT_Face face;
 	FT_UShort units_per_EM;
 	int xpos, ypos;
-	char *data;
+	unsigned char *data;
 	int size;
 	int tok;
 	int len;

Modified: redbutton-browser/trunk/MHEGStreamPlayer.c
===================================================================
--- redbutton-browser/trunk/MHEGStreamPlayer.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/MHEGStreamPlayer.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -515,7 +515,7 @@
 			{
 				audio_frame = new_AudioFrameListItem();
 				af = &audio_frame->item;
-				used = avcodec_decode_audio2(audio_codec_ctx, af->data, &af->size, data, size);
+				used = avcodec_decode_audio2(audio_codec_ctx, (int16_t *) af->data, (int *) &af->size, data, size);
 				data += used;
 				size -= used;
 				if(used > 0 && af->size > 0)

Modified: redbutton-browser/trunk/OctetStringVariableClass.c
===================================================================
--- redbutton-browser/trunk/OctetStringVariableClass.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/OctetStringVariableClass.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -61,7 +61,7 @@
 		safe_free(v->inst.Value.u.octetstring.data);
 		v->inst.Value.u.octetstring.size = strlen(val_str);
 		v->inst.Value.u.octetstring.data = safe_malloc(v->inst.Value.u.octetstring.size);
-		strncpy(v->inst.Value.u.octetstring.data, val_str, v->inst.Value.u.octetstring.size);
+		strncpy((char *) v->inst.Value.u.octetstring.data, val_str, v->inst.Value.u.octetstring.size);
 	}
 
 	return;

Modified: redbutton-browser/trunk/ResidentProgramClass.c
===================================================================
--- redbutton-browser/trunk/ResidentProgramClass.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/ResidentProgramClass.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -473,45 +473,45 @@
 			case 'Y':
 				/* 4 digit year */
 				year = tm->tm_year + 1900;
-				dateString.size += sprintf(&dateString.data[dateString.size], "%u", year);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%u", year);
 				break;
 
 			case 'y':
 				/* 2 digit year */
 				year = (tm->tm_year + 1900) % 100;
-				dateString.size += sprintf(&dateString.data[dateString.size], "%02u", year);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%02u", year);
 				break;
 
 			case 'X':
 				/* month 01-12 */
 				month = tm->tm_mon + 1;
-				dateString.size += sprintf(&dateString.data[dateString.size], "%02u", month);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%02u", month);
 				break;
 
 			case 'x':
 				/* month 1-12 */
 				month = tm->tm_mon + 1;
-				dateString.size += sprintf(&dateString.data[dateString.size], "%u", month);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%u", month);
 				break;
 
 			case 'D':
 				/* day 01-31 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%02u", tm->tm_mday);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%02u", tm->tm_mday);
 				break;
 
 			case 'd':
 				/* day 1-31 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%u", tm->tm_mday);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%u", tm->tm_mday);
 				break;
 
 			case 'H':
 				/* hour 00-23 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%02u", tm->tm_hour);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%02u", tm->tm_hour);
 				break;
 
 			case 'h':
 				/* hour 0-23 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%u", tm->tm_hour);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%u", tm->tm_hour);
 				break;
 
 			case 'I':
@@ -519,7 +519,7 @@
 				hour = tm->tm_hour % 12;
 				if(hour == 0)
 					hour = 12;
-				dateString.size += sprintf(&dateString.data[dateString.size], "%02u", hour);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%02u", hour);
 				break;
 
 			case 'i':
@@ -527,43 +527,43 @@
 				hour = tm->tm_hour % 12;
 				if(hour == 0)
 					hour = 12;
-				dateString.size += sprintf(&dateString.data[dateString.size], "%u", hour);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%u", hour);
 				break;
 
 			case 'M':
 				/* minutes 00-59 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%02u", tm->tm_min);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%02u", tm->tm_min);
 				break;
 
 			case 'm':
 				/* minutes 0-59 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%u", tm->tm_min);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%u", tm->tm_min);
 				break;
 
 			case 'S':
 				/* seconds 00-59 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%02u", tm->tm_sec);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%02u", tm->tm_sec);
 				break;
 
 			case 's':
 				/* seconds 0-59 */
-				dateString.size += sprintf(&dateString.data[dateString.size], "%u", tm->tm_sec);
+				dateString.size += sprintf((char *) &dateString.data[dateString.size], "%u", tm->tm_sec);
 				break;
 
 			case 'A':
 				/* AM/PM */
 				if(tm->tm_hour < 12)
-					dateString.size += sprintf(&dateString.data[dateString.size], "AM");
+					dateString.size += sprintf((char *) &dateString.data[dateString.size], "AM");
 				else
-					dateString.size += sprintf(&dateString.data[dateString.size], "PM");
+					dateString.size += sprintf((char *) &dateString.data[dateString.size], "PM");
 				break;
 
 			case 'a':
 				/* am/pm */
 				if(tm->tm_hour < 12)
-					dateString.size += sprintf(&dateString.data[dateString.size], "am");
+					dateString.size += sprintf((char *) &dateString.data[dateString.size], "am");
 				else
-					dateString.size += sprintf(&dateString.data[dateString.size], "pm");
+					dateString.size += sprintf((char *) &dateString.data[dateString.size], "pm");
 				break;
 
 			case '%':
@@ -1193,7 +1193,7 @@
 	ident_par = &(get_parameter(params, 1)->u.new_generic_octetstring);
 
 	ident.size = strlen(ident_str);
-	ident.data = ident_str;
+	ident.data = (unsigned char *) ident_str;
 
 	GenericOctetString_setOctetString(ident_par, caller_gid, &ident);
 

Modified: redbutton-browser/trunk/si.c
===================================================================
--- redbutton-browser/trunk/si.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/si.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -106,7 +106,7 @@
 	unsigned int pos;
 	unsigned int id;
 
-	if(ref == NULL || ref->size < 6 || strncmp(ref->data, "dvb://", 6) != 0)
+	if(ref == NULL || ref->size < 6 || strncmp((char *) ref->data, "dvb://", 6) != 0)
 		return 0;
 
 	/* read upto the first . or end of string */
@@ -128,7 +128,7 @@
 	unsigned int pos;
 	unsigned int id;
 
-	if(ref == NULL || ref->size < 6 || strncmp(ref->data, "dvb://", 6) != 0)
+	if(ref == NULL || ref->size < 6 || strncmp((char *) ref->data, "dvb://", 6) != 0)
 		return 0;
 
 	/* find the first . or end of string */
@@ -157,7 +157,7 @@
 	unsigned int len;
 	unsigned int id;
 
-	if(ref == NULL || ref->size < 6 || strncmp(ref->data, "dvb://", 6) != 0)
+	if(ref == NULL || ref->size < 6 || strncmp((char *) ref->data, "dvb://", 6) != 0)
 		return 0;
 
 	len = ref->size;

Modified: redbutton-browser/trunk/videoout_xshm.c
===================================================================
--- redbutton-browser/trunk/videoout_xshm.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-browser/trunk/videoout_xshm.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -151,7 +151,7 @@
 
 	/* we made sure these pixel formats are the same */
 	v->current_frame->data = v->shm.shmaddr;
-	avpicture_fill(&v->rgb_frame, v->shm.shmaddr, v->out_format, out_width, out_height);
+	avpicture_fill(&v->rgb_frame, (uint8_t *) v->shm.shmaddr, v->out_format, out_width, out_height);
 
 	return;
 }

Modified: redbutton-download/trunk/biop.c
===================================================================
--- redbutton-download/trunk/biop.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-download/trunk/biop.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -93,29 +93,29 @@
 		subhdr += biop_sequence(data->byte_order, subhdr, &body);
 		vverbose("messageBody: %u bytes", body.size);
 		/* decode the message body, based on the objectKind field */
-		if(strcmp(kind.data, BIOP_DIR) == 0)
+		if(strcmp((char *) kind.data, BIOP_DIR) == 0)
 		{
 			/* a directory */
 			verbose("DSM::Directory");
-			dirname = make_dir(kind.data, car->current_pid, mod->download_id, mod->module_id, key.data, key.size);
+			dirname = make_dir((char *) kind.data, car->current_pid, mod->download_id, mod->module_id, (char *) key.data, key.size);
 			process_biop_dir(data->byte_order, dirname, car, body.data, body.size);
 		}
-		else if(strcmp(kind.data, BIOP_SERVICEGATEWAY) == 0)
+		else if(strcmp((char *) kind.data, BIOP_SERVICEGATEWAY) == 0)
 		{
 			/* the service gateway is the root directory */
 			verbose("DSM::ServiceGateway");
-			dirname = make_dir(kind.data, car->current_pid, mod->download_id, mod->module_id, key.data, key.size);
+			dirname = make_dir((char *) kind.data, car->current_pid, mod->download_id, mod->module_id, (char *) key.data, key.size);
 			process_biop_dir(data->byte_order, dirname, car, body.data, body.size);
 		}
-		else if(strcmp(kind.data, BIOP_FILE) == 0)
+		else if(strcmp((char *) kind.data, BIOP_FILE) == 0)
 		{
 			/* a file */
 			verbose("DSM::File");
 			(void) biop_sequence(data->byte_order, body.data, &file);
 			vhexdump(file.data, file.size);
-			save_file(kind.data, car->current_pid, mod->download_id, mod->module_id, key.data, key.size, file.data, file.size);
+			save_file((char *) kind.data, car->current_pid, mod->download_id, mod->module_id, (char *) key.data, key.size, file.data, file.size);
 		}
-		else if(strcmp(kind.data, BIOP_STREAM) == 0)
+		else if(strcmp((char *) kind.data, BIOP_STREAM) == 0)
 		{
 			/* a stream */
 			verbose("DSM::Stream");
@@ -124,9 +124,9 @@
 			 * just save it for now
 			 * could parse the Taps to make it easier for the browser
 			 */
-			save_file(kind.data, car->current_pid, mod->download_id, mod->module_id, key.data, key.size, body.data, body.size);
+			save_file((char *) kind.data, car->current_pid, mod->download_id, mod->module_id, (char *) key.data, key.size, body.data, body.size);
 		}
-		else if(strcmp(kind.data, BIOP_STREAMEVENT) == 0)
+		else if(strcmp((char *) kind.data, BIOP_STREAMEVENT) == 0)
 		{
 			/* a stream event */
 			verbose("BIOP::StreamEvent");
@@ -135,7 +135,7 @@
 			 * just save it for now
 			 * could parse it to make it easier for the browser
 			 */
-			save_file(kind.data, car->current_pid, mod->download_id, mod->module_id, key.data, key.size, body.data, body.size);
+			save_file((char *) kind.data, car->current_pid, mod->download_id, mod->module_id, (char *) key.data, key.size, body.data, body.size);
 		}
 		else
 		{
@@ -201,7 +201,7 @@
 		 */
 		if(pid != 0)
 			add_dsmcc_pid(car, pid);
-		add_dir_entry(dirname, name.data, name.size, kind.data, pid, ior.carousel_id, ior.module_id, ior.key.data, ior.key.size);
+		add_dir_entry(dirname, (char *) name.data, name.size, (char *) kind.data, pid, ior.carousel_id, ior.module_id, (char *) ior.key.data, ior.key.size);
 		/* objectInfo */
 		data += biop_sequence65535(byte_order, data, &info);
 		vverbose(" objectInfo:");
@@ -228,7 +228,7 @@
 
 	elementary_pid = stream2pid(assoc, ior.association_tag);
 
-	make_service_root(service_id, BIOP_SERVICEGATEWAY, elementary_pid, ior.carousel_id, ior.module_id, ior.key.data, ior.key.size);
+	make_service_root(service_id, BIOP_SERVICEGATEWAY, elementary_pid, ior.carousel_id, ior.module_id, (char *) ior.key.data, ior.key.size);
 
 	return elementary_pid;
 }

Modified: redbutton-download/trunk/fs.c
===================================================================
--- redbutton-download/trunk/fs.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-download/trunk/fs.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -65,7 +65,7 @@
 }
 
 void
-save_file(char *kind, uint16_t elementary_pid, uint32_t carousel_id, uint16_t module_id, char *key, uint32_t key_size, char *file, uint32_t file_size)
+save_file(char *kind, uint16_t elementary_pid, uint32_t carousel_id, uint16_t module_id, char *key, uint32_t key_size, unsigned char *file, uint32_t file_size)
 {
 	char *root;
 	char *ascii_key;

Modified: redbutton-download/trunk/fs.h
===================================================================
--- redbutton-download/trunk/fs.h	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-download/trunk/fs.h	2008-12-09 17:01:58 UTC (rev 509)
@@ -31,7 +31,7 @@
 
 char *make_carousel_root(uint16_t, uint32_t);
 
-void save_file(char *, uint16_t, uint32_t, uint16_t, char *, uint32_t, char *, uint32_t);
+void save_file(char *, uint16_t, uint32_t, uint16_t, char *, uint32_t, unsigned char *, uint32_t);
 
 void make_service_root(uint16_t, char *, uint16_t, uint32_t, uint16_t, char *, uint32_t);
 

Modified: redbutton-download/trunk/module.c
===================================================================
--- redbutton-download/trunk/module.c	2008-12-09 14:12:15 UTC (rev 508)
+++ redbutton-download/trunk/module.c	2008-12-09 17:01:58 UTC (rev 509)
@@ -139,7 +139,7 @@
 	{
 		verbose("got module %u (size=%u)", mod->module_id, mod->size);
 		/* if it doesn't start with 'BIOP' assume it is compressed */
-		if(strncmp(mod->data, BIOP_MAGIC_STR, BIOP_MAGIC_LEN) != 0)
+		if(strncmp((char *) mod->data, BIOP_MAGIC_STR, BIOP_MAGIC_LEN) != 0)
 		{
 			vhexdump(mod->data, mod->size);
 			uncompress_module(mod);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.