diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
| commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
| tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /media-plugins/vdr-loadepg/files | |
| parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) | |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'media-plugins/vdr-loadepg/files')
| -rw-r--r-- | media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch (renamed from media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch) | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch index c650ff61d7c3..92a8b76f8e02 100644 --- a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch +++ b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch @@ -3,58 +3,58 @@ https://bugs.gentoo.org/663348 compile fix for invalid conversion from char to const char* thx to Michael Brakemeier for point this out -Signed-of-by: Joerg Bornkessel <hd_brummy@astrali.de> (17 Nov 2019) -diff -Naur loadepg-0.2.5.orig/loadepg.c loadepg-0.2.5/loadepg.c ---- loadepg-0.2.5.orig/loadepg.c 2019-11-17 14:49:27.637235533 +0100 -+++ loadepg-0.2.5/loadepg.c 2019-11-17 14:50:23.690235533 +0100 -@@ -159,7 +159,7 @@ +Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (29 Feb 2020) +diff -Naur vdr-loadepg-0.2.7.orig/loadepg.c vdr-loadepg-0.2.7/loadepg.c +--- vdr-loadepg-0.2.7.orig/loadepg.c 2020-02-28 14:08:35.713790460 +0100 ++++ vdr-loadepg-0.2.7/loadepg.c 2020-02-28 14:11:05.457790460 +0100 +@@ -162,7 +162,7 @@ (lProviders + nProviders)->SourceId = cSource::FromString(string2); asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2); asprintf(&(lProviders + nProviders)->Parm2, "%s", string3); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; IsSkyThemesNull = true; } -@@ -169,8 +169,8 @@ +@@ -172,8 +172,8 @@ (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1; (lProviders + nProviders)->SourceId = cSource::FromString(string2); asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2); -- asprintf(&(lProviders + nProviders)->Parm2, '\0'); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm2, ""); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0'); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm2, (char *) ""); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5) -@@ -179,8 +179,8 @@ +@@ -182,8 +182,8 @@ (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2; (lProviders + nProviders)->SourceId = cSource::FromString(string2); asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2); -- asprintf(&(lProviders + nProviders)->Parm2, '\0'); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm2, ""); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0'); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm2, (char *) ""); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2) -@@ -189,8 +189,8 @@ +@@ -192,8 +192,8 @@ (lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE; (lProviders + nProviders)->SourceId = 0; asprintf(&(lProviders + nProviders)->Parm1, "%s", string2); -- asprintf(&(lProviders + nProviders)->Parm2, '\0'); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm2, ""); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0'); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm2, (char *) ""); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3) -@@ -200,7 +200,7 @@ +@@ -203,7 +203,7 @@ (lProviders + nProviders)->SourceId = 0; asprintf(&(lProviders + nProviders)->Parm1, "%s", string2); asprintf(&(lProviders + nProviders)->Parm2, "%s", string3); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } } |