aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory.c
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-08-01 04:18:41 +0000
committerEric Wong <normalperson@yhbt.net>2006-08-01 04:18:41 +0000
commit5aca21a502839e2cfd30f0cfb186badc302a7eb5 (patch)
tree9e8b25b4b2c648a85dedcfe69c1bc7100564b4f9 /src/directory.c
parent9ccf40b24293198c8091ca5dc269006776b080bc (diff)
downloadmpd-5aca21a502839e2cfd30f0cfb186badc302a7eb5.tar.gz
mpd-5aca21a502839e2cfd30f0cfb186badc302a7eb5.tar.xz
mpd-5aca21a502839e2cfd30f0cfb186badc302a7eb5.zip
Several fixes uncovered with -pedantic
playerData.c: proper error checking directory.c: properly check myFgets() for errors (it returns NULL on error) inputPlugins/mp3_plugin.c get rid of commas at the end of enums interface.c: we weren't using long long, so strtoll isn't needed get rid of void-pointer arithmetic sllist.c: get rid of void-pointer arithmetic compress.c: get rid of C++ comments, some compilers don't accept them Note that I personally like void pointer arithmetic, but some ancient compilers don't support them :( git-svn-id: https://svn.musicpd.org/mpd/trunk@4510 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/directory.c')
-rw-r--r--src/directory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/directory.c b/src/directory.c
index 9f07b203e..da4b0a4eb 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -940,14 +940,14 @@ static void readDirectoryInfo(FILE * fp, Directory * directory)
&& 0 != strncmp(DIRECTORY_END, buffer, strlen(DIRECTORY_END))) {
if (0 == strncmp(DIRECTORY_DIR, buffer, strlen(DIRECTORY_DIR))) {
key = strdup(&(buffer[strlen(DIRECTORY_DIR)]));
- if (myFgets(buffer, bufferSize, fp) < 0) {
+ if (!myFgets(buffer, bufferSize, fp)) {
ERROR("Error reading db, fgets\n");
exit(EXIT_FAILURE);
}
/* for compatibility with db's prior to 0.11 */
if (0 == strncmp(DIRECTORY_MTIME, buffer,
strlen(DIRECTORY_MTIME))) {
- if (myFgets(buffer, bufferSize, fp) < 0) {
+ if (!myFgets(buffer, bufferSize, fp)) {
ERROR("Error reading db, fgets\n");
exit(EXIT_FAILURE);
}
@@ -1140,7 +1140,7 @@ int readDirectoryDB()
int foundFsCharset = 0;
int foundVersion = 0;
- if (myFgets(buffer, bufferSize, fp) < 0) {
+ if (!myFgets(buffer, bufferSize, fp)) {
ERROR("Error reading db, fgets\n");
exit(EXIT_FAILURE);
}