diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-09-23 03:01:06 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-09-29 21:08:37 +0200 |
commit | 3f6fd1ba65f962702753c4ad284b588e59689a23 (patch) | |
tree | 6520fcb6f2421c6ac0b0cb69d8242e3fb878f471 /src/locale | |
parent | 189d5bac5c45a6a735489541e285dec8bfc1d38d (diff) | |
download | systemd-3f6fd1ba65f962702753c4ad284b588e59689a23.tar.gz |
util: introduce common version() implementation and use it everywhere
This also allows us to drop build.h from a ton of files, hence do so.
Since we touched the #includes of those files, let's order them properly
according to CODING_STYLE.
Diffstat (limited to 'src/locale')
-rw-r--r-- | src/locale/localectl.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 4a91c7420a..26d7d5890e 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -20,26 +20,26 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include <ftw.h> +#include <getopt.h> #include <locale.h> -#include <stdlib.h> #include <stdbool.h> -#include <getopt.h> +#include <stdlib.h> #include <string.h> -#include <ftw.h> #include "sd-bus.h" -#include "bus-util.h" + #include "bus-error.h" -#include "util.h" -#include "spawn-polkit-agent.h" -#include "build.h" -#include "strv.h" -#include "pager.h" -#include "set.h" +#include "bus-util.h" #include "def.h" -#include "virt.h" #include "fileio.h" #include "locale-util.h" +#include "pager.h" +#include "set.h" +#include "spawn-polkit-agent.h" +#include "strv.h" +#include "util.h" +#include "virt.h" static bool arg_no_pager = false; static bool arg_ask_password = true; @@ -546,9 +546,7 @@ static int parse_argv(int argc, char *argv[]) { return 0; case ARG_VERSION: - puts(PACKAGE_STRING); - puts(SYSTEMD_FEATURES); - return 0; + return version(); case ARG_NO_CONVERT: arg_convert = false; |