license header and style cleanup

Signed-off-by: Daniel A. Steffen <[email protected]>

Author: das

os/linux_base.h

@@ -1,19 +1,13 @@
 /*
- * @APPLE_APACHE_LICENSE_HEADER_START@
+ * This source file is part of the Swift.org open source project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015 Apple Inc. and the Swift project authors
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under Apache License v2.0 with Runtime Library Exception
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See http://swift.org/LICENSE.txt for license information
+ * See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
  *
- * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
 #ifndef __OS_LINUX_BASE__

src/io.c

@@ -2067,7 +2067,7 @@ static void
 _dispatch_operation_advise(dispatch_operation_t op, size_t chunk_size)
 {
 #ifndef F_RDADVISE
-  LINUX_PORT_ERROR();
+	LINUX_PORT_ERROR();
 #else
 	int err;
 	struct radvisory advise;

src/provider.d

@@ -66,7 +66,7 @@ provider dispatch {
  *
  * Timer configuration indicates that dispatch_source_set_timer() was called.
  * Timer programming indicates that the dispatch manager is about to sleep
- * for 'deadline' (but may wake up earlier if non-timer events occur).
+ * for 'deadline' ns (but may wake up earlier if non-timer events occur).
  * Time parameters are in nanoseconds, a value of -1 means "forever".
  *
  * dispatch$target:libdispatch*.dylib::timer-configure

src/semaphore.c

@@ -712,7 +712,7 @@ _dispatch_thread_semaphore_create(void)
 	}
 	return s4;
 #elif USE_POSIX_SEM
-	sem_t* s4 = malloc(sizeof(sem_t));
+	sem_t *s4 = _dispatch_calloc(1ul, sizeof(sem_t));
 	int ret = sem_init(s4, 0, 0);
 	DISPATCH_SEMAPHORE_VERIFY_RET(ret);
 	return (_dispatch_thread_semaphore_t)s4;
@@ -738,7 +738,7 @@ _dispatch_thread_semaphore_dispose(_dispatch_thread_semaphore_t sema)
 	DISPATCH_VERIFY_MIG(kr);
 	DISPATCH_SEMAPHORE_VERIFY_KR(kr);
 #elif USE_POSIX_SEM
-	sem_t *s4 = (sem_t*)sema;
+	sem_t *s4 = (sem_t *)sema;
 	int ret = sem_destroy(s4);
 	free(s4);
 	DISPATCH_SEMAPHORE_VERIFY_RET(ret);
@@ -763,7 +763,7 @@ _dispatch_thread_semaphore_signal(_dispatch_thread_semaphore_t sema)
 	kern_return_t kr = semaphore_signal(s4);
 	DISPATCH_SEMAPHORE_VERIFY_KR(kr);
 #elif USE_POSIX_SEM
-	sem_t *s4 = (sem_t*)sema;
+	sem_t *s4 = (sem_t *)sema;
 	int ret = sem_post(s4);
 	DISPATCH_SEMAPHORE_VERIFY_RET(ret);
 #elif USE_WIN32_SEM
@@ -789,7 +789,7 @@ _dispatch_thread_semaphore_wait(_dispatch_thread_semaphore_t sema)
 	} while (slowpath(kr == KERN_ABORTED));
 	DISPATCH_SEMAPHORE_VERIFY_KR(kr);
 #elif USE_POSIX_SEM
-	sem_t *s4 = (sem_t*)sema;
+	sem_t *s4 = (sem_t *)sema;
 	int ret;
 	do {
 		ret = sem_wait(s4);

src/shims/linux_stubs.c

@@ -1,22 +1,15 @@
 /*
- * @APPLE_APACHE_LICENSE_HEADER_START@
+ * This source file is part of the Swift.org open source project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015 Apple Inc. and the Swift project authors
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under Apache License v2.0 with Runtime Library Exception
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See http://swift.org/LICENSE.txt for license information
+ * See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
  *
- * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
-
 /*
  * This file contains stubbed out functions we are using during
  * the initial linux port.  When the port is complete, this file

src/shims/linux_stubs.h

@@ -1,19 +1,13 @@
 /*
- * @APPLE_APACHE_LICENSE_HEADER_START@
+ * This source file is part of the Swift.org open source project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015 Apple Inc. and the Swift project authors
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under Apache License v2.0 with Runtime Library Exception
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See http://swift.org/LICENSE.txt for license information
+ * See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
  *
- * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
 // forward declarations for functions we are stubbing out

src/source.c

@@ -4737,7 +4737,7 @@ _dispatch_mach_debug_attr(dispatch_mach_t dm, char* buf, size_t bufsiz)
 {
 #ifdef __LINUX_PORT_HDD__
 	LINUX_PORT_ERROR();
-	return (size_t)0;
+	return 0;
 #else
 	dispatch_queue_t target = dm->do_targetq;
 	return dsnprintf(buf, bufsiz, "target = %s[%p], receive = 0x%x, "
@@ -4759,7 +4759,7 @@ _dispatch_mach_debug(dispatch_mach_t dm, char* buf, size_t bufsiz)
 {
 #ifdef __LINUX_PORT_HDD__
 	LINUX_PORT_ERROR();
-	return (size_t)0;
+	return 0;
 #else
 	size_t offset = 0;
 	offset += dsnprintf(&buf[offset], bufsiz - offset, "%s[%p] = { ",

src/transform.c

@@ -533,7 +533,7 @@ _dispatch_transform_from_utf16le(dispatch_data_t data)
 {
 #ifdef __LINUX_PORT_HDD__
 	LINUX_PORT_ERROR();
-	return (dispatch_data_t)0;
+	return NULL;
 #else
 	return _dispatch_transform_from_utf16(data, OSLittleEndian);
 #endif
@@ -544,7 +544,7 @@ _dispatch_transform_from_utf16be(dispatch_data_t data)
 {
 #ifdef __LINUX_PORT_HDD__
 	LINUX_PORT_ERROR();
-	return (dispatch_data_t)0;
+	return NULL;
 #else
 	return _dispatch_transform_from_utf16(data, OSBigEndian);
 #endif
@@ -555,7 +555,7 @@ _dispatch_transform_to_utf16le(dispatch_data_t data)
 {
 #ifdef __LINUX_PORT_HDD__
 	LINUX_PORT_ERROR();
-	return (dispatch_data_t)0;
+	return NULL;
 #else
 	return _dispatch_transform_to_utf16(data, OSLittleEndian);
 #endif
@@ -566,7 +566,7 @@ _dispatch_transform_to_utf16be(dispatch_data_t data)
 {
 #ifdef __LINUX_PORT_HDD__
 	LINUX_PORT_ERROR();
-	return (dispatch_data_t)0;
+	return NULL;
 #else
 	return _dispatch_transform_to_utf16(data, OSBigEndian);
 #endif