chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
hostname
/
hostnamectl.c
diff --git
a/src/hostname/hostnamectl.c
b/src/hostname/hostnamectl.c
index e48736920f126a6c4b048be48df03be97d38f482..5218b41b41595047a879fcb7e6324e4377248dc5 100644
(file)
--- a/
src/hostname/hostnamectl.c
+++ b/
src/hostname/hostnamectl.c
@@
-21,12
+21,9
@@
#include <stdlib.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdbool.h>
-#include <unistd.h>
#include <getopt.h>
#include <locale.h>
#include <string.h>
#include <getopt.h>
#include <locale.h>
#include <string.h>
-#include <sys/timex.h>
-#include <sys/utsname.h>
#include "sd-bus.h"
#include "sd-bus.h"
@@
-35,12
+32,8
@@
#include "util.h"
#include "spawn-polkit-agent.h"
#include "build.h"
#include "util.h"
#include "spawn-polkit-agent.h"
#include "build.h"
-#include "clock-util.h"
-#include "strv.h"
#include "sd-id128.h"
#include "sd-id128.h"
-#include "virt.h"
#include "architecture.h"
#include "architecture.h"
-#include "fileio.h"
static bool arg_ask_password = true;
static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
static bool arg_ask_password = true;
static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
@@
-405,7
+398,7
@@
static int parse_argv(int argc, char *argv[]) {
break;
case 'M':
break;
case 'M':
- arg_transport = BUS_TRANSPORT_
CONTAINER
;
+ arg_transport = BUS_TRANSPORT_
MACHINE
;
arg_host = optarg;
break;
arg_host = optarg;
break;
@@
-529,12
+522,12
@@
int main(int argc, char *argv[]) {
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
r = bus_open_transport(arg_transport, arg_host, false, &bus);
if (r < 0) {
- log_error
("Failed to create bus connection: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to create bus connection: %m"
);
goto finish;
}
r = hostnamectl_main(bus, argc, argv);
finish:
goto finish;
}
r = hostnamectl_main(bus, argc, argv);
finish:
- return r < 0 ? EXIT_FAILURE :
r
;
+ return r < 0 ? EXIT_FAILURE :
EXIT_SUCCESS
;
}
}