← Back to branch summary

~jamesodhunt/ubuntu/trusty/upstart/1.12.1

« back to all changes in this revision

Viewing changes to init/control.h

  • Committer: James Hunt
  • Date: 2014-03-11 15:29:02 UTC
  • mfrom: (1436.2.5)
  • Revision ID: james.hunt@ubuntu.com-20140311152902-xszpbkjufkdv6js8
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/control.h
1
1
/* upstart
2
2
 *
3
 
 * Copyright  2009-2011 Canonical Ltd.
 
3
 * Copyright © 2009-2011 Canonical Ltd.
4
4
 * Author: Scott James Remnant <scott@netsplit.com>.
5
5
 *
6
6
 * This program is free software; you can redistribute it and/or modify
60
60
 **/
61
61
#define control_get_job(session, job, job_name, instance)             \
62
62
{                                                                     \
63
 
        if (job_name != NULL ) {                                      \
 
63
        if (job_name) {                                               \
64
64
                JobClass *class;                                      \
65
65
                                                                      \
66
66
                class = job_class_get_registered (job_name, session); \
73
73
                        return -1;                                    \
74
74
                }                                                     \
75
75
                                                                      \
76
 
                job = job_find (session, class, NULL, instance);      \
77
 
                if (job == NULL) {                                    \
 
76
                job = job_find (session, class, job_name, instance);  \
 
77
                if (! job) {                                          \
78
78
                        nih_dbus_error_raise_printf (                 \
79
79
                                DBUS_INTERFACE_UPSTART                \
80
80
                                ".Error.UnknownJobInstance",          \
81
81
                                _("Unknown instance: %s of job %s"),  \
82
 
                                instance, job_name);                  \
 
82
                                instance ? instance : "(null)",       \
 
83
                                job_name);                            \
83
84
                        return -1;                                    \
84
85
                }                                                     \
85
86
        }                                                             \
142
143
int control_conn_to_index (const DBusConnection *connection)
143
144
        __attribute__ ((warn_unused_result));
144
145
 
145
 
DBusConnection *
146
 
control_conn_from_index (int conn_index)
 
146
DBusConnection *control_conn_from_index (int conn_index)
147
147
        __attribute__ ((warn_unused_result));
148
148
 
149
149
int control_bus_release_name (void)
184
184
                 char            **value)
185
185
        __attribute__ ((warn_unused_result));
186
186
 
187
 
int
188
 
control_list_env (void             *data,
 
187
int control_list_env (void             *data,
189
188
                 NihDBusMessage   *message,
190
189
                 char * const     *job_details,
191
190
                 char           ***env)
192
191
        __attribute__ ((warn_unused_result));
193
192
 
194
 
int
195
 
control_reset_env (void           *data,
 
193
int control_reset_env (void           *data,
196
194
                 NihDBusMessage   *message,
197
195
                 char * const    *job_details)
198
196
        __attribute__ ((warn_unused_result));
199
197
 
200
 
int
201
 
control_unset_env (void            *data,
 
198
int control_unset_env (void            *data,
202
199
                   NihDBusMessage  *message,
203
200
                   char * const    *job_details,
204
201
                   const char      *name)
205
202
        __attribute__ ((warn_unused_result));
206
203
 
 
204
json_object *control_serialise_bus_address (void)
 
205
        __attribute__ ((warn_unused_result));
 
206
 
 
207
int control_deserialise_bus_address (json_object *json)
 
208
        __attribute__ ((warn_unused_result));
 
209
 
207
210
NIH_END_EXTERN
208
211
 
209
212
#endif /* INIT_CONTROL_H */