X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhostname%2Fhostnamed.c;h=4363b09edb34e4108ea422427a92d89e275b4c15;hp=ece5d1d410c0f94f8df06cc9e6c5b800523d5dc4;hb=76b543756ef69ce69784d571aefe8de65eaeb331;hpb=95b015de3849d8d8d03d9441ae1682a04c38833b

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index ece5d1d41..4363b09ed 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -360,9 +360,6 @@ static int property_get_chassis(
         else
                 name = c->data[PROP_CHASSIS];
 
-        if(!name)
-                name = "";
-
         r = sd_bus_message_append(reply, "s", name);
         if (r < 0)
                 return r;
@@ -374,7 +371,7 @@ static int method_set_hostname(sd_bus *bus, sd_bus_message *m, void *userdata) {
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         Context *c = userdata;
         const char *name;
-        unsigned interactive;
+        int interactive;
         char *h;
         int r;
 
@@ -424,7 +421,7 @@ static int method_set_static_hostname(sd_bus *bus, sd_bus_message *m, void *user
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         Context *c = userdata;
         const char *name;
-        unsigned interactive;
+        int interactive;
         int r;
 
         r = sd_bus_message_read(m, "sb", &name, &interactive);
@@ -475,7 +472,7 @@ static int method_set_static_hostname(sd_bus *bus, sd_bus_message *m, void *user
 
 static int set_machine_info(Context *c, sd_bus *bus, sd_bus_message *m, int prop, sd_bus_message_handler_t cb) {
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
-        unsigned interactive;
+        int interactive;
         const char *name;
         int r;
 
@@ -582,7 +579,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
         assert(event);
         assert(_bus);
 
-        r = sd_bus_open_system(&bus);
+        r = sd_bus_default_system(&bus);
         if (r < 0) {
                 log_error("Failed to get system bus connection: %s", strerror(-r));
                 return r;
@@ -646,7 +643,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = sd_event_new(&event);
+        r = sd_event_default(&event);
         if (r < 0) {
                 log_error("Failed to allocate event loop: %s", strerror(-r));
                 goto finish;