explicit test

tests/test43.c

@@ -23,12 +23,12 @@ int main() {
   it.a = 3; it.b=4; utarray_push_back(pairs, &it); printf("push\n");
   printf("length is %u\n", utarray_len(pairs));
   ip=NULL;
-  while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs,ip)) != NULL ) printf("%d %d\n", ip->a, ip->b);
   utarray_erase(pairs,0,1); printf("erase [0]\n");
   printf("length is %u\n", utarray_len(pairs));
-  while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs,ip)) != NULL ) printf("%d %d\n", ip->a, ip->b);
   it.a = 1; it.b=2; utarray_push_back(pairs, &it); printf("push\n");
-  while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs,ip)) != NULL ) printf("%d %d\n", ip->a, ip->b);
   utarray_clear(pairs); printf("clear\n");
   printf("length is %u\n", utarray_len(pairs));
   utarray_extend_back(pairs); printf("extend\n");
@@ -37,12 +37,12 @@ int main() {
   printf("ip points to [0] ? %s\n", (ip==(intpair_t*)utarray_front(pairs)) ? "yes" : "no");
   it.a = 1; it.b=2; utarray_push_back(pairs, &it); printf("push\n");
   ip=NULL;
-  while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs,ip)) != NULL ) printf("%d %d\n", ip->a, ip->b);
   utarray_erase(pairs,1,1); printf("erase [1]\n");
   printf("length is %u\n", utarray_len(pairs));
-  while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs,ip)) != NULL ) printf("%d %d\n", ip->a, ip->b);
   it.a = 3; it.b=4; utarray_push_back(pairs, &it); printf("push\n");
-  for(ip=(intpair_t*)utarray_front(pairs);ip;ip=(intpair_t*)utarray_next(pairs,ip)) {
+  for(ip=(intpair_t*)utarray_front(pairs);ip!=NULL;ip=(intpair_t*)utarray_next(pairs,ip)) {
     printf("%d %d\n", ip->a,ip->b);
   }
   ip = (intpair_t*)utarray_back(pairs);
@@ -51,21 +51,21 @@ int main() {
   utarray_concat(pairs_cpy, pairs);  printf("copy\n");
   printf("cpy length is %u\n", utarray_len(pairs_cpy));
   ip=NULL;
-  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip)) != NULL ) printf("cpy %d %d\n", ip->a, ip->b);
   it.a=5; it.b=6; utarray_insert(pairs_cpy, &it, 0); printf("insert cpy[0]\n");
   printf("cpy length is %u\n", utarray_len(pairs_cpy));
-  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip)) != NULL ) printf("cpy %d %d\n", ip->a, ip->b);
   utarray_erase(pairs_cpy,0,2); printf("erase cpy [0] [1]\n");
   printf("cpy length is %u\n", utarray_len(pairs_cpy));
-  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip)) != NULL ) printf("cpy %d %d\n", ip->a, ip->b);
   utarray_inserta(pairs_cpy, pairs, 1); printf("inserta at cpy[1]\n");
   printf("cpy length is %u\n", utarray_len(pairs_cpy));
-  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip))) printf("cpy %d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs_cpy,ip)) != NULL ) printf("cpy %d %d\n", ip->a, ip->b);
   utarray_free(pairs_cpy); printf("free cpy\n");
   printf("length is %u\n", utarray_len(pairs));
   utarray_resize(pairs, 30); printf("resize to 30\n");
   printf("length is %u\n", utarray_len(pairs));
-  while( (ip=(intpair_t*)utarray_next(pairs,ip))) printf("%d %d\n", ip->a, ip->b);
+  while( (ip=(intpair_t*)utarray_next(pairs,ip)) != NULL ) printf("%d %d\n", ip->a, ip->b);
   utarray_resize(pairs, 1); printf("resize to 1\n");
   printf("length is %u\n", utarray_len(pairs));
   utarray_resize(pairs, zero); printf("resize to 0\n");

tests/test44.c

@@ -12,31 +12,31 @@ int main() {
   int i, *p;
   utarray_new(a, &ut_int_icd);
   for(i=0;i<10;i++) utarray_push_back(a,&i);
-  for(p=(int*)utarray_front(a); p; p=(int*)utarray_next(a,p)) printf("%d ",*p);
+  for(p=(int*)utarray_front(a); p!=NULL; p=(int*)utarray_next(a,p)) printf("%d ",*p);
   printf("\n");
   utarray_sort(a,reverse);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_erase(a,3,3);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_erase(a,1,2);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_erase(a,0,1);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_erase(a,3,1);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_resize(a,5);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_resize(a,3);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_erase(a,0,3);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p);
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p);
   printf("\n");
   utarray_free(a);
   return 0;

