job: job_new() can find the manager from the unit

This commit is contained in:
Michal Schmidt 2012-04-18 01:39:20 +02:00
parent 75778e21df
commit 668ad332a4
3 changed files with 5 additions and 6 deletions

View File

@ -33,18 +33,17 @@
#include "log.h" #include "log.h"
#include "dbus-job.h" #include "dbus-job.h"
Job* job_new(Manager *m, JobType type, Unit *unit) { Job* job_new(Unit *unit, JobType type) {
Job *j; Job *j;
assert(m);
assert(type < _JOB_TYPE_MAX); assert(type < _JOB_TYPE_MAX);
assert(unit); assert(unit);
if (!(j = new0(Job, 1))) if (!(j = new0(Job, 1)))
return NULL; return NULL;
j->manager = m; j->manager = unit->manager;
j->id = m->current_job_id++; j->id = j->manager->current_job_id++;
j->type = type; j->type = type;
j->unit = unit; j->unit = unit;

View File

@ -137,7 +137,7 @@ struct Job {
bool ignore_order:1; bool ignore_order:1;
}; };
Job* job_new(Manager *m, JobType type, Unit *unit); Job* job_new(Unit *unit, JobType type);
void job_uninstall(Job *j); void job_uninstall(Job *j);
void job_free(Job *job); void job_free(Job *job);
void job_dump(Job *j, FILE*f, const char *prefix); void job_dump(Job *j, FILE*f, const char *prefix);

View File

@ -763,7 +763,7 @@ static Job* transaction_add_one_job(Transaction *tr, JobType type, Unit *unit, b
if (unit->job && unit->job->type == type) if (unit->job && unit->job->type == type)
j = unit->job; j = unit->job;
else { else {
j = job_new(unit->manager, type, unit); j = job_new(unit, type);
if (!j) if (!j)
return NULL; return NULL;
} }