Ported to glib-2.0

diff --git a/Makefile b/Makefile
index 16d5e69..f27c761 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,8 @@ TARGETS=badblock-guess
 all: $(TARGETS)
 
 badblock-guess: badblock-guess.c
-       gcc -s -O2 -Wall -static `glib-config --cflags glib` -o $@ $< `glib-config --libs glib` -lext2fs
+       gcc -s -O2 -Wall -static `pkg-config --cflags glib-2.0` -o $@ $< `pkg-config --libs glib-2.0` -lext2fs \
+                       -lc -lnss_files -lnss_dns -lresolv
 
 clean:
        $(RM) $(TARGETS)

diff --git a/badblock-guess.c b/badblock-guess.c
index 69103fd..eb1642c 100644 (file)
--- a/badblock-guess.c
+++ b/badblock-guess.c
@@ -175,13 +175,13 @@ struct range *key,*neigh_left,*neigh_right;
        if (start>=end)
                return;
        key=node_build(start,end);
-       if ((neigh_left =g_tree_search(bad_tree,(GSearchFunc)search_end  ,&start))) {
+       if ((neigh_left =g_tree_search(bad_tree,(GCompareFunc)search_end  ,&start))) {
                g_assert(neigh_left->end==key->start);
                key->start=neigh_left->start;
                g_tree_remove(bad_tree,neigh_left);
                g_mem_chunk_free(node_memchunk,neigh_left);
                }
-       if ((neigh_right=g_tree_search(bad_tree,(GSearchFunc)search_start,&end  ))) {
+       if ((neigh_right=g_tree_search(bad_tree,(GCompareFunc)search_start,&end  ))) {
                g_assert(neigh_right->start==key->end);
                key->end=neigh_right->end;
                g_tree_remove(bad_tree,neigh_right);