X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fprioq-test.c;h=d85a2221f6e32f0ee336ffd84250f70dba87650d;hb=c7ecad8fa467b8be2b34064020e2c541c480645e;hp=28c734b6b2f7f9ce0555c52030fa168d92d14b2e;hpb=c58379bde376cb2298fca14f83a86626f1b76f2f;p=catta

diff --git a/avahi-core/prioq-test.c b/avahi-core/prioq-test.c
index 28c734b..d85a222 100644
--- a/avahi-core/prioq-test.c
+++ b/avahi-core/prioq-test.c
@@ -26,16 +26,22 @@
 #include <time.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <assert.h>
+
+#include <avahi-common/gccmacro.h>
 
 #include "prioq.h"
 
-static gint compare_int(gconstpointer a, gconstpointer b) {
-    gint i = GPOINTER_TO_INT(a), j = GPOINTER_TO_INT(b);
+#define POINTER_TO_INT(p) ((int) (p))
+#define INT_TO_POINTER(i) ((void*) (i))
+
+static int compare_int(const void* a, const void* b) {
+    int i = POINTER_TO_INT(a), j = POINTER_TO_INT(b);
 
     return i < j ? -1 : (i > j ? 1 : 0);
 }
 
-static int compare_ptr(gconstpointer a, gconstpointer b) {
+static int compare_ptr(const void* a, const void* b) {
     return a < b ? -1 : (a > b ? 1 : 0);
 }
 
@@ -44,28 +50,28 @@ static void rec(AvahiPrioQueueNode *n) {
         return;
 
     if (n->left)
-        g_assert(n->left->parent == n);
+        assert(n->left->parent == n);
 
     if (n->right)
-        g_assert(n->right->parent == n);
+        assert(n->right->parent == n);
 
     if (n->parent) {
-        g_assert(n->parent->left == n || n->parent->right == n);
+        assert(n->parent->left == n || n->parent->right == n);
 
         if (n->parent->left == n)
-            g_assert(n->next == n->parent->right);
+            assert(n->next == n->parent->right);
     }
 
     if (!n->next) {
-        g_assert(n->queue->last == n);
+        assert(n->queue->last == n);
 
         if (n->parent && n->parent->left == n)
-            g_assert(n->parent->right == NULL);
+            assert(n->parent->right == NULL);
     }
 
     
     if (n->parent) {
-        int a = GPOINTER_TO_INT(n->parent->data), b = GPOINTER_TO_INT(n->data);
+        int a = POINTER_TO_INT(n->parent->data), b = POINTER_TO_INT(n->data);
         if (a > b) {
             printf("%i <= %i: NO\n", a, b);
             abort();
@@ -76,9 +82,9 @@ static void rec(AvahiPrioQueueNode *n) {
     rec(n->right);
 }
 
-int main(int argc, char *argv[]) {
+int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
     AvahiPrioQueue *q, *q2;
-    gint i;
+    int i;
 
     q = avahi_prio_queue_new(compare_int);
     q2 = avahi_prio_queue_new(compare_ptr);
@@ -86,15 +92,15 @@ int main(int argc, char *argv[]) {
     srand(time(NULL));
 
     for (i = 0; i < 10000; i++)
-        avahi_prio_queue_put(q2, avahi_prio_queue_put(q, GINT_TO_POINTER(random() & 0xFFFF)));
+        avahi_prio_queue_put(q2, avahi_prio_queue_put(q, INT_TO_POINTER(random() & 0xFFFF)));
 
     while (q2->root) {
         rec(q->root);
         rec(q2->root);
 
-        g_assert(q->n_nodes == q2->n_nodes);
+        assert(q->n_nodes == q2->n_nodes);
 
-        printf("%i\n", GPOINTER_TO_INT(((AvahiPrioQueueNode*)q2->root->data)->data));
+        printf("%i\n", POINTER_TO_INT(((AvahiPrioQueueNode*)q2->root->data)->data));
         
         avahi_prio_queue_remove(q, q2->root->data);
         avahi_prio_queue_remove(q2, q2->root);
@@ -103,11 +109,11 @@ int main(int argc, char *argv[]) {
         
 /*     prev = 0; */
 /*     while (q->root) { */
-/*         gint v = GPOINTER_TO_INT(q->root->data); */
+/*         int v = GPOINTER_TO_INT(q->root->data); */
 /*         rec(q->root); */
 /*         printf("%i\n", v); */
 /*         avahi_prio_queue_remove(q, q->root); */
-/*         g_assert(v >= prev); */
+/*         assert(v >= prev); */
 /*         prev = v; */
 /*     } */