commit c71090485685de703d21405f4997cfc5f7eacd0d
Author: Hector Martin <[email protected]>
Date: Mon Oct 26 22:38:54 2009 +0100
Fix iTunesCDB hashing again
src/itdb_hash72.c | 2 +-
src/itdb_itunesdb.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/itdb_hash72.c b/src/itdb_hash72.c
index 050f503..6457577 100644
--- a/src/itdb_hash72.c
+++ b/src/itdb_hash72.c
@@ -335,8 +335,8 @@ gboolean itdb_hash72_write_hash (const Itdb_Device *device,
return FALSE;
}
- itdb_hash72_compute_itunesdb_sha1 (itdb_data, itdb_len, sha1);
header = (MhbdHeader *)itdb_data;
header->hashing_scheme = GUINT16_FROM_LE (ITDB_CHECKSUM_HASH72);
+ itdb_hash72_compute_itunesdb_sha1 (itdb_data, itdb_len, sha1);
return itdb_hash72_compute_hash_for_sha1 (device, sha1, header->hash72);
}
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index 306e880..e975205 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -5633,18 +5633,18 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB
*itdb,
fix_header (cts, mhbd_seek);
- /* Set checksum (ipods require it starting from Classic and Nano Video) */
- itdb_device_write_checksum (itdb->device,
- (unsigned char *)fexp->wcontents->contents,
- fexp->wcontents->pos,
- &fexp->error);
-
if (itdb_device_supports_compressed_itunesdb (itdb->device)) {
if (!itdb_zlib_check_compress_fexp (fexp)) {
goto err;
}
}
+ /* Set checksum (ipods require it starting from Classic and Nano Video) */
+ itdb_device_write_checksum (itdb->device,
+ (unsigned char *)fexp->wcontents->contents,
+ fexp->wcontents->pos,
+ &fexp->error);
+
if (itdb_device_supports_sqlite_db (itdb->device)) {
if (itdb_sqlite_generate_itdbs(fexp) != 0) {
goto err;
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
