projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EventCountTest cleanups
[folly.git]
/
folly
/
FileUtil.h
diff --git
a/folly/FileUtil.h
b/folly/FileUtil.h
index 4939803341215fa78816a593ff56e15d3deffb97..2679f928f1add40886c1e3dfb0b1fe1a23134d08 100644
(file)
--- a/
folly/FileUtil.h
+++ b/
folly/FileUtil.h
@@
-17,8
+17,9
@@
#ifndef FOLLY_FILEUTIL_H_
#define FOLLY_FILEUTIL_H_
#ifndef FOLLY_FILEUTIL_H_
#define FOLLY_FILEUTIL_H_
-#include "folly/Portability.h"
-#include "folly/ScopeGuard.h"
+#include <folly/Conv.h>
+#include <folly/Portability.h>
+#include <folly/ScopeGuard.h>
#include <cassert>
#include <limits>
#include <cassert>
#include <limits>
@@
-36,7
+37,7
@@
namespace folly {
* until all data is written. Note that *Full wrappers weaken the thread
* semantics of underlying system calls.
*/
* until all data is written. Note that *Full wrappers weaken the thread
* semantics of underlying system calls.
*/
-int openNoInt(const char* name, int flags, mode_t mode
=0644
);
+int openNoInt(const char* name, int flags, mode_t mode
= 0666
);
int closeNoInt(int fd);
int dupNoInt(int fd);
int dup2NoInt(int oldfd, int newfd);
int closeNoInt(int fd);
int dupNoInt(int fd);
int dup2NoInt(int oldfd, int newfd);
@@
-122,7
+123,7
@@
bool readFile(const char* file_name, Container& out,
"readFile: only containers with byte-sized elements accepted");
assert(file_name);
"readFile: only containers with byte-sized elements accepted");
assert(file_name);
- const auto fd = open(file_name, O_RDONLY);
+ const auto fd = open
NoInt
(file_name, O_RDONLY);
if (fd == -1) return false;
size_t soFar = 0; // amount of bytes successfully read
if (fd == -1) return false;
size_t soFar = 0; // amount of bytes successfully read
@@
-130,7
+131,7
@@
bool readFile(const char* file_name, Container& out,
assert(out.size() >= soFar); // resize better doesn't throw
out.resize(soFar);
// Ignore errors when closing the file
assert(out.size() >= soFar); // resize better doesn't throw
out.resize(soFar);
// Ignore errors when closing the file
- close(fd);
+ close
NoInt
(fd);
};
// Obtain file size:
};
// Obtain file size:
@@
-144,7
+145,7
@@
bool readFile(const char* file_name, Container& out,
constexpr size_t initialAlloc = 1024 * 4;
out.resize(
std::min(
constexpr size_t initialAlloc = 1024 * 4;
out.resize(
std::min(
- buf.st_size
? buf.st_size + 1
: initialAlloc,
+ buf.st_size
> 0 ? folly::to<size_t>(buf.st_size + 1)
: initialAlloc,
num_bytes));
while (soFar < out.size()) {
num_bytes));
while (soFar < out.size()) {