Glib docs recommend using the slice API if you know you won't need to realloc.

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

diff --git a/dftest.c b/dftest.c
index c3f42f14f586ef0e043d7b1f50eb8ebb9b3103dc..366e6dabd899f8620f8ba636076fedf2b32ba1ad 100644 (file)
--- a/dftest.c
+++ b/dftest.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 <stdlib.h>
 #include <stdio.h>
@@ -40,7 +38,7 @@
 #include <epan/filesystem.h>
 #include <wsutil/privileges.h>
 #include <epan/prefs.h>
-#include "util.h"
+#include "ui/util.h"
 #include "epan/dfilter/dfilter.h"
 #include "register.h"
 
@@ -86,10 +84,6 @@ main(int argc, char **argv)
                  failure_message, open_failure_message, read_failure_message,
                  write_failure_message);
 
-       /* now register the preferences for any non-dissector modules.
-       we must do that before we read the preferences as well. */
-       prefs_register_modules();
-
        /* set the c-language locale to the native environment. */
        setlocale(LC_ALL, "");
 
@@ -142,9 +136,8 @@ main(int argc, char **argv)
                epan_cleanup();
                exit(2);
        }
-       printf("dfilter ptr = 0x%08x\n", GPOINTER_TO_INT(df));
 
-       printf("\n\n");
+       printf("\n");
 
        if (df == NULL)
                printf("Filter is empty\n");