[PATCH 1/5] mkswap: remove unnecessary usage output

public inbox for util-linux@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/5] mkswap: remove unnecessary usage output
@ 2014-03-08 17:01 Sami Kerola
  2014-03-08 17:01 ` [PATCH 2/5] tests: check swaplabel, and perform more swapon boundary tests Sami Kerola
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Sami Kerola @ 2014-03-08 17:01 UTC (permalink / raw)
  To: util-linux; +Cc: kerolasa

The usage output changes too often making unnecessarily expected output
in test unstable.  Besides in this case the usage ouput does not even
help user, because invalid swap target size error cannot be fixed by
specificing an option.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 disk-utils/mkswap.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index a2c6529..ae73f80 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -545,18 +545,16 @@ main(int argc, char **argv) {
 	sz = get_size(device_name);
 	if (!PAGES)
 		PAGES = sz;
-	else if (PAGES > sz && !force) {
+	else if (PAGES > sz && !force)
 		errx(EXIT_FAILURE,
 			_("error: "
 			  "size %llu KiB is larger than device size %llu KiB"),
 			PAGES*(pagesize/1024), sz*(pagesize/1024));
-	}
 
-	if (PAGES < MIN_GOODPAGES) {
-		warnx(_("error: swap area needs to be at least %ld KiB"),
-			(long)(MIN_GOODPAGES * pagesize/1024));
-		usage(stderr);
-	}
+	if (PAGES < MIN_GOODPAGES)
+		errx(EXIT_FAILURE,
+		     _("error: swap area needs to be at least %ld KiB"),
+		     (long)(MIN_GOODPAGES * pagesize / 1024));
 
 #ifdef __linux__
 	if (get_linux_version() >= KERNEL_VERSION(2,3,4))
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/5] tests: check swaplabel, and perform more swapon boundary tests
  2014-03-08 17:01 [PATCH 1/5] mkswap: remove unnecessary usage output Sami Kerola
@ 2014-03-08 17:01 ` Sami Kerola
  2014-03-08 17:01 ` [PATCH 3/5] build-sys: sort gitignore files Sami Kerola
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Sami Kerola @ 2014-03-08 17:01 UTC (permalink / raw)
  To: util-linux; +Cc: kerolasa

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 tests/commands.sh             |  1 +
 tests/expected/misc/swaplabel |  6 ++++++
 tests/ts/misc/swaplabel       | 44 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 tests/expected/misc/swaplabel
 create mode 100755 tests/ts/misc/swaplabel

diff --git a/tests/commands.sh b/tests/commands.sh
index fcd74dc..68048fa 100644
--- a/tests/commands.sh
+++ b/tests/commands.sh
@@ -64,6 +64,7 @@ TS_CMD_REV=${TS_CMD_REV:-"$top_builddir/rev"}
 TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/script"}
 TS_CMD_SETARCH=${TS_CMD_SETARCH-"$top_builddir/setarch"}
 TS_CMD_SETSID=${TS_CMD_SETSID-"$top_builddir/setsid"}
+TS_CMD_SWAPLABEL=${TS_CMD_SWAPLABEL:-"$top_builddir/swaplabel"}
 TS_CMD_SWAPOFF=${TS_CMD_SWAPOFF:-"$top_builddir/swapoff"}
 TS_CMD_SWAPON=${TS_CMD_SWAPON:-"$top_builddir/swapon"}
 TS_CMD_TAILF=${TS_CMD_TAILF-"$top_builddir/tailf"}
diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel
new file mode 100644
index 0000000..061f5bb
--- /dev/null
+++ b/tests/expected/misc/swaplabel
@@ -0,0 +1,6 @@
+mkswap: error: swap area needs to be at least 40 KiB
+mkswap: Label was truncated.
+Setting up swapspace version 1, size = 36 KiB
+LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab
+LABEL: 1234567890abcde
+UUID:  12345678-abcd-abcd-abcd-1234567890ab
diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel
new file mode 100755
index 0000000..e876874
--- /dev/null
+++ b/tests/ts/misc/swaplabel
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+TS_TOPDIR="${0%/*}/../.."
+TS_DESC="swaplabel"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+#ts_check_test_command "$TS_CMD_FALLOCATE"
+#ts_check_test_command "$TS_CMD_MKSWAP"
+#ts_check_test_command "$TS_CMD_SWAPLABEL"
+
+IMAGE=${TS_OUTDIR}/${TS_TESTNAME}.file
+
+rm -f $IMAGE
+$TS_CMD_FALLOCATE -l 40959 $IMAGE > $TS_OUTPUT 2>&1
+$TS_CMD_MKSWAP \
+	--label 1234567890abcdef \
+	--uuid 12345678-abcd-abcd-abcd-1234567890ab \
+	$IMAGE >> $TS_OUTPUT 2>&1
+
+rm -f $IMAGE
+$TS_CMD_FALLOCATE -l 40960 $IMAGE >> $TS_OUTPUT 2>&1
+$TS_CMD_MKSWAP \
+	--label 1234567890abcdef \
+	--uuid 12345678-abcd-abcd-abcd-1234567890ab \
+	$IMAGE >> $TS_OUTPUT 2>&1
+$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1
+
+#rm -f $IMAGE
+
+ts_finalize
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/5] build-sys: sort gitignore files
  2014-03-08 17:01 [PATCH 1/5] mkswap: remove unnecessary usage output Sami Kerola
  2014-03-08 17:01 ` [PATCH 2/5] tests: check swaplabel, and perform more swapon boundary tests Sami Kerola
@ 2014-03-08 17:01 ` Sami Kerola
  2014-03-08 17:01 ` [PATCH 4/5] docs: add a new command boilerplate code Sami Kerola
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Sami Kerola @ 2014-03-08 17:01 UTC (permalink / raw)
  To: util-linux; +Cc: kerolasa

Use 'LC_ALL=C sort -fu' order for all lists.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 .gitignore                  | 67 ++++++++++++++++++++++-----------------------
 libblkid/docs/.gitignore    | 16 +++++------
 libblkid/samples/.gitignore |  4 +--
 libmount/docs/.gitignore    | 16 +++++------
 po/.gitignore               | 24 ++++++++--------
 sys-utils/.gitignore        |  8 +++---
 6 files changed, 67 insertions(+), 68 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91b625f..bafe258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,59 +1,58 @@
 #
 # generic stuff
 #
-*~
-*.[ao]
-*.static
-*.so
-*.lo
-*.la
-*.so.*
-*.pc
 *.gcda
 *.gcno
 *.gcov
+*.la
+*.lo
+*.pc
 *.pyc
+*.so
+*.so.*
+*.static
 *.vim
-Makefile
+*.[ao]
+*~
+.clang_complete
+.deps
+.dirstamp
+.libs
+.tarball-version
+.version
+ABOUT-NLS
 aclocal.m4
 autom4te.cache
-stamp-h.in
-Makefile.in
-configure
+compile
 config.cache
+config.guess
 config.h
 config.h.in
 config.log
-config.guess
+config.rpath
 config.status
 config.sub
