summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2010-11-02 18:36:34 +0200
committerVille Skyttä <ville.skytta@iki.fi>2010-11-02 18:47:45 +0200
commit80b2983c266492de3c5be1c0acaf76e046cd8386 (patch)
treeeaa96531bc392c5f1905874ab901c060490f00d0
parent239ef780df3ff4d5914389d8df2f50e718c8299e (diff)
downloadvdr-plugin-muggle-80b2983c266492de3c5be1c0acaf76e046cd8386.tar.gz
vdr-plugin-muggle-80b2983c266492de3c5be1c0acaf76e046cd8386.tar.bz2
Gcc 4.4 build fixes.
-rw-r--r--mg_db.c2
-rw-r--r--mg_image_provider.c2
-rw-r--r--mg_tools.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/mg_db.c b/mg_db.c
index f6a7a91..3b62afc 100644
--- a/mg_db.c
+++ b/mg_db.c
@@ -1140,7 +1140,7 @@ mgDb::getGenre1(TagLib::FileRef& f) {
if (genre1.empty()) {
genre1 = m_TCON.toCString(the_setup.utf8);
const char *tcon=genre1.c_str();
- char *rparen=strchr(tcon,')');
+ char *rparen=strchr((char *)tcon,')');
if (tcon[0]=='(' && rparen) {
*rparen=0;
genre1 = m_GenreIds[tcon+1];
diff --git a/mg_image_provider.c b/mg_image_provider.c
index 33d53bf..c518201 100644
--- a/mg_image_provider.c
+++ b/mg_image_provider.c
@@ -39,7 +39,7 @@ int picture_select( struct dirent const *entry ) {
return (FALSE);
}
else {
- char *ext = rindex( entry->d_name, '.' );
+ const char *ext = rindex( entry->d_name, '.' );
if( ext ) {
if( !strcmp( ext, ".jpg" ) || !strcmp( ext, ".png" ) || !strcmp( ext, ".JPG" ) || !strcmp( ext, ".PNG" ) ) {
diff --git a/mg_tools.c b/mg_tools.c
index b6a5e21..c18c758 100644
--- a/mg_tools.c
+++ b/mg_tools.c
@@ -170,9 +170,9 @@ ltos (long l) {
char *
extension(const char *filename) {
- char *dot = strrchr(filename,'.');
+ char *dot = strrchr((char *)filename,'.');
if (!dot)
- dot = strrchr(filename,0)-1;
+ dot = strrchr((char *)filename,0)-1;
return dot+1;
}
@@ -209,7 +209,7 @@ bool samedir( const char *d1, const char *d2 ) {
}
bool mkdir_p(const char *s) {
- char *slash=strrchr(s,'/');
+ char *slash=strrchr((char *)s,'/');
if (!slash) return false;
char *sc = strdup(s);
*strrchr(sc,'/')=0; // cut off the filename