Fix FS#9977 - Thanks to Brian Sutherland for intensive testing and effort

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20214 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 4 insertions, 4 deletions

diff --git a/apps/tagcache.c b/apps/tagcache.c
index 8e14b9ff17..e7f3294dbf 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -166,8 +166,8 @@ static struct mutex command_queue_mutex;
 
 /* Variable-length tag entry in tag files. */
 struct tagfile_entry {
-    short tag_length;  /* Length of the data in bytes including '\0' */
-    short idx_id;      /* Corresponding entry location in index file of not unique tags */
+    int32_t tag_length;  /* Length of the data in bytes including '\0' */
+    int32_t idx_id;      /* Corresponding entry location in index file of not unique tags */
     char tag_data[0];  /* Begin of the tag data */
 };
 
@@ -192,7 +192,7 @@ struct master_header {
 };
 
 /* For the endianess correction */
-static const char *tagfile_entry_ec   = "ss";
+static const char *tagfile_entry_ec   = "ll";
 /**
  Note: This should be (1 + TAG_COUNT) amount of l's.
  */
diff --git a/apps/tagcache.h b/apps/tagcache.h
index c69e28fcaa..e995784742 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -49,7 +49,7 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
 #define IDX_BUF_DEPTH 64
 
 /* Tag Cache Header version 'TCHxx'. Increment when changing internal structures. */
-#define TAGCACHE_MAGIC  0x5443480c
+#define TAGCACHE_MAGIC  0x5443480d
 
 /* How much to allocate extra space for ramcache. */
 #define TAGCACHE_RESERVE 32768