-stamp-h
-stamp-h1
-update.log
-m4/*.m4
-aclocal.m4
-ABOUT-NLS
-config.rpath
-mkinstalldirs
-compile
+config/ltmain.sh
+config/test-driver
+configure
+cscope.out
 depcomp
-install-sh
 INSTALL
-missing
+install-sh
 libtool
-cscope.out
+m4/*.m4
+Makefile
+Makefile.in
+missing
+mkinstalldirs
+stamp-h
+stamp-h.in
+stamp-h1
 tags
-.deps
-.libs
-.tarball-version
-.version
-.dirstamp
-.clang_complete
-config/ltmain.sh
-config/test-driver
 test-suite.log
 tests/run.sh.log
 tests/run.sh.trs
+update.log
 
 # libuuid depends on AX_TLS macro
 !m4/tls.m4
@@ -70,6 +69,7 @@ tests/run.sh.trs
 #
 /addpart
 /agetty
+/blkdiscard
 /blkid
 /blockdev
 /cal
@@ -98,7 +98,6 @@ tests/run.sh.trs
 /fsck.minix
 /fsfreeze
 /fstrim
-/blkdiscard
 /getopt
 /hexdump
 /hwclock
diff --git a/libblkid/docs/.gitignore b/libblkid/docs/.gitignore
index e40d782..f91f93d 100644
--- a/libblkid/docs/.gitignore
+++ b/libblkid/docs/.gitignore
@@ -1,18 +1,18 @@
-*.args
-*.bak
-*.types
 *-decl-list.txt
 *-decl.txt
+*-overrides.txt
+*-undeclared.txt
+*-undocumented.txt
+*-unused.txt
+*.args
+*.bak
 *.hierarchy
-html/*
 *.interfaces
-*-overrides.txt
 *.prerequisites
 *.signals
 *.stamp
+*.types
+html/*
 tmpl/*
-*-undeclared.txt
-*-undocumented.txt
-*-unused.txt
 version.xml
 xml/*
diff --git a/libblkid/samples/.gitignore b/libblkid/samples/.gitignore
index 409e5cf..4efeb62 100644
--- a/libblkid/samples/.gitignore
+++ b/libblkid/samples/.gitignore
@@ -1,4 +1,4 @@
-topology
-partitions
 mkfs
+partitions
 superblocks
+topology
diff --git a/libmount/docs/.gitignore b/libmount/docs/.gitignore
index e40d782..f91f93d 100644
--- a/libmount/docs/.gitignore
+++ b/libmount/docs/.gitignore
@@ -1,18 +1,18 @@
-*.args
-*.bak
-*.types
 *-decl-list.txt
 *-decl.txt
+*-overrides.txt
+*-undeclared.txt
+*-undocumented.txt
+*-unused.txt
+*.args
+*.bak
 *.hierarchy
-html/*
 *.interfaces
-*-overrides.txt
 *.prerequisites
 *.signals
 *.stamp
+*.types
+html/*
 tmpl/*
-*-undeclared.txt
-*-undocumented.txt
-*-unused.txt
 version.xml
 xml/*
diff --git a/po/.gitignore b/po/.gitignore
index 8263386..432d9c1 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,16 +1,16 @@
-stamp-po
-remove-potcdate.sin
-remove-potcdate.sed
-quot.sed
-insert-header.sin
 *.gmo
-en@quot.header
-en@boldquot.header
 boldquot.sed
-Rules-quot
+en@boldquot.header
+en@quot.header
+insert-header.sin
+Makefile
+Makefile.in
+Makefile.in.in
+Makevars.template
 POTFILES
 POTFILES.in
-Makevars.template
-Makefile.in.in
-Makefile.in
-Makefile
+quot.sed
+remove-potcdate.sed
+remove-potcdate.sin
+Rules-quot
+stamp-po
diff --git a/sys-utils/.gitignore b/sys-utils/.gitignore
index 97e6e60..8d8737a 100644
--- a/sys-utils/.gitignore
+++ b/sys-utils/.gitignore
@@ -2,19 +2,19 @@ i386.8
 ia64.8
 linux32.8
 linux64.8
+mips.8
 mips32.8
 mips64.8
-mips.8
+parisc.8
 parisc32.8
 parisc64.8
-parisc.8
+ppc.8
 ppc32.8
 ppc64.8
-ppc.8
 s390.8
 s390x.8
+sparc.8
 sparc32.8
 sparc32bash.8
 sparc64.8
-sparc.8
 x86_64.8
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 4/5] docs: add a new command boilerplate code
  2014-03-08 17:01 [PATCH 1/5] mkswap: remove unnecessary usage output Sami Kerola
  2014-03-08 17:01 ` [PATCH 2/5] tests: check swaplabel, and perform more swapon boundary tests Sami Kerola
  2014-03-08 17:01 ` [PATCH 3/5] build-sys: sort gitignore files Sami Kerola
@ 2014-03-08 17:01 ` Sami Kerola
  2014-03-08 17:01 ` [PATCH 5/5] build-sys: unify function and variable attribute spacing Sami Kerola
  2014-03-12 11:07 ` [PATCH 1/5] mkswap: remove unnecessary usage output Karel Zak
  4 siblings, 0 replies; 8+ messages in thread
From: Sami Kerola @ 2014-03-08 17:01 UTC (permalink / raw)
  To: util-linux; +Cc: kerolasa

Having howtos is good, having an working code that can be used as-is to
kickstart a write of a new command is better.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 Documentation/boilerplate.c | 100 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 Documentation/boilerplate.c

diff --git a/Documentation/boilerplate.c b/Documentation/boilerplate.c
new file mode 100644
index 0000000..3ee7d7b
--- /dev/null
+++ b/Documentation/boilerplate.c
@@ -0,0 +1,100 @@
+/* Please use this file as a template when introducing new command to
+ * util-linux package.
+ * -- remove above */
+/*
+ * fixme-command-name - purpose of it
+ *
+ * Copyright (c) 20nn  Example Commercial, Inc
+ * Written by Your Name <you@example.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <getopt.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "c.h"
+#include "closestream.h"
+#include "nls.h"
+
+static void __attribute__((__noreturn__)) usage(FILE *out)
+{
+	fputs(USAGE_HEADER, out);
+	fprintf(out, _(" %s [options] file...\n"), program_invocation_short_name);
+	fputs(USAGE_OPTIONS, out);
+	fputs(_(" -n, --no-argument       option does not use argument\n"), out);
+	fputs(_(" -o, --optional[=<arg>]  option argument is optional\n"), out);
+	fputs(_(" -r, --required <arg>    option requires an argument\n"), out);
+	fputs(_(" -z                      no long option\n"), out);
+	fputs(_("     --xyzzy             a long option only\n"), out);
+	fputs(_(" -e, --extremely-long-long-option\n"), out);
+	fputs(_("                         use next line for description when needed\n"), out);
+	fputs(_(" -l, --long-explanation  an example of very verbose, and chatty option\n"), out);
+	fputs(_("                           description on two, or multiple lines, where the\n"), out);
+	fputs(_("                           consecutive lines are intended by two spaces\n"), out);
+	fputs(_(" -f, --foobar            next option description resets indent\n"), out);
+	fputs(USAGE_SEPARATOR, out);
+	fputs(USAGE_HELP, out);
+	fputs(USAGE_VERSION, out);
+	fprintf(out, USAGE_MAN_TAIL("fixme-command-name(1)"));
+	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
+int main(int argc, char **argv)
+{
+	int c;
+
+	enum {
+		OPT_XYZZY = CHAR_MAX + 1
+	};
+	static const struct option longopts[] = {
+		{"no-argument", no_argument, NULL, 'n'},
+		{"optional", optional_argument, NULL, 'o'},
+		{"required", required_argument, NULL, 'r'},
+		{"xyzzy", no_argument, NULL, OPT_XYZZY},
+		{"extremely-long-long-option", no_argument, NULL, 'e'},
+		{"long-explanation", no_argument, NULL, 'l'},
+		{"foobar", no_argument, NULL, 'f'},
+		{"version", no_argument, NULL, 'V'},
+		{"help", no_argument, NULL, 'h'},
+		{NULL, 0, NULL, 0}
+	};
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+	atexit(close_stdout);
+
+	while ((c = getopt_long(argc, argv, "no::r:elfVh", longopts, NULL)) != -1)
+		switch (c) {
+		case 'n':
+		case 'o':
+		case 'r':
+		case OPT_XYZZY:
+		case 'e':
+		case 'l':
+		case 'f':
+			break;
+		case 'V':
+			printf(UTIL_LINUX_VERSION);
+			return EXIT_SUCCESS;
+		case 'h':
+			usage(stdout);
+		default:
+			usage(stderr);
+		}
+
+	return EXIT_SUCCESS;
+}
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 5/5] build-sys: unify function and variable attribute spacing
  2014-03-08 17:01 [PATCH 1/5] mkswap: remove unnecessary usage output Sami Kerola
                   ` (2 preceding siblings ...)
  2014-03-08 17:01 ` [PATCH 4/5] docs: add a new command boilerplate code Sami Kerola
@ 2014-03-08 17:01 ` Sami Kerola
  2014-03-12 11:07 ` [PATCH 1/5] mkswap: remove unnecessary usage output Karel Zak
  4 siblings, 0 replies; 8+ messages in thread
From: Sami Kerola @ 2014-03-08 17:01 UTC (permalink / raw)
  To: util-linux; +Cc: kerolasa

>From two different styles the more popular is picked to be the correct
for this package.

$ git grep -hc '_ ((*_' | awk -F: '{T+=$2} END  {print T}'
141
$ git grep -hc '_((*_'  | awk -F: '{T+=$2} END  {print T}'
168

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 disk-utils/addpart.c                   |  2 +-
 disk-utils/blockdev.c                  |  2 +-
 disk-utils/delpart.c                   |  2 +-
 disk-utils/fdformat.c                  |  2 +-
 disk-utils/fsck.c                      |  2 +-
 disk-utils/fsck.minix.c                |  2 +-
 disk-utils/mkfs.bfs.c                  |  4 ++--
 disk-utils/mkfs.c                      |  4 ++--
 disk-utils/mkfs.minix.c                |  2 +-
 disk-utils/mkswap.c                    |  2 +-
 disk-utils/raw.c                       |  2 +-
 disk-utils/resizepart.c                |  2 +-
 fdisks/cfdisk.c                        |  2 +-
 fdisks/fdisk.c                         |  2 +-
 fdisks/sfdisk.c                        | 24 ++++++++++++------------
 include/path.h                         | 18 +++++++++---------
 include/xalloc.h                       |  2 +-
 lib/at.c                               |  6 +++---
 lib/loopdev.c                          |  2 +-
 lib/pager.c                            |  4 ++--
 lib/randutils.c                        |  4 ++--
 libblkid/src/blkidP.h                  |  4 ++--
 libblkid/src/superblocks/btrfs.c       |  4 ++--
 libblkid/src/superblocks/ntfs.c        |  2 +-
 libblkid/src/superblocks/superblocks.h |  4 ++--
 libblkid/src/superblocks/vmfs.c        |  4 ++--
 libfdisk/src/dos.c                     |  2 +-
 libfdisk/src/fdiskP.h                  |  2 +-
 libfdisk/src/libfdisk.h                | 10 +++++-----
 libmount/python/pylibmount.h           |  4 ++--
 libmount/src/mountP.h                  |  4 ++--
 libmount/src/optstr.c                  |  8 ++++----
 login-utils/login.c                    |  8 ++++----
 login-utils/newgrp.c                   |  2 +-
 login-utils/su-common.c                |  2 +-
 login-utils/sulogin-consoles.c         |  2 +-
 misc-utils/cal.c                       |  2 +-
 misc-utils/findmnt.c                   |  6 +++---
 misc-utils/getopt.c                    |  4 ++--
 misc-utils/logger.c                    |  2 +-
 misc-utils/look.c                      |  4 ++--
 misc-utils/lslocks.c                   |  2 +-
 misc-utils/mcookie.c                   |  2 +-
 misc-utils/rename.c                    |  2 +-
 misc-utils/uuidd.c                     |  4 ++--
 misc-utils/uuidgen.c                   |  2 +-
 schedutils/ionice.c                    |  2 +-
 sys-utils/ctrlaltdel.c                 |  2 +-
 sys-utils/cytune.c                     |  2 +-
 sys-utils/eject.c                      |  2 +-
 sys-utils/hwclock-cmos.c               | 18 +++++++++---------
 sys-utils/hwclock.c                    |  8 ++++----
 sys-utils/ipcmk.c                      |  2 +-
 sys-utils/ipcrm.c                      |  2 +-
 sys-utils/ipcs.c                       |  2 +-
 sys-utils/ldattach.c                   |  2 +-
 sys-utils/pivot_root.c                 |  2 +-
 sys-utils/prlimit.c                    |  2 +-
 sys-utils/readprofile.c                |  2 +-
 sys-utils/setsid.c                     |  2 +-
 sys-utils/swapoff.c                    |  2 +-
 sys-utils/swapon.c                     |  2 +-
 term-utils/agetty.c                    |  2 +-
 term-utils/mesg.c                      |  2 +-
 term-utils/script.c                    |  4 ++--
 term-utils/setterm.c                   |  4 ++--
 term-utils/write.c                     | 10 +++++-----
 text-utils/colcrt.c                    |  4 ++--
 text-utils/colrm.c                     |  2 +-
 text-utils/hexdump-parse.c             |  8 ++++----
 text-utils/rev.c                       |  4 ++--
 text-utils/tailf.c                     |  2 +-
 text-utils/ul.c                        |  2 +-
 73 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c
index c0f25a5..2665859 100644
--- a/disk-utils/addpart.c
+++ b/disk-utils/addpart.c
@@ -8,7 +8,7 @@
 #include "partx.h"
 #include "strutils.h"
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out, _(" %s <disk device> <partition number> <start> <length>\n"),
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index efaa0ea..a9150a5 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -178,7 +178,7 @@ static const struct bdc bdcms[] =
 	}
 };
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	size_t i;
 	fprintf(out, _("\nUsage:\n"
diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c
index e940e3b..4c9f6fa 100644
--- a/disk-utils/delpart.c
+++ b/disk-utils/delpart.c
@@ -8,7 +8,7 @@
 #include "partx.h"
 #include "strutils.h"
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out, _(" %s <disk device> <partition number>\n"),
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index b50ba30..fd497ee 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -90,7 +90,7 @@ static void verify_disk(char *name)
 		err(EXIT_FAILURE, "close");
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, _("Usage: %s [options] device\n"),
 		program_invocation_short_name);
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index caeb638..cfc970d 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -420,7 +420,7 @@ static void fs_interpret_type(struct libmnt_fs *fs)
 	}
 }
 
-static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
+static int parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
 			const char *filename, int line)
 {
 	warnx(_("%s: parse error at line %d -- ignore"), filename, line);
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index c0ed017..0b9751e 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -208,7 +208,7 @@ usage(void) {
 }
 
 static void die(const char *fmt, ...)
-    __attribute__ ((__format__(__printf__, 1, 2)));
+    __attribute__((__format__(__printf__, 1, 2)));
 
 static void
 die(const char *fmt, ...) {
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index dcdb098..66f0de7 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -67,7 +67,7 @@ struct bfsde {
 	char d_name[BFS_NAMELEN];
 };
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out,
 		_("Usage: %s [options] device [block-count]\n"),
@@ -86,7 +86,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-static void __attribute__ ((__noreturn__)) print_version(void)
+static void __attribute__((__noreturn__)) print_version(void)
 {
 	printf(UTIL_LINUX_VERSION);
 	exit(EXIT_SUCCESS);
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index cb34951..5e67504 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -33,7 +33,7 @@
 #define PROGNAME	"mkfs.%s"
 
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, _("Usage:\n"));
 	fprintf(out, _(" %s [options] [-t <type>] [fs-options] <device> [<size>]\n"),
@@ -55,7 +55,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-static void __attribute__ ((__noreturn__)) print_version(void)
+static void __attribute__((__noreturn__)) print_version(void)
 {
 	printf(UTIL_LINUX_VERSION);
 	exit(EXIT_SUCCESS);
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 9fdfc63..c0e86ba 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -573,7 +573,7 @@ static size_t do_check(char * buffer, int try, unsigned int current_block) {
 
 static unsigned int currently_testing = 0;
 
-static void alarm_intr(int alnum __attribute__ ((__unused__))) {
+static void alarm_intr(int alnum __attribute__((__unused__))) {
 	unsigned long zones = get_nzones();
 
 	if (currently_testing >= zones)
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index ae73f80..8cabeb9 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -274,7 +274,7 @@ It is roughly 2GB on i386, PPC, m68k, ARM, 1GB on sparc, 512MB on mips,
 #define MAX_BADPAGES	((pagesize-1024-128*sizeof(int)-10)/sizeof(int))
 #define MIN_GOODPAGES	10
 
-static void __attribute__ ((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
 	fprintf(out,
 		_("\nUsage:\n"
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index 2adbf00..ebdc9fe 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -43,7 +43,7 @@ void open_raw_ctl(void);
 static int query(int minor_raw, const char *raw_name, int quiet);
 static int bind(int minor_raw, int block_major, int block_minor);
 
-static void __attribute__ ((__noreturn__)) usage(int err)
+static void __attribute__((__noreturn__)) usage(int err)
 {
 	FILE *out = err == EXIT_SUCCESS ? stdout : stderr;
 
diff --git a/disk-utils/resizepart.c b/disk-utils/resizepart.c
index 765e3a4..1d3b984 100644
--- a/disk-utils/resizepart.c
+++ b/disk-utils/resizepart.c
@@ -13,7 +13,7 @@
 #include "strutils.h"
 #include "closestream.h"
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out, _(" %s <disk device> <partition number> <length>\n"),
diff --git a/fdisks/cfdisk.c b/fdisks/cfdisk.c
index 1a95c1e..cf9ab1e 100644
--- a/fdisks/cfdisk.c
+++ b/fdisks/cfdisk.c
@@ -2757,7 +2757,7 @@ copyright(void) {
 }
 
 
-static void __attribute__ ((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
     fputs(USAGE_HEADER, out);
     fprintf(out, _(" %s [options] <device>\n"), program_invocation_short_name);
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 7afd642..22774ca 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -45,7 +45,7 @@
 # include <linux/blkpg.h>
 #endif
 
-static void __attribute__ ((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
 	fputs(USAGE_HEADER, out);
 
diff --git a/fdisks/sfdisk.c b/fdisks/sfdisk.c
index 03f3e7f..7ffd28b 100644
--- a/fdisks/sfdisk.c
+++ b/fdisks/sfdisk.c
@@ -1585,26 +1585,26 @@ msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) {
 }
 
 static int
-osf_partition(char *dev __attribute__ ((__unused__)),
-	      int fd __attribute__ ((__unused__)),
-	      unsigned long start __attribute__ ((__unused__)),
-	      struct disk_desc *z __attribute__ ((__unused__))) {
+osf_partition(char *dev __attribute__((__unused__)),
+	      int fd __attribute__((__unused__)),
+	      unsigned long start __attribute__((__unused__)),
+	      struct disk_desc *z __attribute__((__unused__))) {
     return 0;
 }
 
 static int
-sun_partition(char *dev __attribute__ ((__unused__)),
-	      int fd __attribute__ ((__unused__)),
-	      unsigned long start __attribute__ ((__unused__)),
-	      struct disk_desc *z __attribute__ ((__unused__))) {
+sun_partition(char *dev __attribute__((__unused__)),
+	      int fd __attribute__((__unused__)),
+	      unsigned long start __attribute__((__unused__)),
+	      struct disk_desc *z __attribute__((__unused__))) {
     return 0;
 }
 
 static int
-amiga_partition(char *dev __attribute__ ((__unused__)),
-		int fd __attribute__ ((__unused__)),
-		unsigned long start __attribute__ ((__unused__)),
-		struct disk_desc *z __attribute__ ((__unused__))) {
+amiga_partition(char *dev __attribute__((__unused__)),
+		int fd __attribute__((__unused__)),
+		unsigned long start __attribute__((__unused__)),
+		struct disk_desc *z __attribute__((__unused__))) {
     return 0;
 }
 
diff --git a/include/path.h b/include/path.h
index 45da692..2338a07 100644
--- a/include/path.h
+++ b/include/path.h
@@ -5,28 +5,28 @@
 #include <stdint.h>
 
 extern char *path_strdup(const char *path, ...)
-			__attribute__ ((__format__ (__printf__, 1, 2)));
+			__attribute__((__format__(__printf__, 1, 2)));
 extern FILE *path_fopen(const char *mode, int exit_on_err, const char *path, ...)
-			__attribute__ ((__format__ (__printf__, 3, 4)));
+			__attribute__((__format__(__printf__, 3, 4)));
 extern void path_read_str(char *result, size_t len, const char *path, ...)
-			__attribute__ ((__format__ (__printf__, 3, 4)));
+			__attribute__((__format__(__printf__, 3, 4)));
 extern int path_write_str(const char *str, const char *path, ...)
-			 __attribute__ ((__format__ (__printf__, 2, 3)));
+			 __attribute__((__format__(__printf__, 2, 3)));
 extern int path_read_s32(const char *path, ...)
-			__attribute__ ((__format__ (__printf__, 1, 2)));
+			__attribute__((__format__(__printf__, 1, 2)));
 extern uint64_t path_read_u64(const char *path, ...)
-			__attribute__ ((__format__ (__printf__, 1, 2)));
+			__attribute__((__format__(__printf__, 1, 2)));
 
 extern int path_exist(const char *path, ...)
-		      __attribute__ ((__format__ (__printf__, 1, 2)));
+		      __attribute__((__format__(__printf__, 1, 2)));
 
 #ifdef HAVE_CPU_SET_T
 # include "cpuset.h"
 
 extern cpu_set_t *path_read_cpuset(int, const char *path, ...)
-			      __attribute__ ((__format__ (__printf__, 2, 3)));
+			      __attribute__((__format__(__printf__, 2, 3)));
 extern cpu_set_t *path_read_cpulist(int, const char *path, ...)
-			       __attribute__ ((__format__ (__printf__, 2, 3)));
+			       __attribute__((__format__(__printf__, 2, 3)));
 extern void path_set_prefix(const char *);
 #endif /* HAVE_CPU_SET_T */
 
