clean up and plug some leaks

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8c4cfeca8627c6b1e4a7eced13a9a0b231aff4e9..214f87fa6767570981e32235eaf45d5a2c777d47 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-11-18 [alfons]    0.6.5claws19
+
+       * src/filtering.[ch]
+               clean up & plug leaks
+
 2001-11-18 [paul]      0.6.5claws18
 
        * sync with sylpheed 0.6.5cvs9

diff --git a/configure.in b/configure.in
index 82ba8afe8e913b4aed3b5d6cb574068a87ee2146..3e111e04543a3a37dad99ce0a7e3b1bd7c72ee6f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws18
+EXTRA_VERSION=claws19
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/filtering.c b/src/filtering.c
index 3c8891b06ea1340ebc8b0c404f7b4e32f5be0e2e..d7acb6063171c9a95e03ff7b7635b9443f574176 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -427,9 +427,10 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                        folder_find_item_from_identifier(action->destination);
                if (!dest_folder)
                        return FALSE;
-
-               if (folder_item_move_msg(dest_folder, info) == -1)
+               
+               if (folder_item_move_msg(dest_folder, info) == -1) {
                        return FALSE;
+               }       
 
                /* WRONG: can not update the mark, because the message has 
                 * been moved. info pertains to original location. 
@@ -479,7 +480,6 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                                                    GINT_TO_POINTER(1));
                        }
                }
-                       
                return TRUE;
 
        case MATCHACTION_DELETE:
@@ -602,22 +602,14 @@ static gboolean filteringprop_apply(FilteringProp * filtering, MsgInfo * info,
                                    GHashTable *folder_table)
 {
        if (matcherlist_match(filtering->matchers, info)) {
-               gint result;
-               gchar * action_str;
-
-               result = TRUE;
-
-               result = filteringaction_apply(filtering->action, info,
-                                              folder_table);
-               action_str =
-                       filteringaction_to_string(filtering->action);
-               if (!result) {
-                       g_warning(_("action %s could not be applied"),
-                                 action_str);
-               }
-               else {
-                       debug_print(_("message %i %s..."),
-                                     info->msgnum, action_str);
+               gboolean result;
+               gchar   *action_str;
+               gchar    buf[256]; 
+
+               if (FALSE == (result = filteringaction_apply(filtering->action, info,
+                                              folder_table))) {
+                       action_str = filteringaction_to_string(buf, sizeof buf, filtering->action);
+                       g_warning(_("action %s could not be applied"), action_str);
                }
 
                g_free(action_str);
@@ -1151,16 +1143,10 @@ void prefs_filtering_read_config(void)
 }
 */
 
-gchar * filteringaction_to_string(FilteringAction * action)
+gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *action)
 {
-       gchar * command_str;
-       gint i;
-       gchar * account_id_str;
-       gchar * labelcolor_str;
+       gchar *command_str;
 
-       /* FIXME: use g_sprintf() throughout */
-
-       command_str = NULL;
        command_str = get_matchparser_tab_str(action->type);
 
        if (command_str == NULL)
@@ -1170,26 +1156,25 @@ gchar * filteringaction_to_string(FilteringAction * action)
        case MATCHACTION_MOVE:
        case MATCHACTION_COPY:
        case MATCHACTION_EXECUTE:
-               return g_strconcat(command_str, " \"", action->destination,
-                                  "\"", NULL);
+               g_snprintf(dest, destlen, "%s \"%s\"", command_str, action->destination);
+               return dest;
 
        case MATCHACTION_DELETE:
        case MATCHACTION_MARK:
        case MATCHACTION_UNMARK:
        case MATCHACTION_MARK_AS_READ:
        case MATCHACTION_MARK_AS_UNREAD:
-               return g_strdup(command_str);
-               break;
+               g_snprintf(dest, destlen, "%s", command_str);
+               return dest;
 
        case MATCHACTION_FORWARD:
        case MATCHACTION_FORWARD_AS_ATTACHMENT:
-               account_id_str = itos(action->account_id);
-               return g_strconcat(command_str, " ", account_id_str,
-                                  " \"", action->destination, "\"", NULL);
+               g_snprintf(dest, destlen, "%s %d \"%s\"", command_str, action->account_id, action->destination); 
+               return dest; 
 
        case MATCHACTION_COLOR:
-               labelcolor_str = itos(action->labelcolor);
-               return g_strconcat(command_str, " ", labelcolor_str, NULL);  
+               g_snprintf(dest, destlen, "%s %d", command_str, action->labelcolor);
+               return dest;  
 
        default:
                return NULL;
@@ -1198,25 +1183,23 @@ gchar * filteringaction_to_string(FilteringAction * action)
 
 gchar * filteringprop_to_string(FilteringProp * prop)
 {
-       gchar * list_str;
-       gchar * action_str;
-       gchar * filtering_str;
+       gchar *list_str;
+       gchar *action_str;
+       gchar *filtering_str;
+       gchar  buf[256];
 
-       action_str = filteringaction_to_string(prop->action);
+       action_str = filteringaction_to_string(buf, sizeof buf, prop->action);
 
        if (action_str == NULL)
                return NULL;
 
        list_str = matcherlist_to_string(prop->matchers);
 
-       if (list_str == NULL) {
-               g_free(action_str);
+       if (list_str == NULL)
                return NULL;
-       }
 
        filtering_str = g_strconcat(list_str, " ", action_str, NULL);
        g_free(list_str);
-       g_free(action_str);
 
        return filtering_str;
 }

diff --git a/src/filtering.h b/src/filtering.h
index 4c650f90bdc59fa99427c0a9e59542ae986d0790..46dec1e4d66ae18cb1c4c7edc34f92e98a932fc7 100644 (file)
--- a/src/filtering.h
+++ b/src/filtering.h
@@ -66,7 +66,7 @@ void filter_message(GSList * filtering_list, FolderItem * item,
 void filter_incoming_message(FolderItem *default_folder, const gchar *file_name, 
                             GHashTable *folder_table);
 
-gchar * filteringaction_to_string(FilteringAction * action);
+gchar * filteringaction_to_string(gchar *dest, gint destlen, FilteringAction * action);
 void prefs_filtering_write_config(void);
 void prefs_filtering_read_config(void);
 gchar * filteringprop_to_string(FilteringProp * prop);