24d66e6 scheduler: rename path_next to path_prev — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

scheduler: rename path_next to path_prev

Isaac Freund committed 8 months ago

commit 24d66e6395ff3bd7ec45201ac02b065838f95f1d
parent efd5436

2 files changed +7 -7

modified libpkg/pkg_jobs_schedule.c

@@ -330,8 +330,8 @@ pkg_jobs_schedule_find_cycle(pkg_solved_list *jobs,

 	/* Push node to path */
 	assert(node->mark == PKG_SOLVED_CYCLE_MARK_NONE);
 	node->mark = PKG_SOLVED_CYCLE_MARK_PATH;
 	assert(node->path_next == NULL);
 	node->path_next = *path;
 	assert(node->path_prev == NULL);
 	node->path_prev = *path;
 	*path = node;
 	vec_foreach(*jobs, i) {

@@ -357,8 +357,8 @@ pkg_jobs_schedule_find_cycle(pkg_solved_list *jobs,

 	/* Pop node from path */
 	assert(node->mark == PKG_SOLVED_CYCLE_MARK_PATH);
 	node->mark = PKG_SOLVED_CYCLE_MARK_DONE;
 	*path = node->path_next;
 	node->path_next = NULL;
 	*path = node->path_prev;
 	node->path_prev = NULL;
 	return (NULL);
 }

@@ -370,7 +370,7 @@ int pkg_jobs_schedule(struct pkg_jobs *j)

 		vec_foreach(j->jobs, i) {
 			j->jobs.d[i]->mark = PKG_SOLVED_CYCLE_MARK_NONE;
 			j->jobs.d[i]->path_next = NULL;
 			j->jobs.d[i]->path_prev = NULL;
 			pkg_jobs_schedule_dbg_job(&j->jobs, j->jobs.d[i]);
 		}

@@ -418,7 +418,7 @@ int pkg_jobs_schedule(struct pkg_jobs *j)

 				pkg_emit_error("found job scheduling cycle without upgrade job");
 			 	return (EPKG_FATAL);
 			}
 			path = path->path_next;
 			path = path->path_prev;
 			assert(path != NULL);
 		}

modified libpkg/private/pkg_jobs.h

@@ -94,7 +94,7 @@ struct pkg_solved {

 	struct pkg_solved *xlink;	/* link split jobs together */
 	pkg_solved_t type;
 	enum pkg_solved_cycle_mark mark;/* scheduling cycle detection */
 	struct pkg_solved *path_next;	/* scheduling cycle detection */
 	struct pkg_solved *path_prev;	/* scheduling cycle detection */
 };
 typedef vec_t(struct pkg_solved *) pkg_solved_list;