tests/test45.c

@@ -8,15 +8,15 @@ int main() {
   for(i=0;i<10;i++) utarray_push_back(a,&i);
   utarray_pop_back(a);
   utarray_erase(a,0,1);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ",*p); printf("\n");
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ",*p); printf("\n");
   i = 100;
   utarray_insert(a,&i,3);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ",*p); printf("\n");
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ",*p); printf("\n");
   utarray_extend_back(a);
   p = (int*)utarray_back(a);
   *p = 1000;
   p = NULL;
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ",*p); printf("\n");
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ",*p); printf("\n");
   utarray_clear(a);
   utarray_free(a);
   return 0;

tests/test46.c

@@ -19,29 +19,29 @@ int main() {
   utarray_new(strs, &ut_str_icd);
   s="hello"; utarray_push_back(strs, &s);
   s="world"; utarray_push_back(strs, &s);
-  while ( (p=(char**)utarray_next(strs,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs,p)) != NULL ) printf("%s ",*p); printf("\n");
   s="begin"; utarray_insert(strs,&s,0);
-  while ( (p=(char**)utarray_next(strs,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs,p)) != NULL ) printf("%s ",*p); printf("\n");
   utarray_new(strs2, &ut_str_icd);
   s="alt"; utarray_push_back(strs2, &s);
   s="oth"; utarray_push_back(strs2, &s);
   utarray_inserta(strs2, strs, 1);
-  while ( (p=(char**)utarray_next(strs2,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs2,p)) != NULL ) printf("%s ",*p); printf("\n");
   utarray_erase(strs2,0,2);
-  while ( (p=(char**)utarray_next(strs2,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs2,p)) != NULL ) printf("%s ",*p); printf("\n");
   utarray_pop_back(strs2);
-  while ( (p=(char**)utarray_next(strs2,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs2,p)) != NULL ) printf("%s ",*p); printf("\n");
   utarray_concat(strs2, strs);
-  while ( (p=(char**)utarray_next(strs2,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs2,p)) != NULL ) printf("%s ",*p); printf("\n");
   utarray_clear(strs2);
   utarray_concat(strs2, strs);
-  while ( (p=(char**)utarray_next(strs2,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs2,p)) != NULL ) printf("%s ",*p); printf("\n");
   printf("sorting strs2\n");
   utarray_sort(strs2,strsort);
-  while ( (p=(char**)utarray_next(strs2,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs2,p)) != NULL ) printf("%s ",*p); printf("\n");
   printf("reverse sorting strs2\n");
   utarray_sort(strs2,revsort);
-  while ( (p=(char**)utarray_next(strs2,p))) printf("%s ",*p); printf("\n");
+  while ( (p=(char**)utarray_next(strs2,p)) != NULL ) printf("%s ",*p); printf("\n");
   utarray_clear(strs2);
   utarray_free(strs2);
   utarray_free(strs);

tests/test49.c

@@ -10,7 +10,7 @@ int main() {
   s = "hello"; utarray_push_back(strs, &s);
   s = "world"; utarray_push_back(strs, &s);
   p = NULL;
-  while ( (p=(char**)utarray_next(strs,p))) {
+  while ( (p=(char**)utarray_next(strs,p)) != NULL ) {
     printf("%s\n",*p);
   }
 

tests/test56.c

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
 
     memcpy(etmp.bname, "WES\n", 5UL);
     DL_SEARCH(head,elt,&etmp,namecmp);
-    if (elt) printf("found %s\n", elt->bname);
+    if (elt != NULL) printf("found %s\n", elt->bname);
 
     /* now delete each element, use the safe iterator */
     DL_FOREACH_SAFE(head,elt,tmp) {

tests/test57.c

@@ -18,7 +18,7 @@ int main() {
   e->i = 1;
   HASH_ADD_PTR(hash,key,e);
   HASH_FIND_PTR(hash, &someaddr, d);
-  if (d) printf("found\n");
+  if (d != NULL) printf("found\n");
 
   /* release memory */
   HASH_DEL(hash,e);

tests/test61.c

@@ -20,7 +20,7 @@ int main() {
   s = "three"; utarray_push_back(strs, &s);
 
   p = NULL;
-  while ( (p=(char**)utarray_next(strs,p))) {
+  while ( (p=(char**)utarray_next(strs,p)) != NULL ) {
     s = *p;
     printf("%s\n",s);
   }
@@ -29,11 +29,11 @@ int main() {
   utarray_sort(strs,strsort);
 
   p = NULL;
-  while ( (p=(char**)utarray_next(strs,p))) {
+  while ( (p=(char**)utarray_next(strs,p)) != NULL ) {
     s = *p;
     printf("finding %s\n",s);
     p = utarray_find(strs,&s,strsort);
-    printf(" %s\n", p ? (*p) : "failed");
+    printf(" %s\n", (p != NULL) ? (*p) : "failed");
   }
 
   utarray_free(strs);

tests/test62.c

@@ -8,7 +8,7 @@
 #define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2)
 #define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3)
 
-#define yn(rc) (rc?"y":"n")
+#define yn(rc) ((rc!=0U)?"y":"n")
 int main(int argc,char*argv[]) {
   unsigned rc;
   char *c = malloc(8UL);

tests/test65.c

@@ -20,7 +20,7 @@ static char * /*value*/ find_in_cache(char *key)
 {
     struct CacheEntry *entry;
     HASH_FIND_STR(cache, key, entry);
-    if (entry) {
+    if (entry != NULL) {
         // remove it (so the subsequent add will throw it on the front of the list)
         HASH_DELETE(hh, cache, entry);
         HASH_ADD_KEYPTR(hh, cache, entry->key, strlen(entry->key), entry);

tests/test66.c

@@ -15,7 +15,7 @@ int main(int argc, char*argv[]) {
                       "gil", "buck", "ted", NULL };
     int id=0;
 
-    for(name=names; *name; name++) {
+    for(name=names; *name!=NULL; name++) {
         person = (person_t*)malloc(sizeof(person_t));
         if (person == NULL) exit(-1);
         strncpy(person->first_name, *name,sizeof(person->first_name));
@@ -27,9 +27,9 @@ int main(int argc, char*argv[]) {
     person=NULL;
     person_t **p=&person;
 
-    for(name=names; *name; name++) {
+    for(name=names; *name!=NULL; name++) {
         HASH_FIND_STR(people,*name,*p);
-        if (person)
+        if (person != NULL)
             printf("found %s (id %d)\n", person->first_name, person->id);
         else
             printf("failed to find %s\n", *name);

tests/test67.c

@@ -16,7 +16,7 @@ int main() {
 
   /* the other form of iteration starting from NULL (back) */
   p=NULL;
-  while ( (p=(int*)utarray_prev(nums,p))) {
+  while ( (p=(int*)utarray_prev(nums,p)) != NULL ) {
     printf("%d\n",*p);
   }
 

tests/test80.c

@@ -6,12 +6,12 @@ int main() {
   int i, *p;
   utarray_new(a, &ut_int_icd);
   for(i=0;i<10;i++) utarray_push_back(a,&i);
-  for(p=(int*)utarray_front(a); p; p=(int*)utarray_next(a,p)) printf("%d ",*p);
+  for(p=(int*)utarray_front(a); p!=NULL; p=(int*)utarray_next(a,p)) printf("%d ",*p);
   printf("\n");
   printf("len: %u\n\n", utarray_len(a));
 
   i=11; utarray_insert(a, &i, 11);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p); printf("\n");
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p); printf("\n");
   printf("len: %u\n\n", utarray_len(a));
 
   utarray_free(a);

tests/test81.c

@@ -6,12 +6,12 @@ int main() {
   int i, *p;
   utarray_new(a, &ut_int_icd);
   for(i=0;i<10;i++) utarray_push_back(a,&i);
-  for(p=(int*)utarray_front(a); p; p=(int*)utarray_next(a,p)) printf("%d ",*p);
+  for(p=(int*)utarray_front(a); p!=NULL; p=(int*)utarray_next(a,p)) printf("%d ",*p);
   printf("\n");
   printf("len: %u\n\n", utarray_len(a));
 
   i=10; utarray_insert(a, &i, 10);
-  while ( (p=(int*)utarray_next(a,p))) printf("%d ", *p); printf("\n");
+  while ( (p=(int*)utarray_next(a,p)) != NULL ) printf("%d ", *p); printf("\n");
   printf("len: %u\n\n", utarray_len(a));
 
   utarray_free(a);

tests/test82.c

@@ -8,20 +8,20 @@ int main() {
   utarray_new(b, &ut_int_icd);
 
   for(i=0;i<10;i++) utarray_push_back(a,&i);
-  for(p=(int*)utarray_front(a); p; p=(int*)utarray_next(a,p)) printf("%d ",*p);
+  for(p=(int*)utarray_front(a); p!=NULL; p=(int*)utarray_next(a,p)) printf("%d ",*p);
   printf("\n");
   printf("len: %u\n\n", utarray_len(a));
 
   utarray_inserta(b,a,10);
-  for(p=(int*)utarray_front(b); p; p=(int*)utarray_next(b,p)) printf("%d ",*p);
+  for(p=(int*)utarray_front(b); p!=NULL; p=(int*)utarray_next(b,p)) printf("%d ",*p);
   printf("len: %u\n\n", utarray_len(b));
 
   utarray_inserta(b,a,0);
-  for(p=(int*)utarray_front(b); p; p=(int*)utarray_next(b,p)) printf("%d ",*p);
+  for(p=(int*)utarray_front(b); p!=NULL; p=(int*)utarray_next(b,p)) printf("%d ",*p);
   printf("len: %u\n\n", utarray_len(b));
 
   utarray_inserta(b,a,25);
-  for(p=(int*)utarray_front(b); p; p=(int*)utarray_next(b,p)) printf("%d ",*p);
+  for(p=(int*)utarray_front(b); p!=NULL; p=(int*)utarray_next(b,p)) printf("%d ",*p);
   printf("len: %u\n\n", utarray_len(b));
 
   utarray_free(a);

tests/test83.c

@@ -15,7 +15,7 @@ int main(int argc, char*argv[]) {
                       "gil", "buck", "ted", NULL };
     int id=0;
 
-    for(name=names; *name; name++) {
+    for(name=names; *name!=NULL; name++) {
         person = (person_t*)malloc(sizeof(person_t));
         if (person == NULL) exit(-1);
         strncpy(person->first_name, *name,sizeof(person->first_name));
@@ -27,16 +27,16 @@ int main(int argc, char*argv[]) {
     person=NULL;
     person_t **p=&person;
 
-    for(name=names; *name; name++) {
+    for(name=names; *name!=NULL; name++) {
         HASH_FIND_STR(people,*name,*p);
-        if (person) {
+        if (person != NULL) {
             printf("found %s (id %d)\n", person->first_name, person->id);
             new_person  = malloc(sizeof(person_t));
             memcpy(new_person, person, sizeof(person_t));
             new_person->id = person->id*10;
             HASH_REPLACE_STR(people,first_name,new_person,tmp);
-            printf("replaced (%c) with %s (id %d)\n", tmp?'y':'n', new_person->first_name, new_person->id);
-            if (tmp) free(tmp);
+            printf("replaced (%c) with %s (id %d)\n", (tmp!=NULL)?'y':'n', new_person->first_name, new_person->id);
+            if (tmp != NULL) free(tmp);
         } else {
             printf("failed to find %s\n", *name);
         }

tests/test84.c

@@ -15,7 +15,7 @@ int main(int argc, char*argv[]) {
                       "gil", "buck", "ted", NULL };
     int id=0;
 
-    for(name=names; *name; name++) {
+    for(name=names; *name!=NULL; name++) {
         person = (person_t*)malloc(sizeof(person_t));
         if (person == NULL) exit(-1);
         person->first_name = malloc(10UL);
@@ -28,17 +28,17 @@ int main(int argc, char*argv[]) {
     person=NULL;
     person_t **p=&person;
 
-    for(name=names; *name; name++) {
+    for(name=names; *name!=NULL; name++) {
         HASH_FIND_STR(people,*name,*p);
-        if (person) {
+        if (person != NULL) {
             printf("found %s (id %d)\n", person->first_name, person->id);
             new_person  = malloc(sizeof(person_t));
             new_person->first_name = malloc(10UL);
             strncpy(new_person->first_name, person->first_name,10UL);
             new_person->id = person->id*10;
             HASH_REPLACE_STR(people,first_name,new_person,tmp);
-            printf("replaced (%c) with %s (id %d)\n", tmp?'y':'n', new_person->first_name, new_person->id);
-            if (tmp) {free(tmp->first_name); free(tmp);}
+            printf("replaced (%c) with %s (id %d)\n", (tmp!=NULL)?'y':'n', new_person->first_name, new_person->id);
+            if (tmp != NULL) {free(tmp->first_name); free(tmp);}
         } else {
             printf("failed to find %s\n", *name);
         }