summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-10-24 17:39:06 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-10-24 17:39:06 +0000
commit68b740f64824ecbd1b215d28aea0d8f80da571ad (patch)
tree7e04f0df156ebd8ba4656518525fcd5ceaf16135 /apps
parent02df5a80680c8b7bd9e89e93a675cb8e2b3c1c3d (diff)
downloadrockbox-68b740f64824ecbd1b215d28aea0d8f80da571ad.zip
rockbox-68b740f64824ecbd1b215d28aea0d8f80da571ad.tar.gz
rockbox-68b740f64824ecbd1b215d28aea0d8f80da571ad.tar.bz2
rockbox-68b740f64824ecbd1b215d28aea0d8f80da571ad.tar.xz
Changelog importing was broken.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11325 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/tagcache.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/tagcache.c b/apps/tagcache.c
index ffafe5b..d8684bd 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -2701,29 +2701,30 @@ static int parse_changelog_line(int line_n, const char *buf, void *parameters)
if (*buf == '#')
return 0;
+ logf("%d/%s", line_n, buf);
if (!read_tag(tag_data, sizeof tag_data, buf, "filename"))
{
logf("filename missing");
logf("-> %s", buf);
- return -1;
+ return 0;
}
idx_id = find_index(tag_data);
if (idx_id < 0)
{
logf("entry not found");
- return -2;
+ return 0;
}
if (!get_index(masterfd, idx_id, &idx, false))
{
logf("failed to retrieve index entry");
- return -3;
+ return 0;
}
/* Stop if tag has already been modified. */
if (idx.flag & FLAG_DIRTYNUM)
- return -4;
+ return 0;
logf("import: %s", tag_data);
@@ -2782,7 +2783,7 @@ bool tagcache_import_changelog(void)
filenametag_fd = open_tag_fd(&tch, tag_filename, false);
- fast_readline(filenametag_fd, buf, sizeof buf, (long *)masterfd,
+ fast_readline(clfd, buf, sizeof buf, (long *)masterfd,
parse_changelog_line);
close(clfd);