Changeset 205832b in mainline for kernel/test

Timestamp:

2012-11-05T15:37:39Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f048658

Parents:

6b99156

Message:

Replaced 0 with NULL where appropriate (in rcu, cht, uspace hashtable, smp_call, workqueue).

Location:

kernel/test

Files:

• cht/cht1.c (modified) (4 diffs)
• smpcall/smpcall1.c (modified) (1 diff)
• synch/rcu1.c (modified) (8 diffs)
• synch/workqueue2.c (modified) (2 diffs)
• synch/workqueue3.c (modified) (1 diff)

kernel/test/cht/cht1.c

@@ -97 +97 @@
 static const char * do_sanity_test(cht_t *h)
 {
-        if (cht_find_lazy(h, 0))
+        if (cht_find_lazy(h, (void*)0))
                 return "Found lazy in empty table.";
         
-        if (cht_find(h, 0))
+        if (cht_find(h, (void*)0))
                 return "Found in empty table.";
         
-        if (cht_remove_key(h, 0))
+        if (cht_remove_key(h, (void*)0))
                 return "Removed from empty table.";
         
         const int val_cnt = 6;
-        val_t *v[6] = {0};
+        val_t *v[6] = { NULL };
         
         for (int i = 0; i < val_cnt; ++i)
@@ -145 +145 @@
         
         if (cht_find(h, (void*)0))
-                return "Fantom find.";
+                return "Phantom find.";
         
         cht_link_t *item = cht_find(h, (void*)v[5]->unique_id);
@@ -226 +226 @@
         }
 
-        return 0;
+        return NULL;
 }
 
@@ -559 +559 @@
                 return "CHT stress test failed.";
         else
-                return 0;
-}
+                return NULL;
+}

kernel/test/smpcall/smpcall1.c

@@ -85 +85 @@
         /* Number of received calls that were sent by cpu[i]. */
         size_t call_cnt[MAX_CPUS] = {0};
-        thread_t *thread[MAX_CPUS] = {0};
+        thread_t *thread[MAX_CPUS] = { NULL };
         
         unsigned int cpu_count = min(config.cpu_active, MAX_CPUS);

kernel/test/synch/rcu1.c

@@ -43 +43 @@
 
 static int one_idx = 0;
-static thread_t *thread[MAX_THREADS] = {0};
+static thread_t *thread[MAX_THREADS] = { NULL };
 
 typedef struct {
@@ -100 +100 @@
         
         for (size_t i = 0; i < thread_cnt; ++i) {
-                run_thread(i, func, 0);
+                run_thread(i, func, NULL);
         }
 }
@@ -123 +123 @@
                         
                         thread_detach(thread[i]);
-                        thread[i] = 0;
+                        thread[i] = NULL;
                 }
         }
@@ -145 +145 @@
                 thread_join(thread[one_idx]);
                 thread_detach(thread[one_idx]);
-                thread[one_idx] = 0;
+                thread[one_idx] = NULL;
         }
 }
@@ -337 +337 @@
         
         TPRINTF("\nRun a single reader that posts one callback.\n");
-        run_one(one_cb_reader, 0);
+        run_one(one_cb_reader, NULL);
         join_one();
         
@@ -1015 +1015 @@
                 { 0, do_expedite, "do_expedite" },
                 { 1, do_stress, "do_stress" },
-                { 0, 0, 0 }
+                { 0, NULL, NULL }
         };
         
@@ -1023 +1023 @@
         uint64_t delta_gps = 0;
         
-        for (int i = 0; test_func[i].func != 0; ++i) {
+        for (int i = 0; test_func[i].func; ++i) {
                 if (!test_func[i].include) {
                         TPRINTF("\nSubtest %s() skipped.\n", test_func[i].desc);
@@ -1047 +1047 @@
 
         if (success)
-                return 0;
+                return NULL;
         else
                 return "One of the tests failed.";

kernel/test/synch/workqueue2.c

@@ -116 +116 @@
         test_custom_workq_impl(true, "test-workq-stop");
         /* Errors are expected. */
-        return 0;
+        return NULL;
 }
 
@@ -122 +122 @@
 const char *test_workqueue_all(void)
 {
-        const char *err = 0;
+        const char *err = NULL;
         const char *res;
         

kernel/test/synch/workqueue3.c

@@ -56 +56 @@
 static const char *do_test(bool exit_early)
 {
-        const char *err = 0;
+        const char *err = NULL;
         TPRINTF("Stress testing system queue.\n");
         TPRINTF("First run:\n");