X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-job.c;h=e1d7504e85464f6dd25dccd7128124869f0cc517;hb=5b1869eaa22e365ab6595924fe96549b279b5ebc;hp=20c2a623380cf2aba17e3ef20cda10ee4cfc2a05;hpb=5dd9014faf58bf974352043fbddd3a8e9c3cd9d9;p=elogind.git diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index 20c2a6233..e1d7504e8 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -45,7 +45,7 @@ BUS_INTROSPECTABLE_INTERFACE \ "\n" -const char bus_job_interface[] _introspect_("Job") = BUS_JOB_INTERFACE; +const char bus_job_interface[] = BUS_JOB_INTERFACE; #define INTERFACES_LIST \ BUS_GENERIC_INTERFACES_LIST \ @@ -60,7 +60,7 @@ static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_job_append_type, job_type, JobType); static int bus_job_append_unit(DBusMessageIter *i, const char *property, void *data) { Job *j = data; DBusMessageIter sub; - char *p; + _cleanup_free_ char *p = NULL; assert(i); assert(property); @@ -75,12 +75,9 @@ static int bus_job_append_unit(DBusMessageIter *i, const char *property, void *d if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &j->unit->id) || !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) { - free(p); return -ENOMEM; } - free(p); - if (!dbus_message_iter_close_container(i, &sub)) return -ENOMEM; @@ -116,7 +113,7 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connec return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps); } - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_HANDLED; @@ -136,7 +133,7 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu /* Be nice to gdbus and return introspection data for our mid-level paths */ if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Introspectable", "Introspect")) { - char *introspection = NULL; + _cleanup_free_ char *introspection = NULL; FILE *f; Iterator i; size_t size; @@ -169,7 +166,6 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu if (ferror(f)) { fclose(f); - free(introspection); goto oom; } @@ -179,13 +175,10 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu goto oom; if (!dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection, DBUS_TYPE_INVALID)) { - free(introspection); goto oom; } - free(introspection); - - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; @@ -218,7 +211,7 @@ const DBusObjectPathVTable bus_job_vtable = { }; static int job_send_message(Job *j, DBusMessage* (*new_message)(Job *j)) { - DBusMessage *m = NULL; + _cleanup_dbus_message_unref_ DBusMessage *m = NULL; int r; assert(j); @@ -227,9 +220,9 @@ static int job_send_message(Job *j, DBusMessage* (*new_message)(Job *j)) { if (bus_has_subscriber(j->manager) || j->forgot_bus_clients) { m = new_message(j); if (!m) - goto oom; + return -ENOMEM; + r = bus_broadcast(j->manager, m); - dbus_message_unref(m); if (r < 0) return r; @@ -238,18 +231,19 @@ static int job_send_message(Job *j, DBusMessage* (*new_message)(Job *j)) { * to the client(s) which created the job */ JobBusClient *cl; assert(j->bus_client_list); + LIST_FOREACH(client, cl, j->bus_client_list) { assert(cl->bus); m = new_message(j); if (!m) - goto oom; + return -ENOMEM; if (!dbus_message_set_destination(m, cl->name)) - goto oom; + return -ENOMEM; if (!dbus_connection_send(cl->bus, m, NULL)) - goto oom; + return -ENOMEM; dbus_message_unref(m); m = NULL; @@ -257,62 +251,54 @@ static int job_send_message(Job *j, DBusMessage* (*new_message)(Job *j)) { } return 0; -oom: - if (m) - dbus_message_unref(m); - return -ENOMEM; } static DBusMessage* new_change_signal_message(Job *j) { - DBusMessage *m = NULL; - char *p = NULL; + _cleanup_free_ char *p = NULL; + DBusMessage *m; p = job_dbus_path(j); if (!p) - goto oom; + return NULL; if (j->sent_dbus_new_signal) { /* Send a properties changed signal */ m = bus_properties_changed_new(p, "org.freedesktop.systemd1.Job", INVALIDATING_PROPERTIES); if (!m) - goto oom; + return NULL; } else { /* Send a new signal */ m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "JobNew"); if (!m) - goto oom; + return NULL; if (!dbus_message_append_args(m, DBUS_TYPE_UINT32, &j->id, DBUS_TYPE_OBJECT_PATH, &p, DBUS_TYPE_STRING, &j->unit->id, - DBUS_TYPE_INVALID)) - goto oom; + DBUS_TYPE_INVALID)) { + dbus_message_unref(m); + return NULL; + } } return m; - -oom: - if (m) - dbus_message_unref(m); - free(p); - return NULL; } static DBusMessage* new_removed_signal_message(Job *j) { - DBusMessage *m = NULL; - char *p = NULL; + _cleanup_free_ char *p = NULL; + DBusMessage *m; const char *r; p = job_dbus_path(j); if (!p) - goto oom; + return NULL; m = dbus_message_new_signal("/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "JobRemoved"); if (!m) - goto oom; + return NULL; r = job_result_to_string(j->result); @@ -321,23 +307,19 @@ static DBusMessage* new_removed_signal_message(Job *j) { DBUS_TYPE_OBJECT_PATH, &p, DBUS_TYPE_STRING, &j->unit->id, DBUS_TYPE_STRING, &r, - DBUS_TYPE_INVALID)) - goto oom; + DBUS_TYPE_INVALID)) { + dbus_message_unref(m); + return NULL; + } return m; - -oom: - if (m) - dbus_message_unref(m); - free(p); - return NULL; } void bus_job_send_change_signal(Job *j) { assert(j); if (j->in_dbus_queue) { - LIST_REMOVE(Job, dbus_queue, j->manager->dbus_job_queue, j); + LIST_REMOVE(dbus_queue, j->manager->dbus_job_queue, j); j->in_dbus_queue = false; }