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

database: no CamelCase

Browse Source 
Renamed a bunch of variables.
This commit is contained in:
Max Kellermann 2009-03-02 15:41:44 +01:00
parent b7bfa24f22
commit eb5b3ce553
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/database.c
View File

@ -47,7 +47,7 @@ static char *database_path;
static struct directory *music_root; static struct directory *music_root;
static time_t directory_dbModTime; static time_t database_mtime;
void void
db_init(const char *path) db_init(const char *path)
@ -261,7 +261,7 @@ db_save(void)
while (fclose(fp) && errno == EINTR); while (fclose(fp) && errno == EINTR);
if (stat(database_path, &st) == 0) if (stat(database_path, &st) == 0)
directory_dbModTime = st.st_mtime; database_mtime = st.st_mtime;
return true; return true;
} }
@ -272,7 +272,7 @@ db_load(void)
FILE *fp = NULL; FILE *fp = NULL;
struct stat st; struct stat st;
char buffer[100]; char buffer[100];
bool foundFsCharset = false, foundVersion = false; bool found_charset = false, found_version = false;
assert(database_path != NULL); assert(database_path != NULL);
assert(music_root != NULL); assert(music_root != NULL);
@ -304,26 +304,25 @@ db_load(void)
g_strchomp(buffer); g_strchomp(buffer);
if (g_str_has_prefix(buffer, DIRECTORY_MPD_VERSION)) { if (g_str_has_prefix(buffer, DIRECTORY_MPD_VERSION)) {
if (foundVersion) if (found_version)
g_error("already found version in db"); g_error("already found version in db");
foundVersion = true; found_version = true;
} else if (g_str_has_prefix(buffer, DIRECTORY_FS_CHARSET)) { } else if (g_str_has_prefix(buffer, DIRECTORY_FS_CHARSET)) {
char *fsCharset; const char *new_charset, *old_charset;
const char *tempCharset;
if (foundFsCharset) if (found_charset)
g_error("already found fs charset in db"); g_error("already found fs charset in db");
foundFsCharset = true; found_charset = true;
fsCharset = &(buffer[strlen(DIRECTORY_FS_CHARSET)]); new_charset = &(buffer[strlen(DIRECTORY_FS_CHARSET)]);
tempCharset = path_get_fs_charset(); old_charset = path_get_fs_charset();
if (tempCharset != NULL if (old_charset != NULL
&& strcmp(fsCharset, tempCharset)) { && strcmp(new_charset, old_charset)) {
g_message("Existing database has charset \"%s\" " g_message("Existing database has charset \"%s\" "
"instead of \"%s\"; " "instead of \"%s\"; "
"discarding database file", "discarding database file",
fsCharset, tempCharset); new_charset, old_charset);
return false; return false;
} }
} else } else
@ -339,7 +338,7 @@ db_load(void)
stats_update(); stats_update();
if (stat(database_path, &st) == 0) if (stat(database_path, &st) == 0)
directory_dbModTime = st.st_mtime; database_mtime = st.st_mtime;
return true; return true;
} }
@ -347,5 +346,5 @@ db_load(void)
time_t time_t
db_get_mtime(void) db_get_mtime(void)
{ {
return directory_dbModTime; return database_mtime;
} }