← Back to branch summary

~jamesodhunt/upstart/bug-1302117

« back to all changes in this revision

Viewing changes to init/event_operator.c

  • Committer: James Hunt
  • Date: 2014-06-05 08:42:55 UTC
  • mfrom: (1613.1.18 trunk)
  • Revision ID: james.hunt@ubuntu.com-20140605084255-uavg5ysf1ath6dwv
* Sync with lp:upstart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/event_operator.c
1022
1022
        if (! state_check_json_type (json, object))
1023
1023
                goto error;
1024
1024
 
1025
 
        if (json_object_object_get (json, "name")) {
 
1025
        if (json_object_object_get_ex (json, "name", NULL)) {
1026
1026
                if (! state_get_json_string_var_strict (json, "name", NULL, name))
1027
1027
                        goto error;
1028
1028
        }
1032
1032
                                "type", type))
1033
1033
                goto error;
1034
1034
 
1035
 
        if (json_object_object_get (json, "env")) {
 
1035
        if (json_object_object_get_ex (json, "env", NULL)) {
1036
1036
                json_object  *json_env;
1037
1037
                if (! state_get_json_var_full (json, "env", array, json_env))
1038
1038
                        goto error;
1054
1054
        if (! state_get_json_int_var_to_obj (json, oper, value))
1055
1055
                goto error;
1056
1056
 
1057
 
        if (json_object_object_get (json, "event")) {
 
1057
        if (json_object_object_get_ex (json, "event", NULL)) {
1058
1058
                int event_index;
1059
1059
 
1060
1060
                if (! state_get_json_int_var (json, "event", event_index))