Changeset 4066

Timestamp:

12/08/10 15:58:39 (13 years ago)

Author:

schlocke

Message:

cccam: fixed dup cards check

Location:

trunk

Files:

• module-cccam.c (modified) (1 diff)
• module-datastruct-llist.c (modified) (1 diff)
• module-datastruct-llist.h (modified) (1 diff)

trunk/module-cccam.c

@@ -1760 +1760 @@
 
 int same_first_node(struct cc_card *card1, struct cc_card *card2) {
-    uint8 * node1 = card1->remote_nodes->obj;
-    uint8 * node2 = card2->remote_nodes->obj;
+    uint8 * node1 = ll_has_elements(card1->remote_nodes);
+    uint8 * node2 = ll_has_elements(card2->remote_nodes);
 
     if (!node1 && !node2) return 1; //both NULL, same!

trunk/module-datastruct-llist.c

@@ -217 +217 @@
 }
 
+//Returns first object if there is one
+void *ll_has_elements(LLIST *l) {
+  if (!l || !l->initial)
+    return NULL;
+  return l->initial->obj;
+}
+

trunk/module-datastruct-llist.h

@@ -45 +45 @@
 
 int ll_count(LLIST *l);                 // return number of items in list
+void *ll_has_elements(LLIST *l);
 
 #endif