Przeglądaj źródła

ncd: revert "ncd: fix integer underflow", there was no underflow. Remove similar checks in
foreach().

ambrop7 14 lat temu
rodzic
commit
d24ac6dae6
2 zmienionych plików z 3 dodań i 3 usunięć
  1. 2 2
      ncd/modules/foreach.c
  2. 1 1
      ncd/ncd.c

+ 2 - 2
ncd/modules/foreach.c

@@ -105,7 +105,7 @@ static void assert_state (struct instance *o)
 #ifndef NDEBUG
     // check GP
     for (size_t i = 0; i < o->gp; i++) {
-        if (o->gp > 0 && i == o->gp - 1) {
+        if (i == o->gp - 1) {
             ASSERT(o->elems[i].state == ESTATE_UP || o->elems[i].state == ESTATE_DOWN ||
                    o->elems[i].state == ESTATE_WAITING)
         } else {
@@ -122,7 +122,7 @@ static void assert_state (struct instance *o)
     
     // check gap
     for (size_t i = o->gp; i < o->ip; i++) {
-        if (o->ip > 0 && i == o->ip - 1) {
+        if (i == o->ip - 1) {
             ASSERT(o->elems[i].state == ESTATE_UP || o->elems[i].state == ESTATE_DOWN ||
                    o->elems[i].state == ESTATE_WAITING || o->elems[i].state == ESTATE_TERMINATING)
         } else {

+ 1 - 1
ncd/ncd.c

@@ -932,7 +932,7 @@ void process_assert_pointers (struct process *p)
 #ifndef NDEBUG
     // check AP
     for (size_t i = 0; i < p->ap; i++) {
-        if (p->ap > 0 && i == p->ap - 1) {
+        if (i == p->ap - 1) {
             ASSERT(p->statements[i].state == SSTATE_ADULT || p->statements[i].state == SSTATE_CHILD)
         } else {
             ASSERT(p->statements[i].state == SSTATE_ADULT)