Fix a comparison.

[metze/wireshark/wip.git] / filters.c

diff --git a/filters.c b/filters.c
index 6ed7751dea230c65e55dd3e4da9ad9b143a2f657..5fb5ac4991a51d5872bc87a7638ee63bb557ff1e 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -19,12 +19,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -145,7 +143,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
   }
 
   /* try to open personal "cfilters"/"dfilters" file */
-  ff_path = get_persconffile_path(ff_name, TRUE, FALSE);
+  ff_path = get_persconffile_path(ff_name, TRUE);
   if ((ff = ws_fopen(ff_path, "r")) == NULL) {
     /*
      * Did that fail because the file didn't exist?
@@ -168,7 +166,7 @@ read_filter_list(filter_list_type_t list_type, char **pref_path_return,
      * a particular list.
      */
     g_free(ff_path);
-    ff_path = get_persconffile_path(FILTER_FILE_NAME, FALSE, FALSE);
+    ff_path = get_persconffile_path(FILTER_FILE_NAME, FALSE);
     if ((ff = ws_fopen(ff_path, "r")) == NULL) {
       /*
        * Did that fail because the file didn't exist?
@@ -490,7 +488,7 @@ save_filter_list(filter_list_type_t list_type, char **pref_path_return,
     return;
   }
 
-  ff_path = get_persconffile_path(ff_name, TRUE, TRUE);
+  ff_path = get_persconffile_path(ff_name, TRUE);
 
   /* Write to "XXX.new", and rename if that succeeds.
      That means we don't trash the file if we fail to write it out
@@ -544,7 +542,14 @@ save_filter_list(filter_list_type_t list_type, char **pref_path_return,
   /* ANSI C doesn't say whether "rename()" removes the target if it
      exists; the Win32 call to rename files doesn't do so, which I
      infer is the reason why the MSVC++ "rename()" doesn't do so.
-     We must therefore remove the target file first, on Windows. */
+     We must therefore remove the target file first, on Windows.
+
+     XXX - ws_rename() should be ws_stdio_rename() on Windows,
+     and ws_stdio_rename() uses MoveFileEx() with MOVEFILE_REPLACE_EXISTING,
+     so it should remove the target if it exists, so this stuff
+     shouldn't be necessary.  Perhaps it dates back to when we were
+     calling rename(), with that being a wrapper around Microsoft's
+     _rename(), which didn't remove the target. */
   if (ws_remove(ff_path) < 0 && errno != ENOENT) {
     /* It failed for some reason other than "it's not there"; if
        it's not there, we don't need to remove it, so we just
@@ -582,8 +587,6 @@ void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type)
 
     flpp_dest = get_filter_list(dest_type);
     flpp_src = get_filter_list(src_type);
-    flp_src = *flpp_src;
-
     /* throw away the "old" destination list - a NULL list is ok here */
     while(*flpp_dest) {
         *flpp_dest = remove_filter_entry(*flpp_dest, g_list_first(*flpp_dest));
@@ -591,11 +594,10 @@ void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type)
     g_assert(g_list_length(*flpp_dest) == 0);
 
     /* copy the list entries */
-    while(flp_src) {
+    for(flp_src = g_list_first(*flpp_src); flp_src; flp_src = g_list_next(flp_src)) {
         filt = (filter_def *)(flp_src->data);
 
         *flpp_dest = add_filter_entry(*flpp_dest, filt->name, filt->strval);
-        flp_src = g_list_next(flp_src);
     }
 }