[haiku-commits] haiku: hrev49501 - headers/private/kernel/util src/system/kernel/lib headers/private/kernel docs/user/support

  • From: mmlr@xxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 2 Aug 2015 23:18:41 +0200 (CEST)

hrev49501 adds 2 changesets to branch 'master'
old head: 31afee27730f7d80a2b92ae80505b5264fe0f59e
new head: 86b58866404aa1dbc70b88d388f5fc13b4cc9656
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=86b58866404a+%5E31afee27730f

----------------------------------------------------------------------------

f9a8f3e72773: Clean up various whitespace and fix one header guard.

86b58866404a: BReferenceable docs: Fix a typo and one obvious mixup.

[ Michael Lotz <mmlr@xxxxxxxx> ]

----------------------------------------------------------------------------

8 files changed, 31 insertions(+), 31 deletions(-)
docs/user/support/Referenceable.dox | 4 ++--
headers/private/kernel/file_cache.h | 2 +-
headers/private/kernel/util/BitUtils.h | 2 +-
headers/private/kernel/util/Constructor.h | 12 +++++-----
.../private/kernel/util/MallocFreeAllocator.h | 4 ++--
headers/private/kernel/util/OpenHashTable.h | 2 +-
headers/private/kernel/util/SplayTree.h | 24 ++++++++++----------
src/system/kernel/lib/Jamfile | 12 +++++-----

############################################################################

Commit: f9a8f3e72773095d5d7b2f2e1ff3eb3e58122f14
URL: http://cgit.haiku-os.org/haiku/commit/?id=f9a8f3e72773
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sun Jul 5 09:41:32 2015 UTC

Clean up various whitespace and fix one header guard.

----------------------------------------------------------------------------

diff --git a/headers/private/kernel/file_cache.h
b/headers/private/kernel/file_cache.h
index 3454aeb..3e8fee2 100644
--- a/headers/private/kernel/file_cache.h
+++ b/headers/private/kernel/file_cache.h
@@ -20,7 +20,7 @@
#define CACHE_MODULES_NAME "file_cache"

#define FILE_CACHE_SEQUENTIAL_ACCESS 0x01
-#define FILE_CACHE_LOADED_COMPLETELY 0x02
+#define FILE_CACHE_LOADED_COMPLETELY 0x02
#define FILE_CACHE_NO_IO 0x04

struct cache_module_info {
diff --git a/headers/private/kernel/util/BitUtils.h
b/headers/private/kernel/util/BitUtils.h
index 55191d0..43dab01 100644
--- a/headers/private/kernel/util/BitUtils.h
+++ b/headers/private/kernel/util/BitUtils.h
@@ -56,5 +56,5 @@ log2(uint32 v)
}


-#endif // KERNEL_UTIL_RANDOM_H
+#endif // KERNEL_UTIL_BITUTIL_H

diff --git a/headers/private/kernel/util/Constructor.h
b/headers/private/kernel/util/Constructor.h
index 796b66b..4c46cbe 100644
--- a/headers/private/kernel/util/Constructor.h
+++ b/headers/private/kernel/util/Constructor.h
@@ -10,7 +10,7 @@ public:
typedef const DataType* ConstPointer;
typedef DataType& Reference;
typedef const DataType& ConstReference;
-
+
/*! Constructs the object pointed to by \a object via a
zero-parameter constructor.
*/
@@ -19,7 +19,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType();
}
-
+
/*! Constructs the object pointed to by \a object via a
one-parameter constructor using the given argument.
*/
@@ -29,7 +29,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1);
}
-
+
/*! Constructs the object pointed to by \a object via a
two-parameter constructor using the given arguments.
*/
@@ -39,7 +39,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1,
arg2);
}
-
+
/*! Constructs the object pointed to by \a object via a
three-parameter constructor using the given arguments.
*/
@@ -49,7 +49,7 @@ public:
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1,
arg2, arg3);
}
-
+
/*! Constructs the object pointed to by \a object via a
four-parameter constructor using the given arguments.
*/
@@ -60,7 +60,7 @@ public:
ArgType4 arg4) {
if (object)
new(reinterpret_cast<void*>(object)) DataType(arg1,
arg2, arg3, arg4);
- }
+ }

