From e701d86af548314ea459013ba5079df35b635973 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 13 Oct 2007 17:18:34 +0000 Subject: [PATCH] Patch by Vasilis Kaoutsis: Style cleanup, "OpenBeOS license" -> "MIT license". git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22537 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../libroot/posix/glibc/libio/flockfile.c | 6 +++--- .../libroot/posix/pthread/pthread_mutexattr.c | 7 +++---- src/system/libroot/posix/string/strchrnul.c | 13 ++++++------- src/system/libroot/posix/string/strdup.c | 11 +++++------ src/system/libroot/posix/sys/mkdir.c | 9 ++++----- src/system/libroot/posix/sys/select.c | 2 +- src/system/libroot/posix/time/asctime.c | 19 +++++++++---------- src/system/libroot/posix/time/time.c | 9 ++++----- src/system/libroot/posix/unistd/access.c | 9 ++++----- src/system/libroot/posix/unistd/dup.c | 6 +++--- src/system/libroot/posix/unistd/ioctl.c | 11 +++++------ src/system/libroot/posix/unistd/pipe.c | 7 +++---- src/system/libroot/posix/unistd/read.c | 19 +++++++++---------- src/system/libroot/posix/unistd/ttyname.c | 8 ++++---- src/system/libroot/posix/unistd/write.c | 13 ++++++------- 15 files changed, 69 insertions(+), 80 deletions(-) diff --git a/src/system/libroot/posix/glibc/libio/flockfile.c b/src/system/libroot/posix/glibc/libio/flockfile.c index e6d49b918f..e51ad51b1c 100644 --- a/src/system/libroot/posix/glibc/libio/flockfile.c +++ b/src/system/libroot/posix/glibc/libio/flockfile.c @@ -1,7 +1,7 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2003-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include "libioP.h" diff --git a/src/system/libroot/posix/pthread/pthread_mutexattr.c b/src/system/libroot/posix/pthread/pthread_mutexattr.c index 39cac20aee..605d1331be 100644 --- a/src/system/libroot/posix/pthread/pthread_mutexattr.c +++ b/src/system/libroot/posix/pthread/pthread_mutexattr.c @@ -1,7 +1,7 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2003-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include @@ -155,4 +155,3 @@ pthread_mutexattr_setprotocol(pthread_mutexattr_t *_mutexAttr, int protocol) // not implemented return B_NOT_ALLOWED; } - diff --git a/src/system/libroot/posix/string/strchrnul.c b/src/system/libroot/posix/string/strchrnul.c index 7e161009b3..a83745c13e 100644 --- a/src/system/libroot/posix/string/strchrnul.c +++ b/src/system/libroot/posix/string/strchrnul.c @@ -1,19 +1,18 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2003-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include #include -char * -strchrnul(const char *string, int c) +char* +strchrnul(const char* string, int c) { while (string[0] != (char)c && string[0]) string++; - return (char *)string; + return (char*)string; } - diff --git a/src/system/libroot/posix/string/strdup.c b/src/system/libroot/posix/string/strdup.c index 7ab28a6baa..a4306f0899 100644 --- a/src/system/libroot/posix/string/strdup.c +++ b/src/system/libroot/posix/string/strdup.c @@ -1,17 +1,17 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2003-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include #include -char * +char* strdup(const char *string) { - char *copied; + char* copied; size_t length; // unlike the standard strdup() function, the BeOS implementation @@ -27,4 +27,3 @@ strdup(const char *string) memcpy(copied, string, length); return copied; } - diff --git a/src/system/libroot/posix/sys/mkdir.c b/src/system/libroot/posix/sys/mkdir.c index 6ce3cb2784..ccfc4cba3b 100644 --- a/src/system/libroot/posix/sys/mkdir.c +++ b/src/system/libroot/posix/sys/mkdir.c @@ -1,7 +1,7 @@ /* -** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include @@ -18,10 +18,9 @@ int -mkdir(const char *path, mode_t mode) +mkdir(const char* path, mode_t mode) { status_t status = _kern_create_dir(-1, path, mode); RETURN_AND_SET_ERRNO(status); } - diff --git a/src/system/libroot/posix/sys/select.c b/src/system/libroot/posix/sys/select.c index 410cc54eab..cb1c5250b1 100644 --- a/src/system/libroot/posix/sys/select.c +++ b/src/system/libroot/posix/sys/select.c @@ -1,6 +1,6 @@ /* * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. - * Distributed under the terms of the OpenBeOS License. + * Distributed under the terms of the MIT License. */ diff --git a/src/system/libroot/posix/time/asctime.c b/src/system/libroot/posix/time/asctime.c index 2f8a5210ad..ec32e738d0 100644 --- a/src/system/libroot/posix/time/asctime.c +++ b/src/system/libroot/posix/time/asctime.c @@ -1,15 +1,15 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include #include -static char * -print_time(char *buffer, size_t bufferSize, const struct tm *tm) +static char* +print_time(char* buffer, size_t bufferSize, const struct tm* tm) { // ToDo: this should probably use the locale kit to get these names @@ -31,8 +31,8 @@ print_time(char *buffer, size_t bufferSize, const struct tm *tm) } -char * -asctime(const struct tm *tm) +char* +asctime(const struct tm* tm) { static char buffer[28]; // is enough to hold normal dates @@ -41,10 +41,9 @@ asctime(const struct tm *tm) } -char * -asctime_r(const struct tm *tm, char *buffer) +char* +asctime_r(const struct tm* tm, char* buffer) { return print_time(buffer, 26, tm); // 26 bytes seems to be required by the standard, so we can't write more } - diff --git a/src/system/libroot/posix/time/time.c b/src/system/libroot/posix/time/time.c index 0e3f15ccac..ffa376420c 100644 --- a/src/system/libroot/posix/time/time.c +++ b/src/system/libroot/posix/time/time.c @@ -1,7 +1,7 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2003-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include @@ -9,7 +9,7 @@ time_t -time(time_t *timer) +time(time_t* timer) { time_t secs = real_time_clock(); @@ -18,4 +18,3 @@ time(time_t *timer) return secs; } - diff --git a/src/system/libroot/posix/unistd/access.c b/src/system/libroot/posix/unistd/access.c index a932a3dbbf..ced8f8393e 100644 --- a/src/system/libroot/posix/unistd/access.c +++ b/src/system/libroot/posix/unistd/access.c @@ -1,7 +1,7 @@ /* -** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include @@ -18,10 +18,9 @@ int -access(const char *path, int accessMode) +access(const char* path, int accessMode) { status_t status = _kern_access(path, accessMode); RETURN_AND_SET_ERRNO(status); } - diff --git a/src/system/libroot/posix/unistd/dup.c b/src/system/libroot/posix/unistd/dup.c index c5fb7aa5b3..03ec769213 100644 --- a/src/system/libroot/posix/unistd/dup.c +++ b/src/system/libroot/posix/unistd/dup.c @@ -1,7 +1,7 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include diff --git a/src/system/libroot/posix/unistd/ioctl.c b/src/system/libroot/posix/unistd/ioctl.c index 2a0c08b482..28bdbb9cfe 100644 --- a/src/system/libroot/posix/unistd/ioctl.c +++ b/src/system/libroot/posix/unistd/ioctl.c @@ -1,7 +1,7 @@ /* -** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include @@ -22,12 +22,12 @@ int ioctl(int fd, ulong cmd, ...) { va_list args; - void *argument; + void* argument; size_t size; int status; va_start(args, cmd); - argument = va_arg(args, void *); + argument = va_arg(args, void*); size = va_arg(args, size_t); va_end(args); @@ -35,4 +35,3 @@ ioctl(int fd, ulong cmd, ...) RETURN_AND_SET_ERRNO(status) } - diff --git a/src/system/libroot/posix/unistd/pipe.c b/src/system/libroot/posix/unistd/pipe.c index 4c9f73edce..f976209cc2 100644 --- a/src/system/libroot/posix/unistd/pipe.c +++ b/src/system/libroot/posix/unistd/pipe.c @@ -1,7 +1,7 @@ /* -** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2003-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include @@ -34,4 +34,3 @@ pipe(int streams[2]) return 0; } - diff --git a/src/system/libroot/posix/unistd/read.c b/src/system/libroot/posix/unistd/read.c index 06b63144ec..35151ec368 100644 --- a/src/system/libroot/posix/unistd/read.c +++ b/src/system/libroot/posix/unistd/read.c @@ -1,12 +1,12 @@ /* -** Copyright 2001, Manuel J. Petit. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2001, Manuel J. Petit. All rights reserved. + * Distributed under the terms of the NewOS License. + */ /* -** Copyright 2002, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include @@ -23,7 +23,7 @@ ssize_t -read(int fd, void *buffer, size_t bufferSize) +read(int fd, void* buffer, size_t bufferSize) { ssize_t status = _kern_read(fd, -1, buffer, bufferSize); @@ -32,7 +32,7 @@ read(int fd, void *buffer, size_t bufferSize) ssize_t -read_pos(int fd, off_t pos, void *buffer, size_t bufferSize) +read_pos(int fd, off_t pos, void* buffer, size_t bufferSize) { ssize_t status; if (pos < 0) { @@ -46,7 +46,7 @@ read_pos(int fd, off_t pos, void *buffer, size_t bufferSize) ssize_t -pread(int fd, void *buffer, size_t bufferSize, off_t pos) +pread(int fd, void* buffer, size_t bufferSize, off_t pos) { ssize_t status; if (pos < 0) { @@ -57,4 +57,3 @@ pread(int fd, void *buffer, size_t bufferSize, off_t pos) RETURN_AND_SET_ERRNO(status); } - diff --git a/src/system/libroot/posix/unistd/ttyname.c b/src/system/libroot/posix/unistd/ttyname.c index a9006f851f..ba158e7935 100644 --- a/src/system/libroot/posix/unistd/ttyname.c +++ b/src/system/libroot/posix/unistd/ttyname.c @@ -1,8 +1,8 @@ /* -** Copyright 2003, Daniel Reinhold, danielre@users.sf.net. All rights reserved. -** Copyright 2007, François Revol, mmu_man@users.sf.net. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2003, Daniel Reinhold, danielre@users.sf.net. All rights reserved. + * Copyright 2007, François Revol, mmu_man@users.sf.net. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include diff --git a/src/system/libroot/posix/unistd/write.c b/src/system/libroot/posix/unistd/write.c index b881e4c7a9..41a76dcae6 100644 --- a/src/system/libroot/posix/unistd/write.c +++ b/src/system/libroot/posix/unistd/write.c @@ -1,10 +1,10 @@ /* -** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -** -** Copyright 2001, Manuel J. Petit. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ + * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Copyright 2001, Manuel J. Petit. All rights reserved. + * Distributed under the terms of the NewOS License. + */ #include @@ -55,4 +55,3 @@ pwrite(int fd, const void *buffer, size_t bufferSize, off_t pos) RETURN_AND_SET_ERRNO(status); } -