[Pmplib-commits] SF.net SVN: pmplib: [301] trunk/pmplib

[<ny...@us...>]

Revision: 301
          http://svn.sourceforge.net/pmplib/?rev=301&view=rev
Author:   nyaochi
Date:     2007-02-06 04:09:59 -0800 (Tue, 06 Feb 2007)

Log Message:
-----------
Incremental commit for POSIX build. There're still some bugs in pmp_iriverplus2.

Modified Paths:
--------------
    trunk/pmplib/frontend/easypmp/common/database.c
    trunk/pmplib/lib/pmp/pmp_posix.c
    trunk/pmplib/lib/pmp_iriverplus2/ip2db.c

Modified: trunk/pmplib/frontend/easypmp/common/database.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/database.c	2007-02-06 05:40:09 UTC (rev 300)
+++ trunk/pmplib/frontend/easypmp/common/database.c	2007-02-06 12:09:59 UTC (rev 301)
@@ -207,7 +207,6 @@
 				opt->num_strip_words
 				) == 0) {
 				++num_obtained;
-			} else {
 			}
 			record->ts_update = timestamp;
 			record->ts_import = ts_import;

Modified: trunk/pmplib/lib/pmp/pmp_posix.c
===================================================================
--- trunk/pmplib/lib/pmp/pmp_posix.c	2007-02-06 05:40:09 UTC (rev 300)
+++ trunk/pmplib/lib/pmp/pmp_posix.c	2007-02-06 12:09:59 UTC (rev 301)
@@ -42,12 +42,12 @@
 	lt_dlhandle *plugins;
 };
 
-uint32_t interlocked_increment(uint32_t* count)
+uint32_t pmplib_interlocked_increment(uint32_t* count)
 {
 	return ++(*count);
 }
 
-uint32_t interlocked_decrement(uint32_t* count)
+uint32_t pmplib_interlocked_decrement(uint32_t* count)
 {
 	return --(*count);
 }
@@ -120,7 +120,7 @@
 {
 	uint32_t i;
 	for (i = 0;i < pmplib->num_plugins;++i) {
-		pmplib_enumerate_devid_t func = (pmplib_enumerate_devid_t)lt_dlsym(pmplib->plugins[i], "pmplib_enumerate_devid");
+		pmplib_enumerate_devid_t func = (pmplib_enumerate_devid_t)lt_dlsym(pmplib->plugins[i], "pmp_enumerate_devid");
 		if (func) {
 			func(callback, instance);
 		}
@@ -134,7 +134,7 @@
 	uint32_t i;
 
 	for (i = 0;i < pmplib->num_plugins;++i) {
-		pmplib_create_t func = (pmplib_create_t)lt_dlsym(pmplib->plugins[i], "pmplib_create");
+		pmplib_create_t func = (pmplib_create_t)lt_dlsym(pmplib->plugins[i], "pmp_create");
 		if (func) {
 			ret = func(pmp, path_to_device, id);
 			if (ret != PMP_DEVICENOTFOUND) {

Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db.c	2007-02-06 05:40:09 UTC (rev 300)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db.c	2007-02-06 12:09:59 UTC (rev 301)
@@ -165,6 +165,7 @@
 	ip2db_record_t* ip2db_records = NULL;
 	static const ucs2char_t ucs2cs_unknown[] = {'u','n','k','n','o','w','n',0};
 
+	fprintf(stdout, "records = %d, num_records = %d\n", records, num_records);
 	// Count valid entries.
 	for (i = 0;i < num_records;++i) {
 		if (ip2db_is_supported_codec(records[i].codec)) {
@@ -236,10 +237,12 @@
 	idxheader_setget_unknown2(db->idx_buffer, &n, 1);
 
 	// Free the allocated memory block.
-	for (i = 0;i < num_records;++i) {
-		ip2db_free_record(&ip2db_records[i]);
+	if (ip2db_records) {
+		for (i = 0;i < num_records;++i) {
+			ip2db_free_record(&ip2db_records[i]);
+		}
+		free(ip2db_records);
 	}
-	free(ip2db_records);
 
 	return ret;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.