mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

netfile: make f_type const char *

Browse Source 
Remove lots of unnecessary (and potentially wrong) (char *) casts by
making f_type const char *.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1551 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-06-19 20:26:17 +00:00
parent 85270c7033
commit af58480ece
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/audiodec/basedec.cpp
View File

@@ -86,7 +86,7 @@ CBaseDec::RetCode CBaseDec::DecoderBase(CAudiofile* const in,
fprintf( stderr, "Error adding shoutcast callback: %s", fprintf( stderr, "Error adding shoutcast callback: %s",
err_txt ); err_txt );
} }
if(ftype(fp, (char *) "ogg")) if (ftype(fp, "ogg"))
{ {
Status = COggDec::getInstance()->Decoder( fp, OutputFd, state, Status = COggDec::getInstance()->Decoder( fp, OutputFd, state,
&in->MetaData, t, &in->MetaData, t,

22
src/driver/netfile.cpp
View File

@@ -210,7 +210,7 @@ static int base64_encode(char *dest, const char *src);
void getOpts() void getOpts()
{ {
char *dirs[] = { (char *) "/var/etc", (char *) ".", NULL }; const char *dirs[] = { "/var/etc", ".", NULL };
char buf[4096], *ptr; char buf[4096], *ptr;
int i; int i;
FILE *fd = NULL; FILE *fd = NULL;
@@ -1103,7 +1103,7 @@ FILE *f_open(const char *filename, const char *acctype)
{ {
if (((*(uint32_t *)&(magic[0])) & *(uint32_t *)&(known_magic[i].mask[0])) == *(uint32_t *)&(known_magic[i].mode[0])) if (((*(uint32_t *)&(magic[0])) & *(uint32_t *)&(known_magic[i].mask[0])) == *(uint32_t *)&(known_magic[i].mode[0]))
{ {
f_type(fd, (char *)known_magic[i].type); f_type(fd, known_magic[i].type);
goto magic_found; goto magic_found;
} }
} }
@@ -1116,16 +1116,16 @@ FILE *f_open(const char *filename, const char *acctype)
if (ptr++) if (ptr++)
{ {
if( strcasecmp(ptr, "cdr") == 0) f_type(fd, (char *) "audio/cdr"); if (strcasecmp(ptr, "cdr") == 0) f_type(fd, "audio/cdr");
if( strcasecmp(ptr, "wav") == 0) f_type(fd, (char *) "audio/wave"); if (strcasecmp(ptr, "wav") == 0) f_type(fd, "audio/wave");
if( strcasecmp(ptr, "aif") == 0) f_type(fd, (char *) "audio/aifc"); if (strcasecmp(ptr, "aif") == 0) f_type(fd, "audio/aifc");
if( strcasecmp(ptr, "snd") == 0) f_type(fd, (char *) "audio/snd"); if (strcasecmp(ptr, "snd") == 0) f_type(fd, "audio/snd");
/* they should be obsolete now due to the file magic detection */ /* they should be obsolete now due to the file magic detection */
if( strcasecmp(ptr, "ogg") == 0) f_type(fd, (char *) "audio/ogg"); if (strcasecmp(ptr, "ogg") == 0) f_type(fd, "audio/ogg");
if( strcasecmp(ptr, "mp3") == 0) f_type(fd, (char *) "audio/mpeg"); if (strcasecmp(ptr, "mp3") == 0) f_type(fd, "audio/mpeg");
if( strcasecmp(ptr, "mp2") == 0) f_type(fd, (char *) "audio/mpeg"); if (strcasecmp(ptr, "mp2") == 0) f_type(fd, "audio/mpeg");
if( strcasecmp(ptr, "mpa") == 0) f_type(fd, (char *) "audio/mpeg"); if (strcasecmp(ptr, "mpa") == 0) f_type(fd, "audio/mpeg");
} }
magic_found: magic_found:
; ;
@@ -1279,7 +1279,7 @@ size_t f_read (void *ptr, size_t size, size_t nitems, FILE *stream)
return rval; return rval;
} }
char *f_type(FILE *stream, char *type) const char *f_type(FILE *stream, const char *type)
{ {
int i; int i;

2
src/driver/netfile.h
View File

@@ -83,7 +83,7 @@ extern long f_tell(FILE *);
extern void f_rewind(FILE *); extern void f_rewind(FILE *);
extern int f_seek(FILE *, long, int); extern int f_seek(FILE *, long, int);
extern int f_status(FILE *, void (*)(void*)); extern int f_status(FILE *, void (*)(void*));
extern char *f_type(FILE*, char*); extern const char *f_type(FILE*, const char*);
extern char err_txt[2048]; extern char err_txt[2048];