/*! Calls the destructor for the object pointed to be \a object.
*/
diff --git a/headers/private/kernel/util/MallocFreeAllocator.h
b/headers/private/kernel/util/MallocFreeAllocator.h
index 5947f4b..12eb665 100644
--- a/headers/private/kernel/util/MallocFreeAllocator.h
+++ b/headers/private/kernel/util/MallocFreeAllocator.h
@@ -12,14 +12,14 @@ public:
typedef const DataType* ConstPointer;
typedef DataType& Reference;
typedef const DataType& ConstReference;
-
+
/*! malloc()'s an object of type \c DataType and returns a
pointer to it.
*/
Pointer Allocate() {
return reinterpret_cast<Pointer>(malloc(sizeof(DataType)));
}
-
+
/*! free()'s the given object.
*/
void Deallocate(Pointer object) {
diff --git a/headers/private/kernel/util/OpenHashTable.h
b/headers/private/kernel/util/OpenHashTable.h
index 9f54849..bb1479c 100644
--- a/headers/private/kernel/util/OpenHashTable.h
+++ b/headers/private/kernel/util/OpenHashTable.h
@@ -74,7 +74,7 @@ struct MallocAllocator {
* stored in a linked list. The table may be made to adjust its number of slots
* depending on the load factor (this should be enabled unless the object is to
* be used at times where memory allocations aren't possible, such as code
- * called byt he memory allocator).
+ * called by the memory allocator).
*
* The link between entries is part of the ValueType stored items, which makes
* sure the table can always accept new items and will never fail because it is
diff --git a/headers/private/kernel/util/SplayTree.h
b/headers/private/kernel/util/SplayTree.h
index 551a7a4..4a2c8c7 100644
--- a/headers/private/kernel/util/SplayTree.h
+++ b/headers/private/kernel/util/SplayTree.h
@@ -117,7 +117,7 @@ public:
}

return node;
- }
+ }

/*!
Remove from the tree.
@@ -143,7 +143,7 @@ public:
}

return true;
- }
+ }

/*!
Find the smallest item in the tree.
@@ -163,9 +163,9 @@ public:
return node;
}

- /*!
+ /*!
Find the largest item in the tree.
- */
+ */
Node* FindMax()
{
if (fRoot == NULL)
@@ -179,9 +179,9 @@ public:
_Splay(Definition::GetKey(node));

return node;
- }
+ }

- /*!
+ /*!
Find an item in the tree.
*/
Node* Lookup(const Key& key)
@@ -192,14 +192,14 @@ public:
_Splay(key);

return Definition::Compare(key, fRoot) == 0 ? fRoot : NULL;
- }
+ }

Node* Root() const
{
return fRoot;
}

- /*!
+ /*!
Test if the tree is logically empty.
\return true if empty, false otherwise.
*/
@@ -267,16 +267,16 @@ private:

_Splay(key) does the splay operation on the given key.
If key is in the tree, then the node containing
- that key becomes the root. If key is not in the tree,
+ that key becomes the root. If key is not in the tree,
then after the splay, key.root is either the greatest key
< key in the tree, or the least key > key in the tree.

This means, among other things, that if you splay with
a key that's larger than any in the tree, the rightmost
- node of the tree becomes the root. This property is used
+ node of the tree becomes the root. This property is used
in the Remove() method.
*/
- void _Splay(const Key& key) {
+ void _Splay(const Key& key) {
Link headerLink;
headerLink.left = headerLink.right = NULL;

@@ -554,7 +554,7 @@ public:
return fTree.Root();
}

- /*!
+ /*!
Test if the tree is logically empty.
\return true if empty, false otherwise.
*/
diff --git a/src/system/kernel/lib/Jamfile b/src/system/kernel/lib/Jamfile
index cfb7b2a..e890322 100644
--- a/src/system/kernel/lib/Jamfile
+++ b/src/system/kernel/lib/Jamfile
@@ -46,12 +46,12 @@ SEARCH_SOURCE += [ FDirName $(posixSources) unistd ] ;

KernelMergeObject kernel_lib_posix.o :
# main
- kernel_errno.cpp
- dirent.c
+ kernel_errno.cpp
+ dirent.c
fcntl.cpp
- poll.c
- utime.c
- # locale
+ poll.c
+ utime.c
+ # locale
ctype.cpp
localeconv.cpp
LocaleData.cpp
@@ -76,7 +76,7 @@ KernelMergeObject kernel_lib_posix.o :
mkdir.c
select.c
gettimeofday.c
- uio.c
+ uio.c
# time
time.c
# unistd

############################################################################

Revision: hrev49501
Commit: 86b58866404aa1dbc70b88d388f5fc13b4cc9656
URL: http://cgit.haiku-os.org/haiku/commit/?id=86b58866404a
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sun Jul 26 19:05:54 2015 UTC

BReferenceable docs: Fix a typo and one obvious mixup.

----------------------------------------------------------------------------

diff --git a/docs/user/support/Referenceable.dox
b/docs/user/support/Referenceable.dox
index d581576..2504a1d 100644
--- a/docs/user/support/Referenceable.dox
+++ b/docs/user/support/Referenceable.dox
@@ -28,7 +28,7 @@

The C++ language provides two main ways of allocating objects: on the
stack,
and on the heap. Objects created on the heap must be managed by the
- application and deleted when they are not needed. Objects allocatede on
the
+ application and deleted when they are not needed. Objects allocated on
the
stack have a lifetime limited to the execution of the block they are
declared in.

@@ -197,7 +197,7 @@

The reference to the previously targetted object is released.
A reference to the new object is acquired only if \p alreadyHasReference
- is true.
+ is false.
*/




Other related posts:

  • » [haiku-commits] haiku: hrev49501 - headers/private/kernel/util src/system/kernel/lib headers/private/kernel docs/user/support - mmlr