hrev53105 adds 2 changesets to branch 'master'
old head: 02079c66f3cff4cced9df077650aec79696aee6f
new head: 740904976518f181a63f27d6a657dc0cab467c71
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=740904976518+%5E02079c66f3cf
----------------------------------------------------------------------------
1b48852e84e7: Fix doxygen + whitespace
Change-Id: Ief0b2646e95841604a0396f15a054ff2086db198
740904976518: Fix warning
Change-Id: I83250cc76a709404c52b91c992abb64f162e259b
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 5 insertions(+), 4 deletions(-)
src/kits/interface/InterfaceDefs.cpp | 6 +++---
src/system/libroot/posix/malloc/wrapper.cpp | 3 ++-
############################################################################
Commit: 1b48852e84e7e3c6f19072bc50e405965d9926ad
URL: https://git.haiku-os.org/haiku/commit/?id=1b48852e84e7
Author: François Revol <revol@xxxxxxx>
Date: Thu May 2 00:48:07 2019 UTC
Fix doxygen + whitespace
Change-Id: Ief0b2646e95841604a0396f15a054ff2086db198
----------------------------------------------------------------------------
diff --git a/src/kits/interface/InterfaceDefs.cpp
b/src/kits/interface/InterfaceDefs.cpp
index 4ad19fa81c..ec9fce2481 100644
--- a/src/kits/interface/InterfaceDefs.cpp
+++ b/src/kits/interface/InterfaceDefs.cpp
@@ -1336,7 +1336,7 @@ namespace BPrivate {
/*! \brief queries the server for the current decorator
- \param ref entry_ref into which to store current decorator's location
+ \param path BString into which to store current decorator's location
\return boolean true/false
*/
bool
@@ -1349,12 +1349,12 @@ get_decorator(BString& path)
if (link.FlushWithReply(code) != B_OK || code != B_OK)
return false;
- return link.ReadString(path) == B_OK;
+ return link.ReadString(path) == B_OK;
}
/*! \brief Private function which sets the window decorator for the system.
- \param entry_ref to the decorator to set
+ \param path BString with the path to the decorator to set
Will return detailed error status via status_t
*/
############################################################################
Revision: hrev53105
Commit: 740904976518f181a63f27d6a657dc0cab467c71
URL: https://git.haiku-os.org/haiku/commit/?id=740904976518
Author: François Revol <revol@xxxxxxx>
Date: Thu May 2 19:27:30 2019 UTC
Fix warning
Change-Id: I83250cc76a709404c52b91c992abb64f162e259b
----------------------------------------------------------------------------
diff --git a/src/system/libroot/posix/malloc/wrapper.cpp
b/src/system/libroot/posix/malloc/wrapper.cpp
index 67f96af89c..b1ce8008e3 100644
--- a/src/system/libroot/posix/malloc/wrapper.cpp
+++ b/src/system/libroot/posix/malloc/wrapper.cpp
@@ -352,9 +352,10 @@ calloc(size_t nelem, size_t elsize)
goto ok;
if (size < (nelem * size)&& size < (elsize * size))
goto nomem;
-#endif
ok:
+#endif
+
defer_signals();
ptr = pHeap->getHeap(pHeap->getHeapIndex()).malloc(size);
