Changeset 03daabd in mainline for uspace/srv/sysman/job_queue.c

Timestamp:

2019-10-06T19:47:36Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

5be6361

Parents:

9559cf8

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-09-17 07:50:03)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:47:36)

Message:

Renaming dyn_array to array

The term dyn_array is redunant and has therefore been replaced
with the shorter term array

File:

• uspace/srv/sysman/job_queue.c (modified) (6 diffs)

uspace/srv/sysman/job_queue.c

@@ -110 +110 @@
         assert(other->merged_into == NULL);
 
-        errno_t rc = dyn_array_concat(&trunk->blocked_jobs, &other->blocked_jobs);
+        errno_t rc = array_concat(&trunk->blocked_jobs, &other->blocked_jobs);
         if (rc != EOK) {
                 return rc;
         }
-        dyn_array_clear(&other->blocked_jobs);
+        array_clear(&other->blocked_jobs);
 
         // TODO allocate observed object
@@ -145 +145 @@
 {
         assert(trunk->blocked_jobs.size >= trunk->blocked_jobs_count);
-        dyn_array_clear_range(&trunk->blocked_jobs,
+        array_clear_range(&trunk->blocked_jobs,
             trunk->blocked_jobs_count, trunk->blocked_jobs.size);
 }
@@ -172 +172 @@
 
         /* Check consistency with existing jobs. */
-        dyn_array_foreach(*closure, job_t *, job_it) {
+        array_foreach(*closure, job_t *, job_it) {
                 job_t *job = *job_it;
                 job_t *other_job = job->unit->job;
@@ -214 +214 @@
         /* Aggregate merged jobs, or rollback any changes in existing jobs */
         bool finish_merge = (rc == EOK) && !has_error;
-        dyn_array_foreach(*closure, job_t *, job_it) {
+        array_foreach(*closure, job_t *, job_it) {
                 if ((*job_it)->merged_into == NULL) {
                         continue;
@@ -236 +236 @@
          *      in their blocked_jobs array.
          */
-        dyn_array_foreach(*closure, job_t *, job_it) {
+        array_foreach(*closure, job_t *, job_it) {
                 job_t *job = (*job_it);
                 if (job->merged_into != NULL) {
@@ -255 +255 @@
 
         /* We've stolen references from the closure, so erase it */
-        dyn_array_clear(closure);
+        array_clear(closure);
 
         return EOK;