[haiku-commits] BRANCH mmadia-github.separate-build-environment - src/build/libroot
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 8 Aug 2012 04:49:20 +0200 (CEST)
added 2 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: 095b28bcb06f16a213e469d91eaa04d9ee8ab700
new head: 39c2615f5958ba3e596046824f37751ea5b973e6
----------------------------------------------------------------------------
64fc7b3: Automatic whitespace cleanup. No functional change.
39c2615: Updated header includes. Untested.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
10 files changed, 85 insertions(+), 82 deletions(-)
src/build/libroot/find_directory.cpp | 14 ++++-----
src/build/libroot/fs.cpp | 23 +++++++--------
src/build/libroot/fs_attr_generic.cpp | 15 +++++-----
src/build/libroot/fs_attr_untyped.cpp | 15 +++++-----
src/build/libroot/fs_darwin.cpp | 20 ++++++-------
src/build/libroot/fs_descriptors.cpp | 8 +++---
src/build/libroot/fs_freebsd.cpp | 44 ++++++++++++++---------------
src/build/libroot/misc.cpp | 18 ++++++------
src/build/libroot/sem.cpp | 8 +++---
src/build/libroot/thread.cpp | 2 +-
############################################################################
Commit: 64fc7b33e74623ac455489c54585580938f6fadd
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Tue Aug 7 22:34:54 2012 UTC
Automatic whitespace cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/src/build/libroot/fs_freebsd.cpp b/src/build/libroot/fs_freebsd.cpp
index 648650e..243a0ae 100644
--- a/src/build/libroot/fs_freebsd.cpp
+++ b/src/build/libroot/fs_freebsd.cpp
@@ -40,11 +40,11 @@ haiku_freebsd_read(int fd, void *buf, size_t nbytes)
off_t seekDiff = (sectorSize - (cur % sectorSize)) % sectorSize;
off_t nbytesDiff = (nbytes - seekDiff) % sectorSize;
-
+
if (seekDiff == 0 && nbytesDiff == 0) {
// Not needed but this saves malloc and free operations
return read(fd, buf, nbytes);
-
+
} else if (cur % sectorSize + nbytes <= sectorSize) {
// Read complete in only a block
char* tmpBlock = (char*)malloc(sectorSize);
@@ -63,14 +63,14 @@ haiku_freebsd_read(int fd, void *buf, size_t nbytes)
}
free(tmpBlock);
-
+
return nbytes;
} else {
// Needs to write more than a block
char* tmpBlock = (char*)malloc(sectorSize);
-
+
// First block if seek isn't
if (seekDiff > 0) {
// read entire block at 0 pos
@@ -83,7 +83,7 @@ haiku_freebsd_read(int fd, void *buf, size_t nbytes)
perror("read seekDiff");
// alter content
memcpy(buf, tmpBlock + (sectorSize - seekDiff),
seekDiff);
-
+
}
// Blocks between
@@ -91,7 +91,7 @@ haiku_freebsd_read(int fd, void *buf, size_t nbytes)
if (read(fd, ((char*)buf) + seekDiff, nbytes - seekDiff
- nbytesDiff) == -1)
perror("read between");
}
-
+
// Last block if overflow
if (nbytesDiff > 0 ) {
@@ -107,7 +107,7 @@ haiku_freebsd_read(int fd, void *buf, size_t nbytes)
}
free(tmpBlock);
-
+
return nbytes;
}
@@ -138,7 +138,7 @@ haiku_freebsd_write(int fd, const void *buf, size_t nbytes)
if (seekDiff == 0 && nbytesDiff == 0) {
// Not needed but this saves malloc and free operations
return write(fd, buf, nbytes);
-
+
} else if (cur % sectorSize + nbytes <= sectorSize) {
// Write complete in only a block
char* tmpBlock = (char*)malloc(sectorSize);
@@ -157,14 +157,14 @@ haiku_freebsd_write(int fd, const void *buf, size_t
nbytes)
perror("lseek2 oneblock");
free(tmpBlock);
-
+
return nbytes;
} else {
// Needs to write more than a block
char* tmpBlock = (char*)malloc(sectorSize);
-
+
// First block if seek isn't
if (seekDiff > 0) {
// read entire block at 0 pos
@@ -179,7 +179,7 @@ haiku_freebsd_write(int fd, const void *buf, size_t nbytes)
memcpy(tmpBlock + (sectorSize - seekDiff), buf,
seekDiff);
if (write(fd, tmpBlock, sectorSize)==-1)
perror("write seekDiff");
-
+
}
// Blocks between
@@ -187,7 +187,7 @@ haiku_freebsd_write(int fd, const void *buf, size_t nbytes)
if (write(fd, ((char*)buf) + seekDiff, nbytes -
seekDiff - nbytesDiff) == -1)
perror("write between");
}
-
+
// Last block if overflow
if (nbytesDiff > 0) {
@@ -205,7 +205,7 @@ haiku_freebsd_write(int fd, const void *buf, size_t nbytes)
}
free(tmpBlock);
-
+
return nbytes;
}
############################################################################
Commit: 39c2615f5958ba3e596046824f37751ea5b973e6
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Tue Aug 7 22:37:21 2012 UTC
Updated header includes. Untested.
----------------------------------------------------------------------------
diff --git a/src/build/libroot/find_directory.cpp
b/src/build/libroot/find_directory.cpp
index 061ecf7..c04b0b2 100644
--- a/src/build/libroot/find_directory.cpp
+++ b/src/build/libroot/find_directory.cpp
@@ -7,15 +7,15 @@
*/
-#include <FindDirectory.h>
+#include <target_FindDirectory.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <target_errno.h>
+#include <target_string.h>
+#include <sys/target_stat.h>
+#include <target_stdlib.h>
+#include <target_unistd.h>
-#include <StorageDefs.h>
+#include <target_StorageDefs.h>
#ifndef HAIKU_BUILD_GENERATED_DIRECTORY
diff --git a/src/build/libroot/fs.cpp b/src/build/libroot/fs.cpp
index 3747777..9e2ab01 100644
--- a/src/build/libroot/fs.cpp
+++ b/src/build/libroot/fs.cpp
@@ -8,22 +8,23 @@
#include "fs_impl.h"
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <utime.h>
-#include <sys/stat.h>
-#include <sys/time.h>
+#include <target_dirent.h>
+#include <target_errno.h>
+#include <target_fcntl.h>
+#include <target_stdio.h>
+#include <target_stdlib.h>
+#include <target_string.h>
+#include <target_unistd.h>
+#include <target_utime.h>
+#include <sys/target_stat.h>
+#include <sys/target_time.h>
#include <map>
#include <string>
#include <fs_attr.h>
-#include <NodeMonitor.h> // for B_STAT_* flags
+#include <target_NodeMonitor.h> // for B_STAT_* flags
+// NOTE: #8730 -- does syscalls.h need to be target_syscalls.h?
#include <syscalls.h>
#include "fs_descriptors.h"
diff --git a/src/build/libroot/fs_attr_generic.cpp
b/src/build/libroot/fs_attr_generic.cpp
index 3db1968..dcb47a1 100644
--- a/src/build/libroot/fs_attr_generic.cpp
+++ b/src/build/libroot/fs_attr_generic.cpp
@@ -1,14 +1,15 @@
//#include <BeOSBuildCompatibility.h>
+// NOTE: #8730 -- does syscalls.h need to be target_syscalls.h?
#include <syscalls.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <target_dirent.h>
+#include <target_errno.h>
+#include <target_fcntl.h>
+#include <target_stdio.h>
+#include <target_stdlib.h>
+#include <target_unistd.h>
+#include <sys/target_stat.h>
#include <string>
diff --git a/src/build/libroot/fs_attr_untyped.cpp
b/src/build/libroot/fs_attr_untyped.cpp
index e47b30c..1c07567 100644
--- a/src/build/libroot/fs_attr_untyped.cpp
+++ b/src/build/libroot/fs_attr_untyped.cpp
@@ -18,19 +18,20 @@
# define B_NO_MEMORY ENOMEM
#else
//# include <BeOSBuildCompatibility.h>
+// NOTE: #8730 -- does syscalls.h need to be target_syscalls.h?
# include <syscalls.h>
# include "fs_impl.h"
# include "fs_descriptors.h"
#endif
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <target_dirent.h>
+#include <target_errno.h>
+#include <target_fcntl.h>
+#include <target_stdio.h>
+#include <target_stdlib.h>
+#include <target_unistd.h>
+#include <sys/target_stat.h>
#include <map>
#include <string>
diff --git a/src/build/libroot/fs_darwin.cpp b/src/build/libroot/fs_darwin.cpp
index 89eb244..a87ac43 100644
--- a/src/build/libroot/fs_darwin.cpp
+++ b/src/build/libroot/fs_darwin.cpp
@@ -7,16 +7,16 @@
#include "fs_darwin.h"
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
+#include <target_dirent.h>
+#include <target_errno.h>
+#include <target_fcntl.h>
+#include <target_stdio.h>
+#include <target_stdlib.h>
+#include <target_string.h>
+#include <sys/target_param.h>
+#include <sys/target_stat.h>
+#include <sys/target_time.h>
+#include <target_unistd.h>
// Private helper functions
diff --git a/src/build/libroot/fs_descriptors.cpp
b/src/build/libroot/fs_descriptors.cpp
index 6b1017a..a9eca07 100644
--- a/src/build/libroot/fs_descriptors.cpp
+++ b/src/build/libroot/fs_descriptors.cpp
@@ -16,10 +16,10 @@
#include <map>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <target_fcntl.h>
+#include <target_stdio.h>
+#include <target_stdlib.h>
+#include <target_unistd.h>
#include <fs_attr.h>
diff --git a/src/build/libroot/fs_freebsd.cpp b/src/build/libroot/fs_freebsd.cpp
index 243a0ae..8315a50 100644
--- a/src/build/libroot/fs_freebsd.cpp
+++ b/src/build/libroot/fs_freebsd.cpp
@@ -6,16 +6,16 @@
#include "fs_freebsd.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <target_errno.h>
+#include <target_fcntl.h>
+#include <target_stdio.h>
+#include <target_stdlib.h>
+#include <target_string.h>
#include <sys/disk.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
+#include <sys/target_ioctl.h>
+#include <sys/target_stat.h>
+#include <sys/target_time.h>
+#include <target_unistd.h>
// Read and write operations in FreeBSD only work on devices block by block.
diff --git a/src/build/libroot/misc.cpp b/src/build/libroot/misc.cpp
index b11a324..ad9d540 100644
--- a/src/build/libroot/misc.cpp
+++ b/src/build/libroot/misc.cpp
@@ -1,16 +1,16 @@
//#include <BeOSBuildCompatibility.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/time.h>
+#include <target_errno.h>
+#include <target_stdio.h>
+#include <target_stdlib.h>
+#include <target_unistd.h>
+#include <sys/target_stat.h>
+#include <sys/target_time.h>
-#include <Debug.h>
-#include <image.h>
-#include <OS.h>
+#include <target_Debug.h>
+#include <target_image.h>
+#include <target_OS.h>
mode_t __gUmask = 022;
diff --git a/src/build/libroot/sem.cpp b/src/build/libroot/sem.cpp
index 1a9116b..6b41e68 100644
--- a/src/build/libroot/sem.cpp
+++ b/src/build/libroot/sem.cpp
@@ -1,11 +1,11 @@
//#include <BeOSBuildCompatibility.h>
-#include <stdlib.h>
-#include <string.h>
+#include <target_stdlib.h>
+#include <target_string.h>
-#include <OS.h>
-#include <SupportDefs.h>
+#include <target_OS.h>
+#include <target_SupportDefs.h>
// We assume that everything is single-threaded, so we don't need real
// semaphores. Simple fakes are sufficient.
diff --git a/src/build/libroot/thread.cpp b/src/build/libroot/thread.cpp
index 2441c48..2139644 100644
--- a/src/build/libroot/thread.cpp
+++ b/src/build/libroot/thread.cpp
@@ -1,7 +1,7 @@
//#include <BeOSBuildCompatibility.h>
-#include <OS.h>
+#include <target_OS.h>
static const thread_id kMainThreadID = 3;
Other related posts:
