Merge pull request d5#24 from tojocky/master

Divan Visagie · Divan Visagie · commit b703f95d748e · 2013-08-18T04:45:53.000-07:00
resolve warnings with clang
diff --git a/native/fs.h b/native/fs.h
@@ -360,7 +360,7 @@ namespace native
     public:
         static bool read(const std::string& path, std::function<void(const std::string& str, error e)> callback)
         {
-            if(!fs::open(path.c_str(), fs::read_only, 0, [=](fs::file_handle fd, error e) {
+            return fs::open(path.c_str(), fs::read_only, 0, [=](fs::file_handle fd, error e) {
                 if(e)
                 {
                     callback(std::string(), e);
@@ -373,12 +373,12 @@ namespace native
                         callback(std::string(), error(uv_last_error(uv_default_loop())));
                     }
                 }
-            })) return false;
+            });
         }
 
         static bool write(const std::string& path, const std::string& str, std::function<void(int nwritten, error e)> callback)
         {
-            if(!fs::open(path.c_str(), fs::write_only|fs::create, 0664, [=](fs::file_handle fd, error e) {
+            return fs::open(path.c_str(), fs::write_only|fs::create, 0664, [=](fs::file_handle fd, error e) {
                 if(e)
                 {
                     callback(0, e);
@@ -391,7 +391,7 @@ namespace native
                         callback(0, error(uv_last_error(uv_default_loop())));
                     }
                 }
-            })) return false;
+            });
         }
     };
 }
diff --git a/native/stream.h b/native/stream.h
@@ -6,6 +6,8 @@
 #include "handle.h"
 #include "callback.h"
 
+#include <algorithm>
+
 namespace native
 {
 	namespace base
@@ -36,22 +38,15 @@ namespace native
 				return read_start<0>(callback);
 			}
 
-			template<int max_alloc_size>
+			template<size_t max_alloc_size>
 			bool read_start(std::function<void(const char* buf, ssize_t len)> callback)
 			{
 				callbacks::store(get()->data, native::internal::uv_cid_read_start, callback);
 
 				return uv_read_start(get<uv_stream_t>(),
 					[](uv_handle_t*, size_t suggested_size){
-						if(!max_alloc_size)
-						{
-							return uv_buf_t { new char[suggested_size], suggested_size };
-						}
-						else
-						{
-							auto size = max_alloc_size > suggested_size ? suggested_size : max_alloc_size;
-							return uv_buf_t { new char[size], size };
-						}
+                        auto size = std::max(suggested_size, max_alloc_size);
+                        return uv_buf_t { new char[size], size };
 					},
 					[](uv_stream_t* s, ssize_t nread, uv_buf_t buf){
 						if(nread < 0)

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ namespace native`
`360`	`360`	`public:`
`361`	`361`	`static bool read(const std::string& path, std::function<void(const std::string& str, error e)> callback)`
`362`	`362`	`{`
`363`		`- if(!fs::open(path.c_str(), fs::read_only, 0, [=](fs::file_handle fd, error e) {`
	`363`	`+ return fs::open(path.c_str(), fs::read_only, 0, [=](fs::file_handle fd, error e) {`
`364`	`364`	`if(e)`
`365`	`365`	`{`
`366`	`366`	`callback(std::string(), e);`
`@@ -373,12 +373,12 @@ namespace native`
`373`	`373`	`callback(std::string(), error(uv_last_error(uv_default_loop())));`
`374`	`374`	`}`
`375`	`375`	`}`
`376`		`- })) return false;`
	`376`	`+ });`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`static bool write(const std::string& path, const std::string& str, std::function<void(int nwritten, error e)> callback)`
`380`	`380`	`{`
`381`		`- if(!fs::open(path.c_str(), fs::write_only\|fs::create, 0664, [=](fs::file_handle fd, error e) {`
	`381`	`+ return fs::open(path.c_str(), fs::write_only\|fs::create, 0664, [=](fs::file_handle fd, error e) {`
`382`	`382`	`if(e)`
`383`	`383`	`{`
`384`	`384`	`callback(0, e);`
`@@ -391,7 +391,7 @@ namespace native`
`391`	`391`	`callback(0, error(uv_last_error(uv_default_loop())));`
`392`	`392`	`}`
`393`	`393`	`}`
`394`		`- })) return false;`
	`394`	`+ });`
`395`	`395`	`}`
`396`	`396`	`};`
`397`	`397`	`}`