| 1 |
hd_brummy 09/12/27 16:40:25 |
| 2 |
|
| 3 |
Modified: vdr-cdda-0.1.0_gcc-4.4.patch |
| 4 |
Log: |
| 5 |
new gcc-4.4 patch |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: vdr-cdda-0.1.0_gcc-4.4.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- vdr-cdda-0.1.0_gcc-4.4.patch 23 Dec 2009 21:12:27 -0000 1.1 |
| 22 |
+++ vdr-cdda-0.1.0_gcc-4.4.patch 27 Dec 2009 16:40:24 -0000 1.2 |
| 23 |
@@ -1,15 +1,85 @@ |
| 24 |
-fix gcc-4.4 compile issues |
| 25 |
-https://bugs.gentoo.org/show_bug.cgi?id=297361 |
| 26 |
---- cdda-0.1.0.orig/cdda_cddb.c 2005-12-24 11:17:06.000000000 +0100 |
| 27 |
-+++ cdda-0.1.0/cdda_cddb.c 2009-12-22 21:44:55.688664502 +0100 |
| 28 |
-@@ -58,7 +58,8 @@ |
| 29 |
+diff -Naur cdda-0.1.0.orig/cdda_cddb.c cdda-0.1.0/cdda_cddb.c |
| 30 |
+--- cdda-0.1.0.orig/cdda_cddb.c 2009-12-27 17:18:37.000000000 +0100 |
| 31 |
++++ cdda-0.1.0/cdda_cddb.c 2009-12-27 17:28:09.000000000 +0100 |
| 32 |
+@@ -58,14 +58,14 @@ |
| 33 |
|
| 34 |
sscanf(key, "%a[^\n0-9]%d", &p_key, &track); |
| 35 |
|
| 36 |
- char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/'); |
| 37 |
-+ char *p_value1 = NULL, *p_value2 = NULL; |
| 38 |
-+ const char *p_idx = index(value, '/'); |
| 39 |
++ const char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/'); |
| 40 |
if (NULL != p_idx && 0x20 == *(p_idx-1) && 0x20 == *(p_idx+1) && 0x00 != *(p_idx+2)) |
| 41 |
sscanf(value, "%a[^/] / %a[^/]", &p_value1, &p_value2); |
| 42 |
else |
| 43 |
- |
| 44 |
+ sscanf(value, "%a[^/]", &p_value1); |
| 45 |
+ |
| 46 |
+- FixString(p_value1); |
| 47 |
+- FixString(p_value2); |
| 48 |
++ FixString((char *)p_value1); |
| 49 |
++ FixString((char *)p_value2); |
| 50 |
+ #ifdef DEBUG |
| 51 |
+ printf("S key=<%s> track=%d value1=<%s> value2=<%s>\n", p_key, track, p_value1, p_value2); |
| 52 |
+ #endif |
| 53 |
+@@ -74,19 +74,19 @@ |
| 54 |
+ char *p_str = NULL; |
| 55 |
+ if (0 == strncmp("DISCID", p_key, 6)) { |
| 56 |
+ p_str = ConCatString(tag[0]->GetDiscId(), p_value1); |
| 57 |
+- free(p_value1); |
| 58 |
++ free((char *)p_value1); |
| 59 |
+ p_value1 = p_str; |
| 60 |
+ tag[0]->SetDiscId(p_value1); |
| 61 |
+ tag[0]->SetGenre(genre); |
| 62 |
+ } else if (0 == strncmp("DTITLE", p_key, 6)) { |
| 63 |
+ if (NULL != p_value1 && NULL != p_value2) { |
| 64 |
+ p_str = ConCatString(tag[0]->GetPerformer(), p_value1); |
| 65 |
+- free(p_value1); |
| 66 |
++ free((char *)p_value1); |
| 67 |
+ p_value1 = p_str; |
| 68 |
+ tag[0]->SetPerformer(p_value1); |
| 69 |
+ |
| 70 |
+ p_str = ConCatString(tag[0]->GetTitle(), p_value2); |
| 71 |
+- free(p_value2); |
| 72 |
++ free((char *)p_value2); |
| 73 |
+ p_value2 = p_str; |
| 74 |
+ tag[0]->SetTitle(p_value2); |
| 75 |
+ } else if (NULL != p_value1 && NULL == p_value2) { |
| 76 |
+@@ -94,7 +94,7 @@ |
| 77 |
+ tag[0]->SetPerformer(p_value1); |
| 78 |
+ else { |
| 79 |
+ p_str = ConCatString(tag[0]->GetTitle(), p_value1); |
| 80 |
+- free(p_value1); |
| 81 |
++ free((char *)p_value1); |
| 82 |
+ p_value1 = p_str; |
| 83 |
+ tag[0]->SetTitle(p_value1); |
| 84 |
+ } |
| 85 |
+@@ -108,17 +108,17 @@ |
| 86 |
+ tag[track+1]->SetPerformer(tag[0]->GetPerformer()); |
| 87 |
+ |
| 88 |
+ p_str = ConCatString(tag[track+1]->GetTitle(), p_value1); |
| 89 |
+- free(p_value1); |
| 90 |
++ free((char *)p_value1); |
| 91 |
+ p_value1 = p_str; |
| 92 |
+ tag[track+1]->SetTitle(p_value1); |
| 93 |
+ } else { |
| 94 |
+ p_str = ConCatString(tag[track+1]->GetPerformer(), p_value1); |
| 95 |
+- free(p_value1); |
| 96 |
++ free((char *)p_value1); |
| 97 |
+ p_value1 = p_str; |
| 98 |
+ tag[track+1]->SetPerformer(p_value1); |
| 99 |
+ |
| 100 |
+ p_str = ConCatString(tag[track+1]->GetTitle(), p_value2); |
| 101 |
+- free(p_value2); |
| 102 |
++ free((char *)p_value2); |
| 103 |
+ p_value2 = p_str; |
| 104 |
+ tag[track+1]->SetTitle(p_value2); |
| 105 |
+ } |
| 106 |
+@@ -137,8 +137,8 @@ |
| 107 |
+ } |
| 108 |
+ } |
| 109 |
+ free(p_key); |
| 110 |
+- free(p_value1); |
| 111 |
+- free(p_value2); |
| 112 |
++ free((char *)p_value1); |
| 113 |
++ free((char *)p_value2); |
| 114 |
+ } |
| 115 |
+ } |
| 116 |
+ |
Archives