← Back to branch summary

~jamesodhunt/upstart/foo

« back to all changes in this revision

Viewing changes to init/parse_job.c

Merge of lp:~jamesodhunt/upstart/upstream-session-support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/parse_job.c
2
2
 *
3
3
 * parse_job.c - job definition parsing
4
4
 *
5
 
 * Copyright © 2010 Canonical Ltd.
 
5
 * Copyright © 2010,2011 Canonical Ltd.
6
6
 * Author: Scott James Remnant <scott@netsplit.com>.
7
7
 *
8
8
 * This program is free software; you can redistribute it and/or modify
263
263
/**
264
264
 * parse_job:
265
265
 * @parent: parent object for new job,
 
266
 * @session: session,
266
267
 * @name: name of new job,
267
268
 * @file: file or string to parse,
268
269
 * @len: length of @file,
282
283
 **/
283
284
JobClass *
284
285
parse_job (const void *parent,
 
286
           Session *   session,
285
287
           const char *name,
286
288
           const char *file,
287
289
           size_t      len,
294
296
        nih_assert (file != NULL);
295
297
        nih_assert (pos != NULL);
296
298
 
297
 
        class = job_class_new (parent, name);
 
299
        class = job_class_new (parent, name, session);
298
300
        if (! class)
299
301
                nih_return_system_error (NULL);
300
302