hrev51793 adds 1 changeset to branch 'master'
old head: e2e571c0359ee6d08b6c9a36fba78a69b414fd14
new head: 718d7149b1b3bd7443e4149ab4a43814efbcc684
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=718d7149b1b3+%5Ee2e571c0359e
----------------------------------------------------------------------------
718d7149b1b3: white space cleanup
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51793
Commit: 718d7149b1b3bd7443e4149ab4a43814efbcc684
URL: http://cgit.haiku-os.org/haiku/commit/?id=718d7149b1b3
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Feb 10 15:01:46 2018 UTC
----------------------------------------------------------------------------
21 files changed, 38 insertions(+), 38 deletions(-)
src/system/kernel/arch/x86/32/apm.cpp | 2 +-
src/system/kernel/cpu.cpp | 4 ++--
src/system/kernel/debug/debug_paranoia.cpp | 2 +-
src/system/kernel/device_manager/dma_resources.cpp | 2 +-
src/system/kernel/lib/arch/generic/kernel_longjmp_return.c | 2 +-
src/system/kernel/lib/arch/generic/kernel_setjmp_save_sigs.c | 8 ++++----
src/system/kernel/posix/Jamfile | 2 +-
src/system/kernel/posix/xsi_semaphore.cpp | 4 ++--
src/system/kernel/slab/Slab.cpp | 2 +-
src/system/libroot/os/arch/x86/compatibility.c | 2 +-
src/system/libroot/os/arch/x86/system_info.c | 2 +-
src/system/libroot/os/arch/x86/thread.c | 2 +-
src/system/libroot/os/arch/x86/tls.c | 6 +++---
src/system/libroot/os/arch/x86_64/system_info.cpp | 2 +-
src/system/libroot/os/area.c | 8 ++++----
src/system/libroot/os/atomic.c | 8 ++++----
src/system/libroot/os/debug.c | 2 +-
src/system/libroot/os/disk_scanner.cpp | 4 ++--
src/system/libroot/os/port.c | 8 ++++----
src/system/libroot/os/team.c | 2 +-
src/system/libroot/posix/semaphore.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/system/kernel/arch/x86/32/apm.cpp
b/src/system/kernel/arch/x86/32/apm.cpp
index 23f21f9c04..2e9290c3a7 100644
--- a/src/system/kernel/arch/x86/32/apm.cpp
+++ b/src/system/kernel/arch/x86/32/apm.cpp
@@ -343,7 +343,7 @@ apm_init(kernel_args *args)
// use the BIOS data segment as data segment for APM
if (info.data_segment_length == 0) {
- args->platform_args.apm.data_segment_length =
B_PAGE_SIZE
+ args->platform_args.apm.data_segment_length =
B_PAGE_SIZE
- info.data_segment_base;
}
diff --git a/src/system/kernel/cpu.cpp b/src/system/kernel/cpu.cpp
index c984f353d1..a3da117269 100644
--- a/src/system/kernel/cpu.cpp
+++ b/src/system/kernel/cpu.cpp
@@ -80,7 +80,7 @@ load_cpufreq_module()
} else
put_module(name);
} else
- sCPUPerformanceModule = current;
+ sCPUPerformanceModule = current;
}
}
@@ -114,7 +114,7 @@ load_cpuidle_module()
} else
put_module(name);
} else
- sCPUIdleModule = current;
+ sCPUIdleModule = current;
}
}
diff --git a/src/system/kernel/debug/debug_paranoia.cpp
b/src/system/kernel/debug/debug_paranoia.cpp
index 3a1d2da09a..7b7f9ccc3b 100644
--- a/src/system/kernel/debug/debug_paranoia.cpp
+++ b/src/system/kernel/debug/debug_paranoia.cpp
@@ -394,7 +394,7 @@ remove_check_set(ParanoiaCheckSet* set)
}
-static ParanoiaCheckSet*
+static ParanoiaCheckSet*
lookup_check_set(const void* object)
{
int slot = (addr_t)object % PARANOIA_HASH_SIZE;
diff --git a/src/system/kernel/device_manager/dma_resources.cpp
b/src/system/kernel/device_manager/dma_resources.cpp
index 2d7ed5f40b..e2e2e1e80d 100644
--- a/src/system/kernel/device_manager/dma_resources.cpp
+++ b/src/system/kernel/device_manager/dma_resources.cpp
@@ -92,7 +92,7 @@ DMABuffer::Dump() const
DMAResource::DMAResource()
- :
+ :
fScratchVecs(NULL)
{
mutex_init(&fLock, "dma resource");
diff --git a/src/system/kernel/lib/arch/generic/kernel_longjmp_return.c
b/src/system/kernel/lib/arch/generic/kernel_longjmp_return.c
index 84f51ecb79..0a3ba5c6c4 100644
--- a/src/system/kernel/lib/arch/generic/kernel_longjmp_return.c
+++ b/src/system/kernel/lib/arch/generic/kernel_longjmp_return.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2008, Ingo Weinhold, ingo_weinhold@xxxxxx.
* Distributed under the terms of the MIT License.
*/
diff --git a/src/system/kernel/lib/arch/generic/kernel_setjmp_save_sigs.c
b/src/system/kernel/lib/arch/generic/kernel_setjmp_save_sigs.c
index dff6bae0ba..237fa66826 100644
--- a/src/system/kernel/lib/arch/generic/kernel_setjmp_save_sigs.c
+++ b/src/system/kernel/lib/arch/generic/kernel_setjmp_save_sigs.c
@@ -1,7 +1,7 @@
-/*
-** Copyright 2004, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All rights reserved.
-** Distributed under the terms of the Haiku License.
-*/
+/*
+ * Copyright 2004, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All rights reserved.
+ * Distributed under the terms of the Haiku License.
+ */
#include <setjmp.h>
diff --git a/src/system/kernel/posix/Jamfile b/src/system/kernel/posix/Jamfile
index 1eb2f51471..cc3416be10 100644
--- a/src/system/kernel/posix/Jamfile
+++ b/src/system/kernel/posix/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system kernel posix ;
UsePrivateHeaders shared ;
-KernelMergeObject kernel_posix.o :
+KernelMergeObject kernel_posix.o :
realtime_sem.cpp
xsi_message_queue.cpp
xsi_semaphore.cpp
diff --git a/src/system/kernel/posix/xsi_semaphore.cpp
b/src/system/kernel/posix/xsi_semaphore.cpp
index 918d58a8f5..c036f9b783 100644
--- a/src/system/kernel/posix/xsi_semaphore.cpp
+++ b/src/system/kernel/posix/xsi_semaphore.cpp
@@ -1011,7 +1011,7 @@ _user_xsi_semctl(int semaphoreID, int semaphoreNumber,
int command,
if (!semaphoreSet->HasPermission()) {
TRACE_ERROR(("xsi_semctl: calling process has
not "
"permission on semaphore %d, key %d\n",
- semaphoreSet->ID(),
(int)semaphoreSet->IpcKey()));
+ semaphoreSet->ID(),
(int)semaphoreSet->IpcKey()));
result = EACCES;
} else {
struct semid_ds sem;
@@ -1034,7 +1034,7 @@ _user_xsi_semctl(int semaphoreID, int semaphoreNumber,
int command,
if (!semaphoreSet->HasPermission()) {
TRACE_ERROR(("xsi_semctl: calling process has
not "
"permission on semaphore %d, key %d\n",
- semaphoreSet->ID(),
(int)semaphoreSet->IpcKey()));
+ semaphoreSet->ID(),
(int)semaphoreSet->IpcKey()));
return EACCES;
}
key_t key = semaphoreSet->IpcKey();
diff --git a/src/system/kernel/slab/Slab.cpp b/src/system/kernel/slab/Slab.cpp
index 01695bce51..7dec25a637 100644
--- a/src/system/kernel/slab/Slab.cpp
+++ b/src/system/kernel/slab/Slab.cpp
@@ -450,7 +450,7 @@ public:
private:
bool fPrintStackTrace;
addr_t fAddressFilter;
- team_id fTeamFilter;
+ team_id fTeamFilter;
thread_id fThreadFilter;
};
diff --git a/src/system/libroot/os/arch/x86/compatibility.c
b/src/system/libroot/os/arch/x86/compatibility.c
index 291f35caa1..ef026046d8 100644
--- a/src/system/libroot/os/arch/x86/compatibility.c
+++ b/src/system/libroot/os/arch/x86/compatibility.c
@@ -28,7 +28,7 @@ int _kstatfs_(dev_t device, void *whatever, int fd, const
char *path, fs_info *i
int mount(const char *filesystem, const char *where, const char *device, ulong
flags,
void *parms, int len);
int unmount(const char *path);
-long get_nth_pci_info(long index, pci_info *info);
+long get_nth_pci_info(long index, pci_info *info);
int
diff --git a/src/system/libroot/os/arch/x86/system_info.c
b/src/system/libroot/os/arch/x86/system_info.c
index 48de6e16da..158e16f08c 100644
--- a/src/system/libroot/os/arch/x86/system_info.c
+++ b/src/system/libroot/os/arch/x86/system_info.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2003-2004, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
* Distributed under the terms of the MIT License.
*/
diff --git a/src/system/libroot/os/arch/x86/thread.c
b/src/system/libroot/os/arch/x86/thread.c
index ad6dc4d3f7..c024dee8f2 100644
--- a/src/system/libroot/os/arch/x86/thread.c
+++ b/src/system/libroot/os/arch/x86/thread.c
@@ -15,7 +15,7 @@ find_thread(const char *name)
// in BeOS R5 OS.h as inline function. Do not change storage of thread
id.
if (!name) {
thread_id thread;
- __asm__ __volatile__ (
+ __asm__ __volatile__ (
"movl %%fs:4, %%eax \n\t"
: "=a" (thread));
return thread;
diff --git a/src/system/libroot/os/arch/x86/tls.c
b/src/system/libroot/os/arch/x86/tls.c
index e1ec0ad096..cdf94da3d7 100644
--- a/src/system/libroot/os/arch/x86/tls.c
+++ b/src/system/libroot/os/arch/x86/tls.c
@@ -47,7 +47,7 @@ void *
tls_get(int32 index)
{
void *ret;
- __asm__ __volatile__ (
+ __asm__ __volatile__ (
"movl %%fs:(, %1, 4), %0"
: "=r" (ret) : "r" (index));
return ret;
@@ -58,7 +58,7 @@ void **
tls_address(int32 index)
{
void **ret;
- __asm__ __volatile__ (
+ __asm__ __volatile__ (
"movl %%fs:0, %0\n\t"
"leal (%0, %1, 4), %0\n\t"
: "=&r" (ret) : "r" (index));
@@ -69,7 +69,7 @@ tls_address(int32 index)
void
tls_set(int32 index, void *value)
{
- __asm__ __volatile__ (
+ __asm__ __volatile__ (
"movl %1, %%fs:(, %0, 4)"
: : "r" (index), "r" (value));
}
diff --git a/src/system/libroot/os/arch/x86_64/system_info.cpp
b/src/system/libroot/os/arch/x86_64/system_info.cpp
index 96587f158f..354c21a55e 100644
--- a/src/system/libroot/os/arch/x86_64/system_info.cpp
+++ b/src/system/libroot/os/arch/x86_64/system_info.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright 2014, Paweł Dziepak, pdziepak@xxxxxxxxxxx.
* Copyright 2003-2004, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
* Distributed under the terms of the MIT License.
diff --git a/src/system/libroot/os/area.c b/src/system/libroot/os/area.c
index 3c921332ac..cfa32b018b 100644
--- a/src/system/libroot/os/area.c
+++ b/src/system/libroot/os/area.c
@@ -1,7 +1,7 @@
-/*
-** Copyright 2002, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All rights reserved.
-** Distributed under the terms of the MIT License.
-*/
+/*
+ * Copyright 2002, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
#include <OS.h>
diff --git a/src/system/libroot/os/atomic.c b/src/system/libroot/os/atomic.c
index f2fff262c9..b08c260b86 100644
--- a/src/system/libroot/os/atomic.c
+++ b/src/system/libroot/os/atomic.c
@@ -1,7 +1,7 @@
-/*
-** Copyright 2003, Marcus Overhagen. All rights reserved.
-** Distributed under the terms of the Haiku License.
-*/
+/*
+ * Copyright 2003, Marcus Overhagen. All rights reserved.
+ * Distributed under the terms of the Haiku License.
+ */
#include <SupportDefs.h>
diff --git a/src/system/libroot/os/debug.c b/src/system/libroot/os/debug.c
index a952edc96a..2e7a5c7be6 100644
--- a/src/system/libroot/os/debug.c
+++ b/src/system/libroot/os/debug.c
@@ -233,7 +233,7 @@ _sPrintf(const char *fmt, ...)
va_end(ap);
if (ret >= 0)
- _kern_debug_output(buffer);
+ _kern_debug_output(buffer);
return ret;
}
diff --git a/src/system/libroot/os/disk_scanner.cpp
b/src/system/libroot/os/disk_scanner.cpp
index 2184f7e56d..9a06ce6233 100644
--- a/src/system/libroot/os/disk_scanner.cpp
+++ b/src/system/libroot/os/disk_scanner.cpp
@@ -1,5 +1,5 @@
//----------------------------------------------------------------------
-// This software is part of the OpenBeOS distribution and is covered
+// This software is part of the OpenBeOS distribution and is covered
// by the MIT License.
//---------------------------------------------------------------------
@@ -275,7 +275,7 @@ partition_session(int deviceFD, int32 sessionIndex, const
char *identifier,
\return \c B_OK, if everything went fine, an error code otherwise.
*/
status_t
-initialize_volume(const char *where, const char *fileSystem,
+initialize_volume(const char *where, const char *fileSystem,
const char *volumeName, const char
*parameters)
{
// not yet implemented
diff --git a/src/system/libroot/os/port.c b/src/system/libroot/os/port.c
index 8b235dc07d..7255344e2d 100644
--- a/src/system/libroot/os/port.c
+++ b/src/system/libroot/os/port.c
@@ -1,7 +1,7 @@
-/*
-** Copyright 2002, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All rights reserved.
-** Distributed under the terms of the MIT License.
-*/
+/*
+ * Copyright 2002, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
#include <OS.h>
diff --git a/src/system/libroot/os/team.c b/src/system/libroot/os/team.c
index b22b3d584c..c3f54ac8ff 100644
--- a/src/system/libroot/os/team.c
+++ b/src/system/libroot/os/team.c
@@ -1,4 +1,4 @@
-/*
+/*
** Copyright 2002-2004, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx. All rights
reserved.
** Distributed under the terms of the MIT License.
*/
diff --git a/src/system/libroot/posix/semaphore.cpp
b/src/system/libroot/posix/semaphore.cpp
index fc4b0fc921..4df5a526aa 100644
--- a/src/system/libroot/posix/semaphore.cpp
+++ b/src/system/libroot/posix/semaphore.cpp
@@ -165,7 +165,7 @@ unnamed_sem_timedwait(sem_t* semaphore, const struct
timespec* timeout) {
if (result == 0)
return 0;
- return _kern_mutex_sem_acquire(sem, NULL,
+ return _kern_mutex_sem_acquire(sem, NULL,
timeoutMicros == B_INFINITE_TIMEOUT ? 0 :
B_ABSOLUTE_REAL_TIME_TIMEOUT,
timeoutMicros);
}