isosize: fix coding style

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

1 files changed, 83 insertions, 84 deletions

diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index 17c924f7b..7bfa81d4a 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -31,120 +31,120 @@
 
 #define ISODCL(from, to) (to - from + 1)
 
-static int
-isonum_721 (unsigned char * p) {
-        return ((p[0] & 0xff)
-                | ((p[1] & 0xff) << 8));
+static int isonum_721(unsigned char *p)
+{
+	return ((p[0] & 0xff)
+		| ((p[1] & 0xff) << 8));
 }
 
-static int
-isonum_722 (unsigned char * p) {
-        return ((p[1] & 0xff)
-                | ((p[0] & 0xff) << 8));
+static int isonum_722(unsigned char *p)
+{
+	return ((p[1] & 0xff)
+		| ((p[0] & 0xff) << 8));
 }
 
-static int
-isonum_723 (unsigned char * p, int xflag) {
-        int le = isonum_721 (p);
-        int be = isonum_722 (p+2);
-        if (xflag && le != be)
+static int isonum_723(unsigned char *p, int xflag)
+{
+	int le = isonum_721(p);
+	int be = isonum_722(p + 2);
+	if (xflag && le != be)
 		/* translation is useless */
-                fprintf(stderr, "723error: le=%d be=%d\n", le, be);
-        return (le);
+		warnx("723error: le=%d be=%d", le, be);
+	return (le);
 }
 
-static int
-isonum_731 (unsigned char * p) {
-    return ((p[0] & 0xff)
-            | ((p[1] & 0xff) << 8)
-            | ((p[2] & 0xff) << 16)
-            | ((p[3] & 0xff) << 24));
+static int isonum_731(unsigned char *p)
+{
+	return ((p[0] & 0xff)
+		| ((p[1] & 0xff) << 8)
+		| ((p[2] & 0xff) << 16)
+		| ((p[3] & 0xff) << 24));
 }
 
-static int
-isonum_732 (unsigned char * p) {
-    return ((p[3] & 0xff)
-            | ((p[2] & 0xff) << 8)
-            | ((p[1] & 0xff) << 16)
-            | ((p[0] & 0xff) << 24));
+static int isonum_732(unsigned char *p)
+{
+	return ((p[3] & 0xff)
+		| ((p[2] & 0xff) << 8)
+		| ((p[1] & 0xff) << 16)
+		| ((p[0] & 0xff) << 24));
 }
 
-
-static int
-isonum_733 (unsigned char * p, int xflag) {
-    int le = isonum_731 (p);
-    int be = isonum_732 (p+4);
-    if (xflag && le != be)
-	    /* translation is useless */
-            fprintf(stderr, "733error: le=%d be=%d\n", le, be);
-    return (le);
+static int isonum_733(unsigned char *p, int xflag)
+{
+	int le = isonum_731(p);
+	int be = isonum_732(p + 4);
+	if (xflag && le != be)
+		/* translation is useless */
+		warn("733error: le=%d be=%d", le, be);
+	return (le);
 }
 
-struct iso_primary_descriptor {
-    unsigned char type                      [ISODCL (  1,   1)]; /* 711 */
-    unsigned char id                        [ISODCL (  2,   6)];
-    unsigned char version                   [ISODCL (  7,   7)]; /* 711 */
-    unsigned char unused1                   [ISODCL (  8,   8)];
-    unsigned char system_id                 [ISODCL (  9,  40)]; /* auchars */
-    unsigned char volume_id                 [ISODCL ( 41,  72)]; /* duchars */
-    unsigned char unused2                   [ISODCL ( 73,  80)];
-    unsigned char volume_space_size         [ISODCL ( 81,  88)]; /* 733 */
-    unsigned char unused3                   [ISODCL ( 89, 120)];
-    unsigned char volume_set_size           [ISODCL (121, 124)]; /* 723 */
-    unsigned char volume_sequence_number    [ISODCL (125, 128)]; /* 723 */
-    unsigned char logical_block_size        [ISODCL (129, 132)]; /* 723 */
-    unsigned char path_table_size           [ISODCL (133, 140)]; /* 733 */
-    unsigned char type_l_path_table         [ISODCL (141, 144)]; /* 731 */
-    unsigned char opt_type_l_path_table     [ISODCL (145, 148)]; /* 731 */
-    unsigned char type_m_path_table         [ISODCL (149, 152)]; /* 732 */
-    unsigned char opt_type_m_path_table     [ISODCL (153, 156)]; /* 732 */
-    unsigned char root_directory_record     [ISODCL (157, 190)]; /* 9.1 */
-    unsigned char volume_set_id             [ISODCL (191, 318)]; /* duchars */
-    unsigned char publisher_id              [ISODCL (319, 446)]; /* achars */
-    unsigned char preparer_id               [ISODCL (447, 574)]; /* achars */
-    unsigned char application_id            [ISODCL (575, 702)]; /* achars */
-    unsigned char copyright_file_id         [ISODCL (703, 739)]; /* 7.5 dchars */
-    unsigned char abstract_file_id          [ISODCL (740, 776)]; /* 7.5 dchars */
-    unsigned char bibliographic_file_id     [ISODCL (777, 813)]; /* 7.5 dchars */
-    unsigned char creation_date             [ISODCL (814, 830)]; /* 8.4.26.1 */
-    unsigned char modification_date         [ISODCL (831, 847)]; /* 8.4.26.1 */
-    unsigned char expiration_date           [ISODCL (848, 864)]; /* 8.4.26.1 */
-    unsigned char effective_date            [ISODCL (865, 881)]; /* 8.4.26.1 */
-    unsigned char file_structure_version    [ISODCL (882, 882)]; /* 711 */
-    unsigned char unused4                   [ISODCL (883, 883)];
-    unsigned char application_data          [ISODCL (884, 1395)];
-    unsigned char unused5                   [ISODCL (1396, 2048)];
+struct iso_primary_descriptor
+{
+	unsigned char type			[ISODCL (   1,	  1)]; /* 711 */
+	unsigned char id			[ISODCL (   2,	  6)];
+	unsigned char version			[ISODCL (   7,	  7)]; /* 711 */
+	unsigned char unused1			[ISODCL (   8,	  8)];
+	unsigned char system_id			[ISODCL (   9,	 40)]; /* auchars */
+	unsigned char volume_id			[ISODCL (  41,	 72)]; /* duchars */
+	unsigned char unused2			[ISODCL (  73,	 80)];
+	unsigned char volume_space_size		[ISODCL (  81,	 88)]; /* 733 */
+	unsigned char unused3			[ISODCL (  89,	120)];
+	unsigned char volume_set_size		[ISODCL ( 121,	124)]; /* 723 */
+	unsigned char volume_sequence_number	[ISODCL ( 125,	128)]; /* 723 */
+	unsigned char logical_block_size	[ISODCL ( 129,	132)]; /* 723 */
+	unsigned char path_table_size		[ISODCL ( 133,	140)]; /* 733 */
+	unsigned char type_l_path_table		[ISODCL ( 141,	144)]; /* 731 */
+	unsigned char opt_type_l_path_table	[ISODCL ( 145,	148)]; /* 731 */
+	unsigned char type_m_path_table		[ISODCL ( 149,	152)]; /* 732 */
+	unsigned char opt_type_m_path_table	[ISODCL ( 153,	156)]; /* 732 */
+	unsigned char root_directory_record	[ISODCL ( 157,	190)]; /* 9.1 */
+	unsigned char volume_set_id		[ISODCL ( 191,	318)]; /* duchars */
+	unsigned char publisher_id		[ISODCL ( 319,	446)]; /* achars */
+	unsigned char preparer_id		[ISODCL ( 447,	574)]; /* achars */
+	unsigned char application_id		[ISODCL ( 575,	702)]; /* achars */
+	unsigned char copyright_file_id		[ISODCL ( 703,	739)]; /* 7.5 dchars */
+	unsigned char abstract_file_id		[ISODCL ( 740,	776)]; /* 7.5 dchars */
+	unsigned char bibliographic_file_id	[ISODCL ( 777,	813)]; /* 7.5 dchars */
+	unsigned char creation_date		[ISODCL ( 814,	830)]; /* 8.4.26.1 */
+	unsigned char modification_date		[ISODCL ( 831,	847)]; /* 8.4.26.1 */
+	unsigned char expiration_date		[ISODCL ( 848,	864)]; /* 8.4.26.1 */
+	unsigned char effective_date		[ISODCL ( 865,	881)]; /* 8.4.26.1 */
+	unsigned char file_structure_version	[ISODCL ( 882,	882)]; /* 711 */
+	unsigned char unused4			[ISODCL ( 883,	883)];
+	unsigned char application_data		[ISODCL ( 884, 1395)];
+	unsigned char unused5			[ISODCL (1396, 2048)];
 };
 
-static void
-isosize(char *filenamep, int xflag, long divisor) {
+static void isosize(char *filenamep, int xflag, long divisor)
+{
 	int fd, nsecs, ssize;
 	struct iso_primary_descriptor ipd;
 
 	if ((fd = open(filenamep, O_RDONLY)) < 0)
 		err(EXIT_FAILURE, _("failed to open %s"), filenamep);
 
-	if (lseek(fd, 16 << 11, 0) == (off_t)-1)
+	if (lseek(fd, 16 << 11, 0) == (off_t) - 1)
 		err(EXIT_FAILURE, _("seek error on %s"), filenamep);
 
 	if (read(fd, &ipd, sizeof(ipd)) < 0)
 		err(EXIT_FAILURE, _("read error on %s"), filenamep);
 
 	nsecs = isonum_733(ipd.volume_space_size, xflag);
-	ssize = isonum_723(ipd.logical_block_size, xflag); /* nowadays always 2048 */
+	/* isonum_723 returns nowadays always 2048 */
+	ssize = isonum_723(ipd.logical_block_size, xflag);
 
 	if (xflag) {
-		printf (_("sector count: %d, sector size: %d\n"),
-			nsecs, ssize);
+		printf(_("sector count: %d, sector size: %d\n"), nsecs, ssize);
 	} else {
 		long long product = nsecs;
 
 		if (divisor == 0)
-			printf ("%lld\n", product * ssize);
+			printf("%lld\n", product * ssize);
 		else if (divisor == ssize)
-			printf ("%d\n", nsecs);
+			printf("%d\n", nsecs);
 		else
-			printf ("%lld\n", (product * ssize) / divisor);
+			printf("%lld\n", (product * ssize) / divisor);
 	}
 
 	close(fd);
@@ -165,8 +165,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-int
-main(int argc, char * argv[]) {
+int main(int argc, char **argv)
+{
 	int j, ct, opt, xflag = 0;
 	long divisor = 0;
 
@@ -204,9 +204,8 @@ main(int argc, char * argv[]) {
 
 	ct = argc - optind;
 
-	if (ct <= 0) {
+	if (ct <= 0)
 		usage(stderr);
-	}
 
 	for (j = optind; j < argc; j++) {
 		if (ct > 1)
@@ -214,5 +213,5 @@ main(int argc, char * argv[]) {
 		isosize(argv[j], xflag, divisor);
 	}
 
-	return 0;
+	return EXIT_SUCCESS;
 }