aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-09-15 04:08:07 -04:00
Code

Squelch another bunch of warnings after checking that what's happening is what's

Browse Source 
wanted.


git-svn-id: https://svn.xiph.org/trunk/ezstream@15780 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2009-03-16 20:22:56 +00:00
parent f193a9d5ad
commit b11e6acb36
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configfile.c
View File

@ -468,7 +468,7 @@ parseConfig(const char *fileName)
xmlNodePtr cur3; xmlNodePtr cur3;
FORMAT_ENCDEC *pformatEncDec; FORMAT_ENCDEC *pformatEncDec;
pformatEncDec = xcalloc(1, sizeof(FORMAT_ENCDEC)); pformatEncDec = xcalloc(1UL, sizeof(FORMAT_ENCDEC));
for (cur3 = cur2->xmlChildrenNode; for (cur3 = cur2->xmlChildrenNode;
cur3 != NULL; cur3 = cur3->next) { cur3 != NULL; cur3 = cur3->next) {

17
src/ezstream.c
View File

@ -116,9 +116,9 @@ char * getMetadataString(const char *, metadata_t *);
metadata_t * getMetadata(const char *); metadata_t * getMetadata(const char *);
int setMetadata(shout_t *, metadata_t *, char **); int setMetadata(shout_t *, metadata_t *, char **);
FILE * openResource(shout_t *, const char *, int *, metadata_t **, FILE * openResource(shout_t *, const char *, int *, metadata_t **,
int *, int *); int *, long *);
int reconnectServer(shout_t *, int); int reconnectServer(shout_t *, int);
const char * getTimeString(int); const char * getTimeString(long);
int sendStream(shout_t *, FILE *, const char *, int, const char *, int sendStream(shout_t *, FILE *, const char *, int, const char *,
struct timeval *); struct timeval *);
int streamFile(shout_t *, const char *); int streamFile(shout_t *, const char *);
@ -568,7 +568,7 @@ setMetadata(shout_t *shout, metadata_t *mdata, char **mdata_copy)
FILE * FILE *
openResource(shout_t *shout, const char *fileName, int *popenFlag, openResource(shout_t *shout, const char *fileName, int *popenFlag,
metadata_t **mdata_p, int *isStdin, int *songLen) metadata_t **mdata_p, int *isStdin, long *songLen)
{ {
FILE *filep = NULL; FILE *filep = NULL;
char extension[25]; char extension[25];
@ -743,10 +743,10 @@ reconnectServer(shout_t *shout, int closeConn)
} }
const char * const char *
getTimeString(int seconds) getTimeString(long seconds)
{ {
static char str[20]; static char str[20];
int secs, mins, hours; long secs, mins, hours;
if (seconds < 0) if (seconds < 0)
return (NULL); return (NULL);
@ -757,7 +757,7 @@ getTimeString(int seconds)
mins = secs / 60; mins = secs / 60;
secs %= 60; secs %= 60;
snprintf(str, sizeof(str), "%uh%02um%02us", hours, mins, secs); snprintf(str, sizeof(str), "%ldh%02ldm%02lds", hours, mins, secs);
return ((const char *)str); return ((const char *)str);
} }
@ -782,7 +782,7 @@ sendStream(shout_t *shout, FILE *filepstream, const char *fileName,
total = oldTotal = 0; total = oldTotal = 0;
ret = STREAM_DONE; ret = STREAM_DONE;
while ((bytes_read = fread(buff, 1, sizeof(buff), filepstream)) > 0) { while ((bytes_read = fread(buff, 1UL, sizeof(buff), filepstream)) > 0) {
if (shout_get_connected(shout) != SHOUTERR_CONNECTED && if (shout_get_connected(shout) != SHOUTERR_CONNECTED &&
reconnectServer(shout, 0) == 0) { reconnectServer(shout, 0) == 0) {
ret = STREAM_SERVERR; ret = STREAM_SERVERR;
@ -889,7 +889,8 @@ streamFile(shout_t *shout, const char *fileName)
int popenFlag = 0; int popenFlag = 0;
char *songLenStr = NULL; char *songLenStr = NULL;
int isStdin = 0; int isStdin = 0;
int ret, retval = 0, songLen; int ret, retval = 0;
long songLen;
metadata_t *mdata; metadata_t *mdata;
struct timeval startTime; struct timeval startTime;

4
src/metadata.c
View File

@ -84,7 +84,7 @@ metadata_create(const char *filename)
{ {
metadata_t *md; metadata_t *md;
md = xcalloc(1, sizeof(metadata_t)); md = xcalloc(1UL, sizeof(metadata_t));
md->filename = xstrdup(filename); md->filename = xstrdup(filename);
md->songLen = -1; md->songLen = -1;
@ -572,7 +572,7 @@ metadata_program_update(metadata_t *md, enum metadata_request md_req)
return (0); return (0);
} }
if (fgets(buf, sizeof(buf), filep) == NULL) { if (fgets(buf, (int)sizeof(buf), filep) == NULL) {
if (ferror(filep)) if (ferror(filep))
printf("%s: Error while reading output from program '%s': %s\n", printf("%s: Error while reading output from program '%s': %s\n",
__progname, md->filename, strerror(errno)); __progname, md->filename, strerror(errno));

12
src/playlist.c
View File

@ -57,7 +57,7 @@ playlist_create(const char *filename)
{ {
playlist_t *pl; playlist_t *pl;
pl = xcalloc(1, sizeof(playlist_t)); pl = xcalloc(1UL, sizeof(playlist_t));
pl->filename = xstrdup(filename); pl->filename = xstrdup(filename);
return (pl); return (pl);
@ -77,14 +77,14 @@ playlist_add(playlist_t *pl, const char *entry)
num = pl->num + 1; num = pl->num + 1;
if (pl->size == 0) { if (pl->size == 0) {
pl->list = xcalloc(2, sizeof(char *)); pl->list = xcalloc(2UL, sizeof(char *));
pl->size = 2 * sizeof(char *); pl->size = 2 * sizeof(char *);
} }
if (pl->size / sizeof(char *) <= num) { if (pl->size / sizeof(char *) <= num) {
size_t i; size_t i;
pl->list = xrealloc(pl->list, 2, pl->size); pl->list = xrealloc(pl->list, 2UL, pl->size);
pl->size = 2 * pl->size; pl->size = 2 * pl->size;
for (i = num; i < pl->size / sizeof(char *); i++) for (i = num; i < pl->size / sizeof(char *); i++)
@ -146,7 +146,7 @@ playlist_read(const char *filename)
} }
line = 0; line = 0;
while (fgets(buf, sizeof(buf), filep) != NULL) { while (fgets(buf, (int)sizeof(buf), filep) != NULL) {
line++; line++;
if (strlen(buf) == sizeof(buf) - 1) { if (strlen(buf) == sizeof(buf) - 1) {
@ -155,7 +155,7 @@ playlist_read(const char *filename)
printf("%s[%lu]: File or path name too long\n", printf("%s[%lu]: File or path name too long\n",
filename, line); filename, line);
/* Discard any excess chars in that line. */ /* Discard any excess chars in that line. */
while (fgets(skip_buf, sizeof(skip_buf), filep) != NULL) { while (fgets(skip_buf, (int)sizeof(skip_buf), filep) != NULL) {
if (skip_buf[0] == '\n') if (skip_buf[0] == '\n')
break; break;
} }
@ -504,7 +504,7 @@ playlist_run_program(playlist_t *pl)
return (NULL); return (NULL);
} }
if (fgets(buf, sizeof(buf), filep) == NULL) { if (fgets(buf, (int)sizeof(buf), filep) == NULL) {
if (ferror(filep)) if (ferror(filep))
printf("%s: Error while reading output from program '%s': %s\n", printf("%s: Error while reading output from program '%s': %s\n",
__progname, pl->filename, strerror(errno)); __progname, pl->filename, strerror(errno));

4
src/util.c
View File

@ -237,7 +237,7 @@ CHARtoUTF8(const char *in_str, int mode)
# if defined(HAVE_NL_LANGINFO) && defined(HAVE_SETLOCALE) && defined(CODESET) # if defined(HAVE_NL_LANGINFO) && defined(HAVE_SETLOCALE) && defined(CODESET)
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
codeset = nl_langinfo(CODESET); codeset = nl_langinfo((nl_item)CODESET);
setlocale(LC_CTYPE, "C"); setlocale(LC_CTYPE, "C");
# else # else
codeset = (char *)""; codeset = (char *)"";
@ -259,7 +259,7 @@ UTF8toCHAR(const char *in_str, int mode)
# if defined(HAVE_NL_LANGINFO) && defined(HAVE_SETLOCALE) && defined(CODESET) # if defined(HAVE_NL_LANGINFO) && defined(HAVE_SETLOCALE) && defined(CODESET)
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
codeset = nl_langinfo(CODESET); codeset = nl_langinfo((nl_item)CODESET);
setlocale(LC_CTYPE, "C"); setlocale(LC_CTYPE, "C");
# else # else
codeset = (char *)""; codeset = (char *)"";