oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

utils: removed myFgets()

Browse Source 
Replaced myFgets() with fgets() + g_strchomp().
This commit is contained in:
Max Kellermann
2008-12-28 19:54:49 +01:00
parent 2598cdd868
commit 859aac7242
10 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/database.c
View File

@@ -268,9 +268,11 @@ db_load(void)
}
/* get initial info */
if (!myFgets(buffer, sizeof(buffer), fp))
if (!fgets(buffer, sizeof(buffer), fp))
FATAL("Error reading db, fgets\n");
g_strchomp(buffer);
if (0 != strcmp(DIRECTORY_INFO_BEGIN, buffer)) {
ERROR("db info not found in db file\n");
ERROR("you should recreate the db using --create-db\n");
@@ -278,8 +280,10 @@ db_load(void)
return -1;
}
while (myFgets(buffer, sizeof(buffer), fp) &&
0 != strcmp(DIRECTORY_INFO_END, buffer)) {
while (fgets(buffer, sizeof(buffer), fp) &&
!g_str_has_prefix(buffer, DIRECTORY_INFO_END)) {
g_strchomp(buffer);
if (g_str_has_prefix(buffer, DIRECTORY_MPD_VERSION)) {
if (foundVersion)
FATAL("already found version in db\n");