[patch] changes strchr to (char *)strchr for gcc-4.4

gcc-4.4.patch (text/plain), 13.12 KB, created by Timothy Knoll on 2009-06-03 04:20:31 UTC

Index: libs/libmythtv/hdhomerun/hdhomerun_config.c
===================================================================
--- libs/libmythtv/hdhomerun/hdhomerun_config.c	(revision 19961)
+++ libs/libmythtv/hdhomerun/hdhomerun_config.c	(working copy)
@@ -252,7 +252,7 @@
 			continue;
 		}
 		while (1) {
-			char *end = strchr(streaminfo, '\n');
+			char *end = (char *)strchr(streaminfo, '\n');
 			if (!end) {
 				break;
 			}
Index: libs/libmythtv/vbitext/lang.c
===================================================================
--- libs/libmythtv/vbitext/lang.c	(revision 19961)
+++ libs/libmythtv/vbitext/lang.c	(working copy)
@@ -175,7 +175,7 @@
                            struct mark *mark = marks + (mode - 16);
                            char *x;
 
-                           if ((x = strchr(mark->g0, data)))
+                           if ((x = (char *)strchr(mark->g0, data)))
                            {
                                if (latin1)
                                    data = mark->latin1[x - mark->g0];
Index: libs/libmythtv/xine_demux_sputext.c
===================================================================
--- libs/libmythtv/xine_demux_sputext.c	(revision 19961)
+++ libs/libmythtv/xine_demux_sputext.c	(working copy)
@@ -112,7 +112,7 @@
   this->buflen += nread;
   this->buf[this->buflen] = '\0';
 
-  s = strchr(this->buf, '\n');
+  s = (char *)strchr(this->buf, '\n');
 
   if (line && (s || this->buflen)) {
     
@@ -163,7 +163,7 @@
       break;
       
     case 2: /* find ">" */
-      if ((s = strchr (s, '>'))) { s++; state = 3; p = text; continue; }
+      if ((s = (char *)strchr (s, '>'))) { s++; state = 3; p = text; continue; }
       break;
       
     case 3: /* get all text until '<' appears */
@@ -190,7 +190,7 @@
 	if (current->lines > 0) { state = 99; break; }
 	state = 0; continue;
       }
-      s = strchr (s, '>');
+      s = (char *)strchr (s, '>');
       if (s) { s++; state = 3; continue; }
       break;
     }
Index: libs/libavcodec/utils.c
===================================================================
--- libs/libavcodec/utils.c	(revision 19961)
+++ libs/libavcodec/utils.c	(working copy)
@@ -1512,9 +1512,9 @@
          }
 
     /* Then, we try to parse it as fraction */
-    cp = strchr(arg, '/');
+    cp = (char *)strchr(arg, '/');
     if (!cp)
-        cp = strchr(arg, ':');
+        cp = (char *)strchr(arg, ':');
     if (cp) {
         char* cpp;
         frame_rate->num = strtol(arg, &cpp, 10);
Index: libs/libavcodec/ratecontrol.c
===================================================================
--- libs/libavcodec/ratecontrol.c	(revision 19961)
+++ libs/libavcodec/ratecontrol.c	(working copy)
@@ -133,7 +133,7 @@
         /* find number of pics */
         p= s->avctx->stats_in;
         for(i=-1; p; i++){
-            p= strchr(p+1, ';');
+            p= (char *)strchr(p+1, ';');
         }
         i+= s->max_b_frames;
         if(i<=0 || i>=INT_MAX / sizeof(RateControlEntry))
@@ -158,7 +158,7 @@
             int e;
             char *next;
 
-            next= strchr(p, ';');
+            next= (char *)strchr(p, ';');
             if(next){
                 (*next)=0; //sscanf in unbelievably slow on looong strings //FIXME copy / do not write
                 next++;
Index: libs/libavcodec/eval.c
===================================================================
--- libs/libavcodec/eval.c	(revision 19961)
+++ libs/libavcodec/eval.c	(working copy)
@@ -216,7 +216,7 @@
         }
     }
 
