hrev51794 adds 1 changeset to branch 'master'
old head: 718d7149b1b3bd7443e4149ab4a43814efbcc684
new head: bec80c1ced7ed0da911c4de650ac86d6b71d5ea0
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=bec80c1ced7e+%5E718d7149b1b3
----------------------------------------------------------------------------
bec80c1ced7e: white space cleanup
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51794
Commit: bec80c1ced7ed0da911c4de650ac86d6b71d5ea0
URL: http://cgit.haiku-os.org/haiku/commit/?id=bec80c1ced7e
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Feb 10 18:18:56 2018 UTC
----------------------------------------------------------------------------
17 files changed, 50 insertions(+), 50 deletions(-)
.../generic/generic_vm_physical_page_mapper.cpp | 2 +-
src/system/kernel/arch/x86/32/interrupts.S | 10 +++++-----
src/system/kernel/arch/x86/64/descriptors.cpp | 2 +-
src/system/kernel/arch/x86/64/interrupts.S | 10 +++++-----
src/system/kernel/arch/x86/asm_offsets.cpp | 4 ++--
src/system/kernel/debug/system_profiler.cpp | 2 +-
src/system/kernel/device_manager/FileDevice.cpp | 14 +++++++-------
src/system/kernel/elf.cpp | 4 ++--
src/system/kernel/kernel_c++_structs.cpp | 2 +-
src/system/kernel/posix/xsi_semaphore.cpp | 4 ++--
src/system/kernel/slab/slab_private.h | 2 +-
src/system/kernel/team.cpp | 2 +-
src/system/kernel/vm/VMUserArea.h | 16 ++++++++--------
src/system/libroot/os/arch/x86_64/system_time.cpp | 18 +++++++++---------
src/system/libroot/os/find_directory.cpp | 2 +-
src/system/libroot/os/parsedate.cpp | 2 +-
src/system/libroot/os/scheduler.c | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp
b/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp
index 1cd9e1f60c..e4e627b5b3 100644
--- a/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp
+++ b/src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp
@@ -38,7 +38,7 @@ typedef struct paddr_chunk_descriptor {
#endif
} paddr_chunk_desc;
-static paddr_chunk_desc *paddr_desc; // will be one per physical chunk
+static paddr_chunk_desc *paddr_desc; // will be one per physical chunk
static paddr_chunk_desc **virtual_pmappings; // will be one ptr per virtual
chunk in iospace
static int first_free_vmapping;
static int num_virtual_chunks;
diff --git a/src/system/kernel/arch/x86/32/interrupts.S
b/src/system/kernel/arch/x86/32/interrupts.S
index a3fea32096..1c4a284bc6 100644
--- a/src/system/kernel/arch/x86/32/interrupts.S
+++ b/src/system/kernel/arch/x86/32/interrupts.S
@@ -687,13 +687,13 @@ FUNCTION_END(handle_syscall)
| THREAD_FLAGS_SYSCALL_RESTARTED),
THREAD_flags(%edi)
jz 2f
1:
- movl THREAD_flags(%edi), %eax
+ movl THREAD_flags(%edi), %eax
movl %eax, %edx
- andl $~(THREAD_FLAGS_64_BIT_SYSCALL_RETURN \
+ andl $~(THREAD_FLAGS_64_BIT_SYSCALL_RETURN \
| THREAD_FLAGS_SYSCALL_RESTARTED), %edx
- lock
- cmpxchgl %edx, THREAD_flags(%edi)
- jnz 1b
+ lock
+ cmpxchgl %edx, THREAD_flags(%edi)
+ jnz 1b
2:
// post syscall debugging
diff --git a/src/system/kernel/arch/x86/64/descriptors.cpp
b/src/system/kernel/arch/x86/64/descriptors.cpp
index 12f51c64e2..f4fee71dd3 100644
--- a/src/system/kernel/arch/x86/64/descriptors.cpp
+++ b/src/system/kernel/arch/x86/64/descriptors.cpp
@@ -390,7 +390,7 @@ x86_descriptors_init(kernel_args* args)
table[9] = x86_fatal_exception; // Coprocessor Segment
Overrun
table[10] = x86_fatal_exception; // Invalid TSS
Exception (#TS)
table[11] = x86_fatal_exception; // Segment Not Present
(#NP)
- table[12] = x86_64_stack_fault_exception; // Stack Fault Exception
(#SS)
+ table[12] = x86_64_stack_fault_exception; // Stack Fault
Exception (#SS)
table[13] = x86_64_general_protection_fault; // General Protection
Exception (#GP)
table[14] = x86_page_fault_exception; // Page-Fault Exception (#PF)
table[16] = x86_unexpected_exception; // x87 FPU Floating-Point Error
(#MF)
diff --git a/src/system/kernel/arch/x86/64/interrupts.S
b/src/system/kernel/arch/x86/64/interrupts.S
index 882d3a5ff9..43701b1346 100644
--- a/src/system/kernel/arch/x86/64/interrupts.S
+++ b/src/system/kernel/arch/x86/64/interrupts.S
@@ -418,12 +418,12 @@ FUNCTION(x86_64_syscall_entry):
testl $THREAD_FLAGS_SYSCALL_RESTARTED, THREAD_flags(%r12)
jz 2f
1:
- movl THREAD_flags(%r12), %eax
+ movl THREAD_flags(%r12), %eax
movl %eax, %edx
- andl $~THREAD_FLAGS_SYSCALL_RESTARTED, %edx
- lock
- cmpxchgl %edx, THREAD_flags(%r12)
- jnz 1b
+ andl $~THREAD_FLAGS_SYSCALL_RESTARTED, %edx
+ lock
+ cmpxchgl %edx, THREAD_flags(%r12)
+ jnz 1b
2:
testl $(THREAD_FLAGS_DEBUGGER_INSTALLED |
THREAD_FLAGS_SIGNALS_PENDING \
| THREAD_FLAGS_DEBUG_THREAD |
THREAD_FLAGS_BREAKPOINTS_DEFINED \
diff --git a/src/system/kernel/arch/x86/asm_offsets.cpp
b/src/system/kernel/arch/x86/asm_offsets.cpp
index d89200bf87..270f8fc813 100644
--- a/src/system/kernel/arch/x86/asm_offsets.cpp
+++ b/src/system/kernel/arch/x86/asm_offsets.cpp
@@ -21,10 +21,10 @@
#define DEFINE_MACRO(macro, value) DEFINE_COMPUTED_ASM_MACRO(macro, value)
#define DEFINE_OFFSET_MACRO(prefix, structure, member) \
- DEFINE_MACRO(prefix##_##member, offsetof(struct structure, member));
+ DEFINE_MACRO(prefix##_##member, offsetof(struct structure, member));
#define DEFINE_SIZEOF_MACRO(prefix, structure) \
- DEFINE_MACRO(prefix##_sizeof, sizeof(struct structure));
+ DEFINE_MACRO(prefix##_sizeof, sizeof(struct structure));
void
diff --git a/src/system/kernel/debug/system_profiler.cpp
b/src/system/kernel/debug/system_profiler.cpp
index c1bae77edc..4902ec7d95 100644
--- a/src/system/kernel/debug/system_profiler.cpp
+++ b/src/system/kernel/debug/system_profiler.cpp
@@ -66,7 +66,7 @@ public:
uint64*
_droppedEvents);
private:
- virtual void
EventOccurred(NotificationService& service,
+ virtual void
EventOccurred(NotificationService& service,
const
KMessage* event);
virtual void
ThreadEnqueuedInRunQueue(Thread* thread);
diff --git a/src/system/kernel/device_manager/FileDevice.cpp
b/src/system/kernel/device_manager/FileDevice.cpp
index 826eb31678..e6b23491dd 100644
--- a/src/system/kernel/device_manager/FileDevice.cpp
+++ b/src/system/kernel/device_manager/FileDevice.cpp
@@ -327,13 +327,13 @@ FileDevice::Control(void* _cookie, int32 op, void*
buffer, size_t length)
device_geometry geometry;
geometry.bytes_per_sector = kBlockSize;
- geometry.sectors_per_track = 1;
- geometry.cylinder_count = blocks / heads;
- geometry.head_count = heads;
- geometry.device_type = B_DISK;
- geometry.removable = false;
- geometry.read_only = false;
- geometry.write_once = false;
+ geometry.sectors_per_track = 1;
+ geometry.cylinder_count = blocks / heads;
+ geometry.head_count = heads;
+ geometry.device_type = B_DISK;
+ geometry.removable = false;
+ geometry.read_only = false;
+ geometry.write_once = false;
return set_ioctl_result(geometry, buffer, length);
}
diff --git a/src/system/kernel/elf.cpp b/src/system/kernel/elf.cpp
index 8e5820a53a..cb4fbce472 100644
--- a/src/system/kernel/elf.cpp
+++ b/src/system/kernel/elf.cpp
@@ -2061,8 +2061,8 @@ elf_load_user_image(const char *path, Team *team, int
flags, addr_t *entry)
// register the loaded image
imageInfo.basic_info.type = B_LIBRARY_IMAGE;
- imageInfo.basic_info.device = st.st_dev;
- imageInfo.basic_info.node = st.st_ino;
+ imageInfo.basic_info.device = st.st_dev;
+ imageInfo.basic_info.node = st.st_ino;
strlcpy(imageInfo.basic_info.name, path,
sizeof(imageInfo.basic_info.name));
imageInfo.basic_info.api_version = B_HAIKU_VERSION;
diff --git a/src/system/kernel/kernel_c++_structs.cpp
b/src/system/kernel/kernel_c++_structs.cpp
index f31d27cc6e..9b0711ea05 100644
--- a/src/system/kernel/kernel_c++_structs.cpp
+++ b/src/system/kernel/kernel_c++_structs.cpp
@@ -14,7 +14,7 @@
#define DEFINE_SIZE_MACRO(name) \
- DEFINE_COMPUTED_ASM_MACRO(_KERNEL_CPP_STRUCT_SIZE_##name, sizeof(name));
+ DEFINE_COMPUTED_ASM_MACRO(_KERNEL_CPP_STRUCT_SIZE_##name, sizeof(name));
void
diff --git a/src/system/kernel/posix/xsi_semaphore.cpp
b/src/system/kernel/posix/xsi_semaphore.cpp
index c036f9b783..8938cfa7e3 100644
--- a/src/system/kernel/posix/xsi_semaphore.cpp
+++ b/src/system/kernel/posix/xsi_semaphore.cpp
@@ -1102,7 +1102,7 @@ _user_xsi_semop(int semaphoreID, struct sembuf *ops,
size_t numOps)
TRACE_ERROR(("xsi_semop: failed to allocate sembuf struct\n"));
return B_NO_MEMORY;
}
- MemoryDeleter operationsDeleter(operations);
+ MemoryDeleter operationsDeleter(operations);
if (user_memcpy(operations, ops,
(sizeof(struct sembuf) * numOps)) < B_OK) {
@@ -1172,7 +1172,7 @@ _user_xsi_semop(int semaphoreID, struct sembuf *ops,
size_t numOps)
if (operation != 0)
semaphore->Revert(operation);
}
- if (result != 0)
+ if (result != 0)
return result;
// We have to wait: first enqueue the thread
diff --git a/src/system/kernel/slab/slab_private.h
b/src/system/kernel/slab/slab_private.h
index c9b8d534b0..aa46cd6761 100644
--- a/src/system/kernel/slab/slab_private.h
+++ b/src/system/kernel/slab/slab_private.h
@@ -3,7 +3,7 @@
* Distributed under the terms of the MIT License.
*
* Authors:
- * Hugo Santos, hugosantos@xxxxxxxxx
+ * Hugo Santos, hugosantos@xxxxxxxxx
*/
#ifndef SLAB_PRIVATE_H
#define SLAB_PRIVATE_H
diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp
index c270f38911..8fa4cb36e5 100644
--- a/src/system/kernel/team.cpp
+++ b/src/system/kernel/team.cpp
@@ -2308,7 +2308,7 @@ get_job_control_entry(team_job_control_children&
children, pid_t id)
/*! Returns the first job control entry from one of team's dead, continued,
or
- stopped children which matches \a id.
+ stopped children which matches \a id.
\a id can be:
- \code > 0 \endcode: Matching an entry with that team ID.
- \code == -1 \endcode: Matching any entry.
diff --git a/src/system/kernel/vm/VMUserArea.h
b/src/system/kernel/vm/VMUserArea.h
index cd3b766120..24dd0eeca7 100644
--- a/src/system/kernel/vm/VMUserArea.h
+++ b/src/system/kernel/vm/VMUserArea.h
@@ -34,17 +34,17 @@ private:
struct VMUserAreaGetLink {
- inline DoublyLinkedListLink<VMUserArea>* operator()(
+ inline DoublyLinkedListLink<VMUserArea>* operator()(
VMUserArea* area) const
- {
- return &area->AddressSpaceLink();
- }
+ {
+ return &area->AddressSpaceLink();
+ }
- inline const DoublyLinkedListLink<VMUserArea>* operator()(
+ inline const DoublyLinkedListLink<VMUserArea>* operator()(
const VMUserArea* area) const
- {
- return &area->AddressSpaceLink();
- }
+ {
+ return &area->AddressSpaceLink();
+ }
};
typedef DoublyLinkedList<VMUserArea, VMUserAreaGetLink> VMUserAreaList;
diff --git a/src/system/libroot/os/arch/x86_64/system_time.cpp
b/src/system/libroot/os/arch/x86_64/system_time.cpp
index 47a98240db..e1327c9a62 100644
--- a/src/system/libroot/os/arch/x86_64/system_time.cpp
+++ b/src/system/libroot/os/arch/x86_64/system_time.cpp
@@ -14,32 +14,32 @@ static uint64_t cv_factor_nsec;
extern "C" void
__x86_setup_system_time(uint64_t cv, uint64_t cv_nsec)
{
- cv_factor = cv;
- cv_factor_nsec = cv_nsec;
+ cv_factor = cv;
+ cv_factor_nsec = cv_nsec;
}
static inline uint64_t
rdtsc()
{
- uint64_t lo, hi;
- __asm__("rdtsc" : "=a" (lo), "=d" (hi));
- return lo | (hi << 32);
+ uint64_t lo, hi;
+ __asm__("rdtsc" : "=a" (lo), "=d" (hi));
+ return lo | (hi << 32);
}
extern "C" [[gnu::optimize("omit-frame-pointer")]] int64_t
system_time()
{
- __uint128_t time = static_cast<__uint128_t>(rdtsc()) * cv_factor;
- return time >> 64;
+ __uint128_t time = static_cast<__uint128_t>(rdtsc()) * cv_factor;
+ return time >> 64;
}
extern "C" [[gnu::optimize("omit-frame-pointer")]] int64_t
system_time_nsecs()
{
- __uint128_t t = static_cast<__uint128_t>(rdtsc()) * cv_factor_nsec;
- return t >> 32;
+ __uint128_t t = static_cast<__uint128_t>(rdtsc()) * cv_factor_nsec;
+ return t >> 32;
}
diff --git a/src/system/libroot/os/find_directory.cpp
b/src/system/libroot/os/find_directory.cpp
index 0821b7dbab..6ee1ca22df 100644
--- a/src/system/libroot/os/find_directory.cpp
+++ b/src/system/libroot/os/find_directory.cpp
@@ -518,7 +518,7 @@
DEFINE_LIBROOT_KERNEL_SYMBOL_VERSION("__find_directory_alpha4",
"find_directory@", "BASE");
DEFINE_LIBROOT_KERNEL_SYMBOL_VERSION("__find_directory", "find_directory@@",
- "1_ALPHA5");
+ "1_ALPHA5");
#else // _LOADER_MODE
status_t
__find_directory(directory_which which, dev_t device, bool createIt,
diff --git a/src/system/libroot/os/parsedate.cpp
b/src/system/libroot/os/parsedate.cpp
index 7c9f1c7ff3..5db3fe0259 100644
--- a/src/system/libroot/os/parsedate.cpp
+++ b/src/system/libroot/os/parsedate.cpp
@@ -230,7 +230,7 @@ static const known_identifier kIdentifiers[] = {
{"GMT", NULL, TYPE_TIME_ZONE, FLAG_NONE, UNIT_SECOND, 0},
{"UTC", NULL, TYPE_TIME_ZONE, FLAG_NONE, UNIT_SECOND, 0},
// the following list has been generated from info found at
- // http://www.timegenie.com/timezones
+ // http://www.timegenie.com/timezones
{"ACDT", NULL, TYPE_TIME_ZONE, FLAG_NONE, UNIT_SECOND, 1050 *
36},
{"ACIT", NULL, TYPE_TIME_ZONE, FLAG_NONE, UNIT_SECOND, 800 *
36},
{"ACST", NULL, TYPE_TIME_ZONE, FLAG_NONE, UNIT_SECOND, 950 *
36},
diff --git a/src/system/libroot/os/scheduler.c
b/src/system/libroot/os/scheduler.c
index 4dc16b6225..62f6b9972a 100644
--- a/src/system/libroot/os/scheduler.c
+++ b/src/system/libroot/os/scheduler.c
@@ -3,8 +3,8 @@
* Distributed under the terms of the MIT License.
*
* Authors:
- * Jérôme Duval, korli@xxxxxxxxxxxxxxxxxxxxx.
- * Michael Pfeiffer, laplace@xxxxxxxxxxxxxxxxxxxxx
+ * Jérôme Duval, jerome.duval@xxxxxxxxx
+ * Michael Pfeiffer, laplace@xxxxxxxxxxxxxxxxxxxxx
*/
