[klibc] [patch] s390: coding style and whitespace cleanup

Heiko Carstens heiko.carstens at de.ibm.com
Fri Jul 7 04:25:34 PDT 2006


From: Heiko Carstens <heiko.carstens at de.ibm.com>

s390 coding style and whitespace cleanup.

Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
---

 usr/include/arch/s390/klibc/archstat.h |   28 ++++++++++++++--------------
 usr/klibc/arch/s390/MCONFIG            |    2 +-
 usr/klibc/arch/s390/Makefile.inc       |    3 +--
 usr/klibc/arch/s390/mmap.c             |   27 +++++++++++++--------------
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/usr/include/arch/s390/klibc/archstat.h b/usr/include/arch/s390/klibc/archstat.h
index de3a9da..ca4c822 100644
--- a/usr/include/arch/s390/klibc/archstat.h
+++ b/usr/include/arch/s390/klibc/archstat.h
@@ -12,24 +12,24 @@ #ifndef __s390x__
  */
 struct stat {
 	__stdev64	(st_dev);
-        unsigned int    __pad1;
-#define STAT64_HAS_BROKEN_ST_INO        1
-        unsigned long   __st_ino;
-        unsigned int    st_mode;
-        unsigned int    st_nlink;
-        unsigned long   st_uid;
-        unsigned long   st_gid;
+	unsigned int	__pad1;
+#define STAT64_HAS_BROKEN_ST_INO	1
+	unsigned long	__st_ino;
+	unsigned int	st_mode;
+	unsigned int	st_nlink;
+	unsigned long	st_uid;
+	unsigned long	st_gid;
 	__stdev64	(st_rdev);
-        unsigned int    __pad3;
-        long long	st_size;
-        unsigned long   st_blksize;
-        unsigned char   __pad4[4];
-        unsigned long   __pad5;     /* future possible st_blocks high bits */
-        unsigned long   st_blocks;  /* Number 512-byte blocks allocated. */
+	unsigned int	__pad3;
+	long long	st_size;
+	unsigned long	st_blksize;
+	unsigned char	__pad4[4];
+	unsigned long	__pad5;     /* future possible st_blocks high bits */
+	unsigned long	st_blocks;  /* Number 512-byte blocks allocated. */
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-        unsigned long long	st_ino;
+	unsigned long long	st_ino;
 };
 
 #else /* __s390x__ */
diff --git a/usr/klibc/arch/s390/MCONFIG b/usr/klibc/arch/s390/MCONFIG
index dd4495a..c44fcbb 100644
--- a/usr/klibc/arch/s390/MCONFIG
+++ b/usr/klibc/arch/s390/MCONFIG
@@ -2,7 +2,7 @@ # -*- makefile -*-
 #
 # arch/s390/MCONFIG
 #
-# Special rules for this architecture.  Note that this is actually
+# Special rules for this architecture. Note that this is actually
 # included from the main Makefile, and that pathnames should be
 # accordingly.
 #
diff --git a/usr/klibc/arch/s390/Makefile.inc b/usr/klibc/arch/s390/Makefile.inc
index 8a35d73..d81bf29 100644
--- a/usr/klibc/arch/s390/Makefile.inc
+++ b/usr/klibc/arch/s390/Makefile.inc
@@ -2,7 +2,7 @@ # -*- makefile -*-
 #
 # arch/s390/Makefile.inc
 #
-# Special rules for this architecture.  Note that this is actually
+# Special rules for this architecture. Note that this is actually
 # included from the main Makefile, and that pathnames should be
 # accordingly.
 #
@@ -34,5 +34,4 @@ endif
 
 KLIBCARCHSOOBJS = $(patsubst %.o,%.lo,$(KLIBCARCHOBJS))
 
-
 archclean:
diff --git a/usr/klibc/arch/s390/mmap.c b/usr/klibc/arch/s390/mmap.c
index 4c43779..3331239 100644
--- a/usr/klibc/arch/s390/mmap.c
+++ b/usr/klibc/arch/s390/mmap.c
@@ -16,12 +16,12 @@ #ifndef __s390x__
 void *__mmap2(void *addr, size_t len, int prot, int flags, int fd, long offset)
 {
 	struct mmap_arg_struct args = {
-		(unsigned long)addr,
-		(unsigned long)len,
-		(unsigned long)prot,
-		(unsigned long)flags,
-		(unsigned long)fd,
-		(unsigned long)offset,
+		.addr	= (unsigned long)addr,
+		.len	= (unsigned long)len,
+		.prot	= (unsigned long)prot,
+		.flags	= (unsigned long)flags,
+		.fd	= (unsigned long)fd,
+		.offset = (unsigned long)offset,
 	};
 
 	register struct mmap_arg_struct *__arg1 asm("2") = &args;
@@ -42,16 +42,15 @@ void *__mmap2(void *addr, size_t len, in
 
 #else /* __s390x__ */
 
-void * mmap(void * addr, size_t len, int prot, int flags,
-						 int fd, off_t offset)
+void *mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
 	struct mmap_arg_struct args = {
-		(unsigned long) addr,
-		(unsigned long) len,
-		(unsigned long) prot,
-		(unsigned long) flags,
-		(unsigned long) fd,
-		(unsigned long) offset,
+		.addr	= (unsigned long)addr,
+		.len	= (unsigned long)len,
+		.prot	= (unsigned long)prot,
+		.flags	= (unsigned long)flags,
+		.fd	= (unsigned long)fd,
+		.offset = (unsigned long)offset,
 	};
 
 	register struct mmap_arg_struct *__arg1 asm("2") = &args;



More information about the klibc mailing list