-    p->s= strchr(p->s, '(');
+    p->s= (char *)strchr(p->s, '(');
     if(p->s==NULL){
         *p->error = "missing (";
         p->s= next;
Index: libs/libavformat/rtpproto.c
===================================================================
--- libs/libavformat/rtpproto.c	(revision 19961)
+++ libs/libavformat/rtpproto.c	(working copy)
@@ -123,7 +123,7 @@
     is_multicast = 0;
     ttl = -1;
     local_port = -1;
-    p = strchr(uri, '?');
+    p = (char *)strchr(uri, '?');
     if (p) {
         is_multicast = find_info_tag(buf, sizeof(buf), "multicast", p);
         if (find_info_tag(buf, sizeof(buf), "ttl", p)) {
Index: libs/libavformat/matroskadec.c
===================================================================
--- libs/libavformat/matroskadec.c	(revision 19961)
+++ libs/libavformat/matroskadec.c	(working copy)
@@ -1357,7 +1357,7 @@
                 char *text, *end;
                 if ((res = ebml_read_utf8(matroska, &id, &text)) < 0)
                     break;
-                if ((end = strchr(text, '-')))
+                if ((end = (char *)strchr(text, '-')))
                     *end = '\0';
                 if (strlen(text) == 3)
                     strcpy(track->language, text);
Index: libs/libavformat/rtsp.c
===================================================================
--- libs/libavformat/rtsp.c	(revision 19961)
+++ libs/libavformat/rtsp.c	(working copy)
@@ -857,14 +857,14 @@
         port = RTSP_DEFAULT_PORT;
 
     /* search for options */
-    option_list = strchr(path, '?');
+    option_list = (char *)strchr(path, '?');
     if (option_list) {
         /* remove the options from the path */
         *option_list++ = 0;
         while(option_list) {
             /* move the option pointer */
             option = option_list;
-            option_list = strchr(option_list, '&');
+            option_list = (char *)strchr(option_list, '&');
             if (option_list)
                 *(option_list++) = 0;
             /* handle the options */
Index: libs/libavformat/utils.c
===================================================================
--- libs/libavformat/utils.c	(revision 19961)
+++ libs/libavformat/utils.c	(working copy)
@@ -3131,7 +3131,7 @@
     if (path_size > 0)          path[0] = 0;
 
     /* parse protocol */
-    if ((p = strchr(url, ':'))) {
+    if ((p = (char *)strchr(url, ':'))) {
         av_strlcpy(proto, url, FFMIN(proto_size, p + 1 - url));
         p++; /* skip ':' */
         if (*p == '/') p++;
@@ -3143,30 +3143,30 @@
     }
 
     /* separate path from hostname */
-    if ((ls = strchr(p, '/'))) {
-        if ((q = strchr(ls, '?')))
+    if ((ls = (char *)strchr(p, '/'))) {
+        if ((q = (char *)strchr(ls, '?')))
             av_strlcpy(path, ls, FFMIN(path_size, q - ls + 1));
         else
             av_strlcpy(path, ls, path_size);
-    } else if (!(ls = strchr(p, '?')))
+    } else if (!(ls = (char *)strchr(p, '?')))
         ls = &p[strlen(p)]; // XXX
 
     /* the rest is hostname, use that to parse auth/port */
     if (ls != p) {
         /* authorization (user[:pass]@hostname) */
-        if ((at = strchr(p, '@')) && at < ls) {
+        if ((at = (char *)strchr(p, '@')) && at < ls) {
             av_strlcpy(authorization, p,
                        FFMIN(authorization_size, at + 1 - p));
             p = at + 1; /* skip '@' */
         }
 
-        if (*p == '[' && (brk = strchr(p, ']')) && brk < ls) {
+        if (*p == '[' && (brk = (char *)strchr(p, ']')) && brk < ls) {
             /* [host]:port */
             av_strlcpy(hostname, p + 1,
                        FFMIN(hostname_size, brk - p));
             if (brk[1] == ':' && port_ptr)
                 *port_ptr = atoi(brk + 2);
-        } else if ((col = strchr(p, ':')) && col < ls) {
+        } else if ((col = (char *)strchr(p, ':')) && col < ls) {
             av_strlcpy(hostname, p,
                        FFMIN(col + 1 - p, hostname_size));
             if (port_ptr) *port_ptr = atoi(col + 1);
Index: libs/libavformat/http.c
===================================================================
--- libs/libavformat/http.c	(revision 19961)
+++ libs/libavformat/http.c	(working copy)
@@ -195,7 +195,7 @@
             if (!strncmp (p, "bytes ", 6)) {
                 p += 6;
                 s->off = atoll(p);
-                if ((slash = strchr(p, '/')) && strlen(slash) > 0)
+                if ((slash = (char *)strchr(p, '/')) && strlen(slash) > 0)
                     s->filesize = atoll(slash+1);
             }
             h->is_streamed = 0; /* we _can_ in fact seek */
Index: libs/libavformat/sdp.c
===================================================================
--- libs/libavformat/sdp.c	(revision 19961)
+++ libs/libavformat/sdp.c	(working copy)
@@ -73,7 +73,7 @@
     url_split(NULL, 0, NULL, 0, dest_addr, size, &port, NULL, 0, url);
 
     *ttl = 0;
-    p = strchr(url, '?');
+    p = (char *)strchr(url, '?');
     if (p) {
         char buff[64];
         int is_multicast = find_info_tag(buff, sizeof(buff), "multicast", p);
Index: libs/libavformat/udp.c
===================================================================
--- libs/libavformat/udp.c	(revision 19961)
+++ libs/libavformat/udp.c	(working copy)
@@ -325,7 +325,7 @@
 
     h->priv_data = s;
     s->ttl = 16;
-    p = strchr(uri, '?');
+    p = (char *)strchr(uri, '?');
     if (p) {
         s->is_multicast = find_info_tag(buf, sizeof(buf), "multicast", p);
         s->reuse_socket = find_info_tag(buf, sizeof(buf), "reuse", p);
Index: libs/libavformat/x11grab.c
===================================================================
--- libs/libavformat/x11grab.c	(revision 19961)
+++ libs/libavformat/x11grab.c	(working copy)
@@ -98,7 +98,7 @@
     char *param, *offset;
 
     param = av_strdup(s1->filename);
-    offset = strchr(param, '+');
+    offset = (char *)strchr(param, '+');
     if (offset) {
         sscanf(offset, "%d,%d", &x_off, &y_off);
         *offset= 0;
Index: libs/libavformat/nsvdec.c
===================================================================
--- libs/libavformat/nsvdec.c	(revision 19961)
+++ libs/libavformat/nsvdec.c	(working copy)
@@ -325,13 +325,13 @@
             if (p >= endp-2)
                 break;
             token = p;
-            p = strchr(p, '=');
+            p = (char *)strchr(p, '=');
             if (!p || p >= endp-2)
                 break;
             *p++ = '\0';
             quote = *p++;
             value = p;
-            p = strchr(p, quote);
+            p = (char *)strchr(p, quote);
             if (!p || p >= endp)
                 break;
             *p++ = '\0';
Index: libs/libavformat/tcp.c
===================================================================
--- libs/libavformat/tcp.c	(revision 19961)
+++ libs/libavformat/tcp.c	(working copy)
@@ -43,7 +43,7 @@
     url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
       &port, path, sizeof(path), uri);  // PETR: use url_split
     if (strcmp(proto,"tcp")) goto fail; // PETR: check protocol
-    if ((q = strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); } // PETR: take only the part after '@' for tcp protocol
+    if ((q = (char *)strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); } // PETR: take only the part after '@' for tcp protocol
 
     s = av_malloc(sizeof(TCPContext));
     if (!s)
Index: libs/libmyth/qmdcodec.cpp
===================================================================
--- libs/libmyth/qmdcodec.cpp	(revision 19961)
+++ libs/libmyth/qmdcodec.cpp	(working copy)
@@ -128,7 +128,7 @@
 
 
 /******************************** QCodecs ********************************/
-// strchr(3) for broken systems.
+// (char *)strchr(3) for broken systems.
 static int rikFindChar(register const char * _s, const char c)
 {
   register const char * s = _s;
Index: libs/libmythdvdnav/dvd_reader.c
===================================================================
--- libs/libmythdvdnav/dvd_reader.c	(revision 19961)
+++ libs/libmythdvdnav/dvd_reader.c	(working copy)
@@ -353,7 +353,7 @@
     if( ret < 0 ) {
 
         /* maybe "host:port" url? try opening it with acCeSS library */
-        if( strchr(path,':') ) {
+        if( (char *)strchr(path,':') ) {
 			ret_val = DVDOpenImageFile( path, have_css );
 			free(path);
 	        return ret_val;
Index: libs/libmythfreemheg/Text.cpp
===================================================================
--- libs/libmythfreemheg/Text.cpp	(revision 19961)
+++ libs/libmythfreemheg/Text.cpp	(working copy)
@@ -243,26 +243,26 @@
     else { // Textual form.
         const unsigned char *str = attrs.Bytes();
         const char *p = (const char *)str;
-        char *q = strchr(p, '.'); // Find the terminating dot
+        char *q = (char *)strchr(p, '.'); // Find the terminating dot
         if (q != NULL) { // plain, italic etc.
             if (q-p == 6 && strncmp(p, "italic", 6) == 0) style = 1;
             else if (q-p == 4 && strncmp(p, "bold", 4) == 0) style = 2;
             else if (q-p == 11 && strncmp(p, "bold-italic", 11) == 0) style = 3;
             // else it's plain.
             p = q+1;
-            q = strchr(p, '.'); // Find the next dot.
+            q = (char *)strchr(p, '.'); // Find the next dot.
         }
         if (q != NULL) { // Size
             size = atoi(p);
             if (size == 0) size = 0x18;
             p = q+1;
-            q = strchr(p, '.'); // Find the next dot.
+            q = (char *)strchr(p, '.'); // Find the next dot.
         }
         if (q != NULL) { // lineSpacing
             lineSpace = atoi(p);
             if (lineSpace == 0) size = 0x18;
             p = q+1;
-            q = strchr(p, '.'); // Find the next dot.
+            q = (char *)strchr(p, '.'); // Find the next dot.
         }
         if (q != NULL) { // letter spacing.  May be zero or negative
             letterSpace = atoi(p);