* major code cleanup (part 1)

[claws.git] / src / addrharvest.c

diff --git a/src/addrharvest.c b/src/addrharvest.c
index b3a3f021d0f5e9ef4c89b9a01eb48763cc039c6e..35ef37df13773cd30ac050acb898afaef4d74ee9 100644 (file)
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -67,7 +67,7 @@ struct _HeaderEntry {
  * Enter: harvester Harvester object.
  *        name      Header name.
  */
-static void *addrharvest_build_entry(
+static void addrharvest_build_entry(
                AddressHarvester* harvester, gchar *name )
 {
        HeaderEntry *entry;
@@ -80,12 +80,6 @@ static void *addrharvest_build_entry(
        harvester->headerTable = g_list_append( harvester->headerTable, entry );
 }
 
-static void addrharvest_print_hdrentry( HeaderEntry *entry, FILE *stream ) {
-       fprintf( stream, "Header Entry\n" );
-       fprintf( stream, "    name : %s\n", entry->header );
-       fprintf( stream, "selected : %s\n", entry->selected ? "yes" : "no" );
-}
-
 /*
  * Free key in table.
  */
@@ -375,7 +369,7 @@ static void addrharvest_del_email( gchar *name, gchar *str ) {
        gint lenn, lenr;
 
        lenr = strlen( str );
-       while( p = strcasestr( name, str )  ) {
+       while((p = strcasestr( name, str )) != NULL) {
                lenn = strlen( p );
                memmove( p, p + lenr, lenn );
        }
@@ -525,7 +519,7 @@ static void addrharvest_parse_address(
        gint bufLen;
 
        /* Search for an address */
-       while( atCh = addrharvest_find_at( hdrBuf ) ) {
+       while((atCh = addrharvest_find_at( hdrBuf )) != NULL) {
                /* Find addres string */
                addrharvest_find_address( hdrBuf, atCh, &bp, &ep );