libextractor

commit 258ee544331018ddb3790feecfd674a1b1839c71
parent 335a0083691bf9d705c92613a500ad756e72fb66
Author: Toni Ruottu <toni.ruottu@helsinki.fi>
Date:   Sun,  7 Jan 2007 15:49:37 +0000

Cleared out a bit.

Diffstat:
M
src/plugins/nsfeextractor.c
 | 
23
+++++++++++++----------

1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/plugins/nsfeextractor.c b/src/plugins/nsfeextractor.c
@@ -61,16 +61,14 @@ static int nsfeuint(const char * data )
 {
 	int i, value = 0;
 
-	for( i = 3; i >= 0 ; i-- )
+	for( i = 3; i > 0 ; i-- )
 	{
-	        value += ( unsigned char ) data[ i ];
-
-		if( i > 0 )
-		{
-			value *= 0x100;
-		}
+		value += ( unsigned char ) data[ i ];
+		value *= 0x100;
 	}
 
+	value += ( unsigned char ) data[ 0 ];
+
 	return( value );
 }
 
@@ -202,14 +200,15 @@ static struct EXTRACTOR_Keywords * libextractor_nsfe_tlbl_extract
 )
 {
 	char * title;
-	int left = size;
+	int left, length;
 
 
-	while( left > 0 )
+	for( left = size; left > 0; left -= length )
 	{
 		title = nsfestring( &data[ size - left ], left );
 		prev = addkword( prev, title, EXTRACTOR_TITLE );
-		left -= ( strlen( title ) + 1 );
+		length = strlen( title ) + 1;
+
 		free(title);
 	}
 
@@ -239,6 +238,7 @@ static struct EXTRACTOR_Keywords * libextractor_nsfe_auth_extract
 	
 	left -= ( strlen( album ) + 1 );
 	free(album);
+
 	if( left < 1 )
 	{
 		return( prev );
@@ -249,6 +249,7 @@ static struct EXTRACTOR_Keywords * libextractor_nsfe_auth_extract
 
 	left -= ( strlen( artist ) + 1 );
 	free(artist);
+
 	if( left < 1 )
 	{
 		return( prev );
@@ -259,6 +260,7 @@ static struct EXTRACTOR_Keywords * libextractor_nsfe_auth_extract
 
 	left -= ( strlen( copyright ) + 1 );
 	free(copyright);
+
 	if( left < 1 )
 	{
 		return( prev );
@@ -267,6 +269,7 @@ static struct EXTRACTOR_Keywords * libextractor_nsfe_auth_extract
 	ripper = nsfestring( &data[ size - left ], left );
 	prev = addkword( prev, ripper, EXTRACTOR_RIPPER );
 	free(ripper);
+
 	return( prev );
 }