← Back to branch summary

~jamesodhunt/upstart/foo

« back to all changes in this revision

Viewing changes to init/parse_conf.c

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/parse_conf.c
74
74
        nih_assert (file != NULL);
75
75
        nih_assert (pos != NULL);
76
76
 
 
77
        /* If we update 'stanzas' to allow content in init.conf, this
 
78
         * function must be updated in a similar manner to parse_job()
 
79
         * to handle overrides files.
 
80
         */
 
81
        nih_assert (sizeof(stanzas) / sizeof(stanzas[0]) == 1);
 
82
 
77
83
        if (nih_config_parse_file (file, len, pos, lineno,
78
84
                                   stanzas, conffile) < 0)
79
85
                return -1;