diff --git a/include/xalloc.h b/include/xalloc.h
index 105d713..9eb578a 100644
--- a/include/xalloc.h
+++ b/include/xalloc.h
@@ -78,7 +78,7 @@ static inline char * __attribute__((warn_unused_result)) xstrndup(const char *st
 }
 
 
-static inline int __attribute__ ((__format__(printf, 2, 3)))
+static inline int __attribute__((__format__(printf, 2, 3)))
     xasprintf(char **strp, const char *fmt, ...)
 {
 	int ret;
diff --git a/lib/at.c b/lib/at.c
index f8bfe13..7b209db 100644
--- a/lib/at.c
+++ b/lib/at.c
@@ -15,7 +15,7 @@
 #include "c.h"
 
 #ifdef HAVE_FSTATAT
-int fstat_at(int dir, const char *dirname __attribute__ ((__unused__)),
+int fstat_at(int dir, const char *dirname __attribute__((__unused__)),
 	     const char *filename, struct stat *st, int nofollow)
 {
 	return fstatat(dir, filename, st,
@@ -42,7 +42,7 @@ int fstat_at(int dir, const char *dirname, const char *filename,
 #endif
 
 #ifdef HAVE_FSTATAT
-int open_at(int dir, const char *dirname __attribute__ ((__unused__)),
+int open_at(int dir, const char *dirname __attribute__((__unused__)),
 	    const char *filename, int flags)
 {
 	return openat(dir, filename, flags);
@@ -76,7 +76,7 @@ FILE *fopen_at(int dir, const char *dirname, const char *filename, int flags,
 }
 
 #ifdef HAVE_FSTATAT
-ssize_t readlink_at(int dir, const char *dirname __attribute__ ((__unused__)),
+ssize_t readlink_at(int dir, const char *dirname __attribute__((__unused__)),
 		    const char *pathname, char *buf, size_t bufsiz)
 {
 	return readlinkat(dir, pathname, buf, bufsiz);
diff --git a/lib/loopdev.c b/lib/loopdev.c
index 5153eaa..1491ad2 100644
--- a/lib/loopdev.c
+++ b/lib/loopdev.c
@@ -55,7 +55,7 @@
 				} \
 			} while(0)
 
-static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+static inline void __attribute__((__format__(__printf__, 1, 2)))
 loopdev_debug(const char *mesg, ...)
 {
 	va_list ap;
diff --git a/lib/pager.c b/lib/pager.c
index c6e74e8..286ec99 100644
--- a/lib/pager.c
+++ b/lib/pager.c
@@ -197,8 +197,8 @@ void setup_pager(void)
 
 #define MAX 255
 
-int main(int argc __attribute__ ((__unused__)),
-	 char *argv[] __attribute__ ((__unused__)))
+int main(int argc __attribute__((__unused__)),
+	 char *argv[] __attribute__((__unused__)))
 {
 	int i;
 
diff --git a/lib/randutils.c b/lib/randutils.c
index ed79aad..68bb0e1 100644
--- a/lib/randutils.c
+++ b/lib/randutils.c
@@ -109,8 +109,8 @@ void random_get_bytes(void *buf, size_t nbytes)
 }
 
 #ifdef TEST_PROGRAM
-int main(int argc __attribute__ ((__unused__)),
-         char *argv[] __attribute__ ((__unused__)))
+int main(int argc __attribute__((__unused__)),
+         char *argv[] __attribute__((__unused__)))
 {
 	unsigned int v, i;
 
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index 4a968d9..2048fbc 100644
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -346,7 +346,7 @@ extern void blkid_debug_dump_tag(blkid_tag tag);
 				} \
 			} while (0)
 
-static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+static inline void __attribute__((__format__(__printf__, 1, 2)))
 blkid_debug(const char *mesg, ...)
 {
 	va_list ap;
@@ -507,7 +507,7 @@ extern int blkid_probe_vsprintf_value(blkid_probe pr, const char *name,
 extern int blkid_probe_sprintf_value(blkid_probe pr, const char *name,
 				const char *fmt, ...)
 			__attribute__((nonnull))
-			__attribute__ ((__format__ (__printf__, 3, 4)));
+			__attribute__((__format__(__printf__, 3, 4)));
 
 extern int blkid_probe_set_magic(blkid_probe pr, blkid_loff_t offset,
 				size_t len, unsigned char *magic)
diff --git a/libblkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c
index 434be34..a4c07bf 100644
--- a/libblkid/src/superblocks/btrfs.c
+++ b/libblkid/src/superblocks/btrfs.c
@@ -55,9 +55,9 @@ struct btrfs_super_block {
 		uint8_t bandwidth;
 		uint8_t uuid[16];
 		uint8_t fsid[16];
-	} __attribute__ ((__packed__)) dev_item;
+	} __attribute__((__packed__)) dev_item;
 	uint8_t label[256];
-} __attribute__ ((__packed__));
+} __attribute__((__packed__));
 
 static int probe_btrfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
diff --git a/libblkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
index d767cb4..35f64e0 100644
--- a/libblkid/src/superblocks/ntfs.c
+++ b/libblkid/src/superblocks/ntfs.c
@@ -26,7 +26,7 @@ struct ntfs_bios_parameters {
 	uint16_t	heads;			/* irrelevant */
 	uint32_t	hidden_sectors;		/* zero */
 	uint32_t	large_sectors;		/* zero */
-} __attribute__ ((__packed__));
+} __attribute__((__packed__));
 
 struct ntfs_super_block {
 	uint8_t		jump[3];
diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 2cae66a..2044a3c 100644
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -79,14 +79,14 @@ extern const struct blkid_idinfo bcache_idinfo;
  */
 extern int blkid_probe_set_version(blkid_probe pr, const char *version);
 extern int blkid_probe_sprintf_version(blkid_probe pr, const char *fmt, ...)
-		__attribute__ ((__format__ (__printf__, 2, 3)));
+		__attribute__((__format__(__printf__, 2, 3)));
 
 extern int blkid_probe_set_label(blkid_probe pr, unsigned char *label, size_t len);
 extern int blkid_probe_set_utf8label(blkid_probe pr, unsigned char *label,
                 size_t len, int enc);
 extern int blkid_probe_sprintf_uuid(blkid_probe pr, unsigned char *uuid,
                 size_t len, const char *fmt, ...)
-		__attribute__ ((__format__ (__printf__, 4, 5)));
+		__attribute__((__format__(__printf__, 4, 5)));
 extern int blkid_probe_strncpy_uuid(blkid_probe pr, unsigned char *str, size_t len);
 
 extern int blkid_probe_set_uuid(blkid_probe pr, unsigned char *uuid);
diff --git a/libblkid/src/superblocks/vmfs.c b/libblkid/src/superblocks/vmfs.c
index ead09a8..e1fb1aa 100644
--- a/libblkid/src/superblocks/vmfs.c
+++ b/libblkid/src/superblocks/vmfs.c
@@ -13,14 +13,14 @@ struct vmfs_fs_info {
 	uint8_t uuid[16];
 	uint32_t mode;
 	char label[128];
-} __attribute__ ((__packed__));
+} __attribute__((__packed__));
 
 struct vmfs_volume_info {
 	uint32_t magic;
 	uint32_t ver;
 	uint8_t irrelevant[122];
 	uint8_t uuid[16];
-} __attribute__ ((__packed__));
+} __attribute__((__packed__));
 
 static int probe_vmfs_fs(blkid_probe pr, const struct blkid_idmag *mag)
 {
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 6af061b..24d6a31 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1239,7 +1239,7 @@ static int dos_verify_disklabel(struct fdisk_context *cxt)
  */
 static int dos_add_partition(
 			struct fdisk_context *cxt,
-			size_t partnum __attribute__ ((__unused__)),
+			size_t partnum __attribute__((__unused__)),
 			struct fdisk_parttype *t)
 {
 	size_t i, free_primary = 0;
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
index feaab3d..d6621a0 100644
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -71,7 +71,7 @@
 					fflush(stderr);			\
 			} while(0)
 
-static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+static inline void __attribute__((__format__(__printf__, 1, 2)))
 dbgprint(const char *mesg, ...)
 {
 	va_list ap;
diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
index f653b48..ee9f743 100644
--- a/libfdisk/src/libfdisk.h
+++ b/libfdisk/src/libfdisk.h
@@ -264,16 +264,16 @@ extern uint64_t fdisk_ask_yesno_get_result(struct fdisk_ask *ask);
 extern int fdisk_ask_yesno_set_result(struct fdisk_ask *ask, uint64_t result);
 
 extern int fdisk_info(struct fdisk_context *cxt, const char *fmt, ...)
-			__attribute__ ((__format__ (__printf__, 2, 3)));
+			__attribute__((__format__(__printf__, 2, 3)));
 extern int fdisk_colon(struct fdisk_context *cxt, const char *fmt, ...)
-			__attribute__ ((__format__ (__printf__, 2, 3)));
+			__attribute__((__format__(__printf__, 2, 3)));
 extern int fdisk_sinfo(struct fdisk_context *cxt, unsigned int flags, const char *fmt, ...)
-			__attribute__ ((__format__ (__printf__, 3, 4)));
+			__attribute__((__format__(__printf__, 3, 4)));
 
 extern int fdisk_warnx(struct fdisk_context *cxt, const char *fmt, ...)
-			__attribute__ ((__format__ (__printf__, 2, 3)));
+			__attribute__((__format__(__printf__, 2, 3)));
 extern int fdisk_warn(struct fdisk_context *cxt, const char *fmt, ...)
-			__attribute__ ((__format__ (__printf__, 2, 3)));
+			__attribute__((__format__(__printf__, 2, 3)));
 
 extern int fdisk_ask_print_get_errno(struct fdisk_ask *ask);
 extern int fdisk_ask_print_set_errno(struct fdisk_ask *ask, int errnum);
diff --git a/libmount/python/pylibmount.h b/libmount/python/pylibmount.h
index 1a08796..2d86c04 100644
--- a/libmount/python/pylibmount.h
+++ b/libmount/python/pylibmount.h
@@ -26,7 +26,7 @@
 
 extern int pylibmount_debug_mask;
 
-static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+static inline void __attribute__((__format__(__printf__, 1, 2)))
 pymnt_debug(const char *mesg, ...)
 {
 	va_list ap;
@@ -36,7 +36,7 @@ pymnt_debug(const char *mesg, ...)
 	fputc('\n', stderr);
 }
 
-static inline void __attribute__ ((__format__ (__printf__, 2, 3)))
+static inline void __attribute__((__format__(__printf__, 2, 3)))
 pymnt_debug_h(void *handler, const char *mesg, ...)
 {
 	va_list ap;
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index a580ae4..f01d140 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -84,7 +84,7 @@
 
 extern int libmount_debug_mask;
 
-static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+static inline void __attribute__((__format__(__printf__, 1, 2)))
 mnt_debug(const char *mesg, ...)
 {
 	va_list ap;
@@ -94,7 +94,7 @@ mnt_debug(const char *mesg, ...)
 	fputc('\n', stderr);
 }
 
-static inline void __attribute__ ((__format__ (__printf__, 2, 3)))
+static inline void __attribute__((__format__(__printf__, 2, 3)))
 mnt_debug_h(void *handler, const char *mesg, ...)
 {
 	va_list ap;
diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
index 2cd5568..a0f92bb 100644
--- a/libmount/src/optstr.c
+++ b/libmount/src/optstr.c
@@ -865,10 +865,10 @@ err:
  * Returns: 0 on success, a negative number in case of error.
  */
 #ifndef HAVE_LIBSELINUX
-int mnt_optstr_fix_secontext(char **optstr __attribute__ ((__unused__)),
-			     char *value   __attribute__ ((__unused__)),
-			     size_t valsz  __attribute__ ((__unused__)),
-			     char **next   __attribute__ ((__unused__)))
+int mnt_optstr_fix_secontext(char **optstr __attribute__((__unused__)),
+			     char *value   __attribute__((__unused__)),
+			     size_t valsz  __attribute__((__unused__)),
+			     char **next   __attribute__((__unused__)))
 {
 	return 0;
 }
diff --git a/login-utils/login.c b/login-utils/login.c
index 89df489..bf9308d 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -157,8 +157,8 @@ static int is_consoletty(int fd)
  * What I did was add a second timeout while trying to write the message, so
  * the process just exits if the second timeout expires.
  */
-static void __attribute__ ((__noreturn__))
-timedout2(int sig __attribute__ ((__unused__)))
+static void __attribute__((__noreturn__))
+timedout2(int sig __attribute__((__unused__)))
 {
 	struct termios ti;
 
@@ -169,7 +169,7 @@ timedout2(int sig __attribute__ ((__unused__)))
 	exit(EXIT_SUCCESS);	/* %% */
 }
 
-static void timedout(int sig __attribute__ ((__unused__)))
+static void timedout(int sig __attribute__((__unused__)))
 {
 	signal(SIGALRM, timedout2);
 	alarm(10);
@@ -202,7 +202,7 @@ static void sig_handler(int signal)
  * Let us delay all exit() calls when the user is not authenticated
  * or the session not fully initialized (loginpam_session()).
  */
-static void __attribute__ ((__noreturn__)) sleepexit(int eval)
+static void __attribute__((__noreturn__)) sleepexit(int eval)
 {
 	sleep((unsigned int)getlogindefs_num("FAIL_DELAY", LOGIN_EXIT_TIMEOUT));
 	exit(eval);
diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index 55dad1b..fe3e5a1 100644
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -112,7 +112,7 @@ static int allow_setgid(struct passwd *pe, struct group *ge)
 	return FALSE;
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
 	fprintf(out, _(" %s <group>\n"), program_invocation_short_name);
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index 2766a60..88f9108 100644
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -94,7 +94,7 @@ extern char **environ;
 #endif
 
 static void run_shell (char const *, char const *, char **, size_t)
-     __attribute__ ((__noreturn__));
+     __attribute__((__noreturn__));
 
 /* If true, pass the `-f' option to the subshell.  */
 static bool fast_startup;
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index 6ceea6b..e71d1fa 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -73,7 +73,7 @@ static int consoles_debug;
 			} \
 		} while (0)
 
-static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
+static inline void __attribute__((__format__(__printf__, 1, 2)))
 dbgprint(const char *mesg, ...)
 {
 	va_list ap;
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 747694d..9f2e0b5 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -913,7 +913,7 @@ static void center(const char *str, size_t len, int separate)
 	}
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out, _(" %s [options] [[[day] month] year]\n"), program_invocation_short_name);
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index dc1cbb7..ed3ab9a 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -159,7 +159,7 @@ static struct libmnt_cache *cache;
 struct udev *udev;
 #endif
 
-static int match_func(struct libmnt_fs *fs, void *data __attribute__ ((__unused__)));
+static int match_func(struct libmnt_fs *fs, void *data __attribute__((__unused__)));
 
 
 static int get_column_id(int num)
@@ -751,7 +751,7 @@ leave:
 }
 
 /* error callback */
-static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
+static int parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
 			const char *filename, int line)
 {
 	warnx(_("%s: parse error at line %d"), filename, line);
@@ -840,7 +840,7 @@ static int tab_is_tree(struct libmnt_table *tb)
 
 /* filter function for libmount (mnt_table_find_next_fs()) */
 static int match_func(struct libmnt_fs *fs,
-		      void *data __attribute__ ((__unused__)))
+		      void *data __attribute__((__unused__)))
 {
 	int rc = flags & FL_INVERT ? 1 : 0;
 	const char *m;
diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 7630173..afb16ac 100644
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -212,7 +212,7 @@ static int generate_output(char *argv[], int argc, const char *optstr,
  * Report an error when parsing getopt's own arguments. If message is NULL,
  * we already sent a message, we just exit with a helpful hint.
  */
-static void __attribute__ ((__noreturn__)) parse_error(const char *message)
+static void __attribute__((__noreturn__)) parse_error(const char *message)
 {
 	if (message)
 		warnx("%s", message);
@@ -309,7 +309,7 @@ static void set_shell(const char *new_shell)
 			    ("unknown shell after -s or --shell argument"));
 }
 
-static void __attribute__ ((__noreturn__)) print_help(void)
+static void __attribute__((__noreturn__)) print_help(void)
 {
 	fputs(_("\nUsage:\n"), stderr);
 
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index c07bfac..2f3bef1 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -272,7 +272,7 @@ static void mysyslog(int fd, int logflags, int pri, char *tag, char *msg)
        }
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out, _(" %s [options] [<message>]\n"), program_invocation_short_name);
diff --git a/misc-utils/look.c b/misc-utils/look.c
index 502168b..205aa0e 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -78,7 +78,7 @@ static int compare (char *, char *);
 static char *linear_search (char *, char *);
 static int look (char *, char *);
 static void print_from (char *, char *);
-static void __attribute__ ((__noreturn__)) usage(FILE * out);
+static void __attribute__((__noreturn__)) usage(FILE * out);
 
 int
 main(int argc, char *argv[])
@@ -361,7 +361,7 @@ compare(char *s2, char *s2end) {
 	return ((i > 0) ? LESS : (i < 0) ? GREATER : EQUAL);
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(_("\nUsage:\n"), out),
 	fprintf(out,
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index ab85bf7..e9c2c99 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -489,7 +489,7 @@ done:
 }
 
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	size_t i;
 
diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index 3761c4b..d7af3c2 100644
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -63,7 +63,7 @@ static off_t hash_file(struct MD5Context *ctx, int fd)
 	return count;
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(_("\nUsage:\n"), out);
 	fprintf(out,
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index 9db85fb..0daeb13 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -95,7 +95,7 @@ static int do_rename(char *from, char *to, char *s, int verbose, int symtarget)
 	return 1;
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out,
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index dd39963..b9c9129 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -65,7 +65,7 @@ struct uuidd_cxt_t {
 			no_sock: 1;
 };
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(_("\nUsage:\n"), out);
 	fprintf(out,
@@ -470,7 +470,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 	}
 }
 
-static void __attribute__ ((__noreturn__)) unexpected_size(int size)
+static void __attribute__((__noreturn__)) unexpected_size(int size)
 {
 	errx(EXIT_FAILURE, _("Unexpected reply length from server %d"), size);
 }
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 450e26a..509fa3c 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -29,7 +29,7 @@ extern int optind;
 #define DO_TYPE_TIME	1
 #define DO_TYPE_RANDOM	2
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(_("\nUsage:\n"), out);
 	fprintf(out,
diff --git a/schedutils/ionice.c b/schedutils/ionice.c
index a3edf55..ef42508 100644
--- a/schedutils/ionice.c
+++ b/schedutils/ionice.c
@@ -98,7 +98,7 @@ static void ioprio_setid(int which, int ioclass, int data, int who)
 		err(EXIT_FAILURE, _("ioprio_set failed"));
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out,
 	       _("\n"
diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index 074f247..5acf3f1 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -15,7 +15,7 @@
 #include "c.h"
 #include "closestream.h"
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
 	fprintf(out, _(" %s <hard|soft>\n"), program_invocation_short_name);
diff --git a/sys-utils/cytune.c b/sys-utils/cytune.c
index 8a42f96..c5f3ea9 100644
--- a/sys-utils/cytune.c
+++ b/sys-utils/cytune.c
@@ -86,7 +86,7 @@ static char ***global_argv;
 
 #define mvtime(tvpto, tvpfrom)  (((tvpto)->tv_sec = (tvpfrom)->tv_sec),(tvpto)->tv_usec = (tvpfrom)->tv_usec)
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
 	fprintf(out, _(" %s [options] <tty> [...]\n"), program_invocation_short_name);
diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index 03744c7..2f1c5a6 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -134,7 +134,7 @@ static inline void info(const char *fmt, ...)
 	va_end(va);
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 
diff --git a/sys-utils/hwclock-cmos.c b/sys-utils/hwclock-cmos.c
index 7ffbf95..da46c17 100644
--- a/sys-utils/hwclock-cmos.c
+++ b/sys-utils/hwclock-cmos.c
@@ -66,12 +66,12 @@
  * not export that header.
  */
 #undef __i386__
-void outb(int a __attribute__ ((__unused__)),
-	  int b __attribute__ ((__unused__)))
+void outb(int a __attribute__((__unused__)),
+	  int b __attribute__((__unused__)))
 {
 }
 
-int inb(int c __attribute__ ((__unused__)))
+int inb(int c __attribute__((__unused__)))
 {
 	return 0;
 }
@@ -82,12 +82,12 @@ int inb(int c __attribute__ ((__unused__)))
 extern unsigned int inb(unsigned long port);
 extern void outb(unsigned char b, unsigned long port);
 #else
-static void outb(int a __attribute__ ((__unused__)),
-	  int b __attribute__ ((__unused__)))
+static void outb(int a __attribute__((__unused__)),
+	  int b __attribute__((__unused__)))
 {
 }
 
-static int inb(int c __attribute__ ((__unused__)))
+static int inb(int c __attribute__((__unused__)))
 {
 	return 0;
 }
@@ -300,7 +300,7 @@ atomic(const char *name, unsigned long (*op) (unsigned long), unsigned long arg)
  * TODO: optimize the access to CMOS by mlockall(MCL_CURRENT) and SCHED_FIFO
  */
 static unsigned long
-atomic(const char *name __attribute__ ((__unused__)),
+atomic(const char *name __attribute__((__unused__)),
        unsigned long (*op) (unsigned long),
        unsigned long arg)
 {
@@ -610,14 +610,14 @@ static int i386_iopl(const int level)
 	return iopl(level);
 }
 # else
-static int i386_iopl(const int level __attribute__ ((__unused__)))
+static int i386_iopl(const int level __attribute__((__unused__)))
 {
 	extern int ioperm(unsigned long from, unsigned long num, int turn_on);
 	return ioperm(clock_ctl_addr, 2, 1);
 }
 # endif
 #else
-static int i386_iopl(const int level __attribute__ ((__unused__)))
+static int i386_iopl(const int level __attribute__((__unused__)))
 {
 	return -2;
 }
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 395b5c3..ae786a6 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1412,10 +1412,10 @@ manipulate_clock(const bool show, const bool adjust, const bool noadjfile,
  */
 # ifndef __alpha__
 static void
-manipulate_epoch(const bool getepoch __attribute__ ((__unused__)),
-		 const bool setepoch __attribute__ ((__unused__)),
-		 const unsigned long epoch_opt __attribute__ ((__unused__)),
-		 const bool testing __attribute__ ((__unused__)))
+manipulate_epoch(const bool getepoch __attribute__((__unused__)),
+		 const bool setepoch __attribute__((__unused__)),
+		 const unsigned long epoch_opt __attribute__((__unused__)),
+		 const bool testing __attribute__((__unused__)))
 {
 	warnx(_("The kernel keeps an epoch value for the Hardware Clock "
 		"only on an Alpha machine.\nThis copy of hwclock was built for "
diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c
index 3ff021e..1932f4a 100644
--- a/sys-utils/ipcmk.c
+++ b/sys-utils/ipcmk.c
@@ -60,7 +60,7 @@ static int create_sem(int nsems, int permission)
 	return semget(key, nsems, permission | IPC_CREAT);
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
 	fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index 46c2997..a386b4c 100644
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -44,7 +44,7 @@ typedef enum type_id {
 static int verbose = 0;
 
 /* print the new usage */
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
 	fprintf(out, " %s [options]\n", program_invocation_short_name);
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 16e5206..26a83d6 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -47,7 +47,7 @@ static void print_msg (int id, int unit);
 /* we read time as int64_t from /proc, so cast... */
 #define xctime(_x)	ctime((time_t *) (_x))
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
 	fprintf(out, " %s [resource ...] [output-format]\n", program_invocation_short_name);
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 5c460fe..d10b2cc 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -151,7 +151,7 @@ static int parse_iflag(char *str, int *set_iflag, int *clr_iflag)
 }
 
 
-static void __attribute__ ((__noreturn__)) usage(int exitcode)
+static void __attribute__((__noreturn__)) usage(int exitcode)
 {
 	FILE *out = exitcode == EXIT_SUCCESS ? stdout : stderr;
 
diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c
index 31ceabb..90b62d9 100644
--- a/sys-utils/pivot_root.c
+++ b/sys-utils/pivot_root.c
@@ -27,7 +27,7 @@
 
 #define pivot_root(new_root,put_old) syscall(SYS_pivot_root,new_root,put_old)
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, USAGE_HEADER);
 	fprintf(out, _(" %s [options] new_root put_old\n"),
diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index 5bb99d1..cb5cb7d 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -144,7 +144,7 @@ static int prlimit(pid_t p, int resource,
 }
 #endif
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	size_t i;
 
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index 79de7c2..c673d34 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -97,7 +97,7 @@ static char *boot_uname_r_str(void)
 	return s;
 }
 
-static void __attribute__ ((__noreturn__))
+static void __attribute__((__noreturn__))
     usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index 782de82..dbcaf6f 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -25,7 +25,7 @@
 #include "nls.h"
 #include "closestream.h"
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out, _(
diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index 182ce95..ce1aa66 100644
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -61,7 +61,7 @@ static int swapoff_by_uuid(const char *uuid, int quiet)
 	return special ? do_swapoff(special, quiet, CANONIC) : cannot_find(uuid);
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 1691df6..0253bfd 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -675,7 +675,7 @@ static int swapon_all(void)
 	return status;
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	size_t i;
 	fputs(USAGE_HEADER, out);
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 7c0579c..7e6b3ce 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -1807,7 +1807,7 @@ static speed_t bcode(char *s)
 	return 0;
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
 	fputs(USAGE_HEADER, out);
 	fprintf(out, _(" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
diff --git a/term-utils/mesg.c b/term-utils/mesg.c
index 12e4e0e..7b21378 100644
--- a/term-utils/mesg.c
+++ b/term-utils/mesg.c
@@ -66,7 +66,7 @@
 #define IS_NOT_ALLOWED    1  /* Receiving messages is not allowed.  */
 #define MESG_EXIT_FAILURE 2  /* An error occurred.  */
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(USAGE_HEADER, out);
 	/* TRANSLATORS: this program uses for y and n rpmatch(3),
diff --git a/term-utils/script.c b/term-utils/script.c
index 456958b..a02d787 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -368,7 +368,7 @@ doinput(void) {
 }
 
 void
-finish(int dummy __attribute__ ((__unused__))) {
+finish(int dummy __attribute__((__unused__))) {
 	int status;
 	pid_t pid;
 	int errsv = errno;
@@ -383,7 +383,7 @@ finish(int dummy __attribute__ ((__unused__))) {
 }
 
 void
-resize(int dummy __attribute__ ((__unused__))) {
+resize(int dummy __attribute__((__unused__))) {
 	resized = 1;
 }
 
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index f179ea8..7f7fded 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -236,7 +236,7 @@ parse_term(int argc, char **argv, int *option, char **ttyname, int *bad_arg) {
 }
 
 static void
-parse_none(int argc, char **argv __attribute__ ((__unused__)), int *option, int *bad_arg) {
+parse_none(int argc, char **argv __attribute__((__unused__)), int *option, int *bad_arg) {
 	/* argc: Number of arguments for this option. */
 	/* argv: Arguments for this option. */
 	/* option: Term flag to set. */
@@ -667,7 +667,7 @@ show_tabs(void) {
 	}
 }
 
-static void __attribute__ ((__noreturn__))
+static void __attribute__((__noreturn__))
 usage(FILE *out) {
 /* Print error message about arguments, and the command's syntax. */
 
diff --git a/term-utils/write.c b/term-utils/write.c
index f5ca341..d90edaa 100644
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -65,17 +65,17 @@
 #include "nls.h"
 #include "xalloc.h"
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out);
+static void __attribute__((__noreturn__)) usage(FILE * out);
 void search_utmp(char *, char *, char *, uid_t);
 void do_write(char *, char *, uid_t);
 void wr_fputs(char *);
-static void __attribute__ ((__noreturn__)) done(int);
+static void __attribute__((__noreturn__)) done(int);
 int term_chk(char *, int *, time_t *, int);
 int utmp_chk(char *, char *);
 
 static gid_t root_access;
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fputs(_("\nUsage:\n"), out);
 	fprintf(out,
@@ -358,8 +358,8 @@ void do_write(char *tty, char *mytty, uid_t myuid)
 /*
  * done - cleanup and exit
  */
-static void __attribute__ ((__noreturn__))
-    done(int dummy __attribute__ ((__unused__)))
+static void __attribute__((__noreturn__))
+    done(int dummy __attribute__((__unused__)))
 {
 	printf("EOF\r\n");
 	_exit(EXIT_SUCCESS);
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index 6c7f636..7b24193 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -52,7 +52,7 @@
 int plus(wchar_t c, wchar_t d);
 void move(int l, int m);
 void pflush(int ol);
-static void __attribute__ ((__noreturn__)) usage(FILE * out);
+static void __attribute__((__noreturn__)) usage(FILE * out);
 
 /*
  * colcrt - replaces col for crts with new nroff esp. when using tbl.
@@ -309,7 +309,7 @@ void move(int l, int m)
 	}
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out,
 		_("\nUsage:\n"
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index 454085e..ecf3b42 100644
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -54,7 +54,7 @@ COLRM removes unwanted columns from a file
 	Jeff Schriebman  UC Berkeley 11-74
 */
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, _("\nUsage:\n"
 		       " %s [startcol [endcol]]\n"),
diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c
index 22e397c..c40daec 100644
--- a/text-utils/hexdump-parse.c
+++ b/text-utils/hexdump-parse.c
@@ -50,22 +50,22 @@
 static void escape(char *p1);
 static struct list_head *color_fmt(char *cfmt, int bcnt);
 
-static void __attribute__ ((__noreturn__)) badcnt(const char *s)
+static void __attribute__((__noreturn__)) badcnt(const char *s)
 {
         errx(EXIT_FAILURE, _("bad byte count for conversion character %s"), s);
 }
 
-static void __attribute__ ((__noreturn__)) badsfmt(void)
+static void __attribute__((__noreturn__)) badsfmt(void)
 {
         errx(EXIT_FAILURE, _("%%s requires a precision or a byte count"));
 }
 
-static void __attribute__ ((__noreturn__)) badfmt(const char *fmt)
+static void __attribute__((__noreturn__)) badfmt(const char *fmt)
 {
         errx(EXIT_FAILURE, _("bad format {%s}"), fmt);
 }
 
-static void __attribute__ ((__noreturn__)) badconv(const char *ch)
+static void __attribute__((__noreturn__)) badconv(const char *ch)
 {
         errx(EXIT_FAILURE, _("bad conversion character %%%s"), ch);
 }
diff --git a/text-utils/rev.c b/text-utils/rev.c
index f1341cb..3b1a3e7 100644
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -66,13 +66,13 @@
 
 wchar_t *buf;
 
-static void sig_handler(int signo __attribute__ ((__unused__)))
+static void sig_handler(int signo __attribute__((__unused__)))
 {
 	free(buf);
 	_exit(EXIT_SUCCESS);
 }
 
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(FILE * out)
 {
 	fprintf(out, _("Usage: %s [options] [file ...]\n"),
 		program_invocation_short_name);
diff --git a/text-utils/tailf.c b/text-utils/tailf.c
index d2366a6..ec8e9b0 100644
--- a/text-utils/tailf.c
+++ b/text-utils/tailf.c
@@ -191,7 +191,7 @@ watch_file_inotify(const char *filename, off_t *size)
 
 #endif /* HAVE_INOTIFY_INIT */
 
-static void __attribute__ ((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
 	fprintf(out,
 		_("\nUsage:\n"
diff --git a/text-utils/ul.c b/text-utils/ul.c
index b3b3dc3..393a169 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -657,7 +657,7 @@ static void needcol(int acol) {
 	}
 }
 
-static void sig_handler(int signo __attribute__ ((__unused__)))
+static void sig_handler(int signo __attribute__((__unused__)))
 {
 	_exit(EXIT_SUCCESS);
 }
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/5] mkswap: remove unnecessary usage output
  2014-03-08 17:01 [PATCH 1/5] mkswap: remove unnecessary usage output Sami Kerola
                   ` (3 preceding siblings ...)
  2014-03-08 17:01 ` [PATCH 5/5] build-sys: unify function and variable attribute spacing Sami Kerola
@ 2014-03-12 11:07 ` Karel Zak
  2014-03-12 11:10   ` Karel Zak
  4 siblings, 1 reply; 8+ messages in thread
From: Karel Zak @ 2014-03-12 11:07 UTC (permalink / raw)
  To: Sami Kerola; +Cc: util-linux

On Sat, Mar 08, 2014 at 11:01:53AM -0600, Sami Kerola wrote:
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>

 All 5 patches applied. Thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/5] mkswap: remove unnecessary usage output
  2014-03-12 11:07 ` [PATCH 1/5] mkswap: remove unnecessary usage output Karel Zak
@ 2014-03-12 11:10   ` Karel Zak
  2014-03-13 16:38     ` Sami Kerola
  0 siblings, 1 reply; 8+ messages in thread
From: Karel Zak @ 2014-03-12 11:10 UTC (permalink / raw)
  To: Sami Kerola; +Cc: util-linux

On Wed, Mar 12, 2014 at 12:07:51PM +0100, Karel Zak wrote:
> On Sat, Mar 08, 2014 at 11:01:53AM -0600, Sami Kerola wrote:
> > Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> 
>  All 5 patches applied. Thanks.

 oh.. 4 patches, not sure why it's prefixed by n/5 when there is 4
 patches only :-)

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/5] mkswap: remove unnecessary usage output
  2014-03-12 11:10   ` Karel Zak
@ 2014-03-13 16:38     ` Sami Kerola
  0 siblings, 0 replies; 8+ messages in thread
From: Sami Kerola @ 2014-03-13 16:38 UTC (permalink / raw)
  To: Karel Zak; +Cc: util-linux

On 12 March 2014 11:10, Karel Zak <kzak@redhat.com> wrote:
> On Wed, Mar 12, 2014 at 12:07:51PM +0100, Karel Zak wrote:
>> On Sat, Mar 08, 2014 at 11:01:53AM -0600, Sami Kerola wrote:
>> > Signed-off-by: Sami Kerola <kerolasa@iki.fi>
>>
>>  All 5 patches applied. Thanks.
>
>  oh.. 4 patches, not sure why it's prefixed by n/5 when there is 4
>  patches only :-)

Extra patch in branch must had been something that was not ready to be
submitted and I deleted it before sending. That's is also know as git
user error, sorry & thanks for reviews and merges.

-- 
Sami Kerola
http://www.iki.fi/kerolasa/

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-03-13 16:38 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-08 17:01 [PATCH 1/5] mkswap: remove unnecessary usage output Sami Kerola
2014-03-08 17:01 ` [PATCH 2/5] tests: check swaplabel, and perform more swapon boundary tests Sami Kerola
2014-03-08 17:01 ` [PATCH 3/5] build-sys: sort gitignore files Sami Kerola
2014-03-08 17:01 ` [PATCH 4/5] docs: add a new command boilerplate code Sami Kerola
2014-03-08 17:01 ` [PATCH 5/5] build-sys: unify function and variable attribute spacing Sami Kerola
2014-03-12 11:07 ` [PATCH 1/5] mkswap: remove unnecessary usage output Karel Zak
2014-03-12 11:10   ` Karel Zak
2014-03-13 16:38     ` Sami Kerola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox