Common UP

quinndiggity · Dec 12, 2018 · ada21b4 · ada21b4
1 parent 8223241
commit ada21b4
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 28 deletions.
diff --git a/scripts/pre-commit b/scripts/pre-commit
@@ -1,11 +1,15 @@
 #!/bin/sh
 
-for file in `git diff-index --name-only HEAD`; do
-	case "${file#*.}" in
-	cpp|c|h)
-		clang-format -i "${file}"
-		git add ${file}
-		;;
-	esac
+TOTAL_ERRORS=0
+
+for file in `git diff-index --name-only --diff-filter=d HEAD`; do
+    case "${file#*.}" in
+    cpp|c|h)
+        clang-format -i "${file}"
+        cpplint "${file}"
+        TOTAL_ERRORS=$(expr $TOTAL_ERRORS + $?);
+        ;;
+    esac
 done
 
+exit $TOTAL_ERRORS
diff --git a/src/server/daemon_slave.cpp b/src/server/daemon_slave.cpp
@@ -144,7 +144,7 @@ int main(int argc, char** argv, char** envp) {
   }
   std::string pid_str = common::MemSPrintf("%ld\n", static_cast<long>(daemon_pid));
   size_t writed;
-  err = pidfile.Write(pid_str, &writed);
+  err = pidfile.WriteBuffer(pid_str, &writed);
   if (err) {
     ERROR_LOG() << "Failed to write pid file path: " << PIDFILE_PATH << "; message: " << err->GetDescription();
     return EXIT_FAILURE;

diff --git a/src/server/pipe/pipe_client.cpp b/src/server/pipe/pipe_client.cpp
@@ -28,11 +28,7 @@ common::ErrnoError PipeClient::Write(const void* data, size_t size, size_t* nwri
   return pipe_write_client_->Write(data, size, nwrite_out);
 }
 
-common::ErrnoError PipeClient::Read(char* out, size_t max_size, size_t* nread) {
-  return pipe_read_client_->Read(out, max_size, nread);
-}
-
-common::ErrnoError PipeClient::Read(unsigned char* out, size_t max_size, size_t* nread) {
+common::ErrnoError PipeClient::Read(void* out, size_t max_size, size_t* nread) {
   return pipe_read_client_->Read(out, max_size, nread);
 }
 

diff --git a/src/server/pipe/pipe_client.h b/src/server/pipe/pipe_client.h
@@ -27,23 +27,22 @@ class PipeClient : public common::libev::IoClient {
   PipeClient(common::libev::IoLoop* server, descriptor_t read_fd, descriptor_t write_fd);
   virtual ~PipeClient();
 
-  virtual const char* ClassName() const override;
+  const char* ClassName() const override;
 
-  virtual common::ErrnoError Write(const void* data, size_t size, size_t* nwrite_out) override;
-  virtual common::ErrnoError Read(char* out, size_t max_size, size_t* nread) override;
-  virtual common::ErrnoError Read(unsigned char* out, size_t max_size, size_t* nread) override;
+  common::ErrnoError Write(const void* data, size_t size, size_t* nwrite_out) override;
+  common::ErrnoError Read(void* out, size_t max_size, size_t* nread) override;
 
  protected:
-  virtual descriptor_t GetFd() const override;
+  descriptor_t GetFd() const override;
 
  private:
-  virtual common::ErrnoError DoClose() override;
-
-  DISALLOW_COPY_AND_ASSIGN(PipeClient);
+  common::ErrnoError DoClose() override;
 
   common::libev::PipeReadClient* pipe_read_client_;
   common::libev::PipeWriteClient* pipe_write_client_;
   const descriptor_t read_fd_;
+
+  DISALLOW_COPY_AND_ASSIGN(PipeClient);
 };
 
 typedef protocol::ProtocolClient<PipeClient> ProtocoledPipeClient;

diff --git a/src/utils/arg_converter.cpp b/src/utils/arg_converter.cpp
@@ -14,6 +14,19 @@
 
 #include "utils/arg_converter.h"
 
+#include <string>
+
+namespace common {
+bool ConvertFromString(const std::string& from, std::string* out) {
+  if (!out) {
+    return false;
+  }
+
+  *out = from;
+  return true;
+}
+}  // namespace common
+
 namespace iptv_cloud {
 namespace utils {}  // namespace utils
 }  // namespace iptv_cloud
diff --git a/src/utils/arg_converter.h b/src/utils/arg_converter.h
@@ -14,10 +14,16 @@
 
 #pragma once
 
+#include <string>
+
 #include <common/convert2string.h>
 
 #include "utils/arg_reader.h"
 
+namespace common {
+bool ConvertFromString(const std::string& from, std::string* out) WARN_UNUSED_RESULT;
+}
+
 namespace iptv_cloud {
 namespace utils {
 

diff --git a/src/utils/m3u8_writer.cpp b/src/utils/m3u8_writer.cpp
@@ -27,22 +27,22 @@ common::ErrnoError M3u8Writer::Open(const common::file_system::ascii_file_string
 
 common::ErrnoError M3u8Writer::WriteHeader(uint64_t first_index, size_t target_duration) {
   size_t writed;
-  return file_.Write(common::MemSPrintf("#EXTM3U\n#EXT-X-MEDIA-SEQUENCE:%llu\n#EXT-X-ALLOW-"
-                                        "CACHE:YES\n#EXT-X-VERSION:3\n#EXT-X-"
-                                        "TARGETDURATION:%llu\n",
-                                        first_index, target_duration),
-                     &writed);
+  return file_.WriteBuffer(common::MemSPrintf("#EXTM3U\n#EXT-X-MEDIA-SEQUENCE:%llu\n#EXT-X-ALLOW-"
+                                              "CACHE:YES\n#EXT-X-VERSION:3\n#EXT-X-"
+                                              "TARGETDURATION:%llu\n",
+                                              first_index, target_duration),
+                           &writed);
 }
 
 common::ErrnoError M3u8Writer::WriteLine(const ChunkInfo& chunk) {
   double ftime = chunk.GetDurationInSecconds();
   size_t writed;
-  return file_.Write(common::MemSPrintf("#EXTINF:%.2f,\n%s\n", ftime, chunk.path), &writed);
+  return file_.WriteBuffer(common::MemSPrintf("#EXTINF:%.2f,\n%s\n", ftime, chunk.path), &writed);
 }
 
 common::ErrnoError M3u8Writer::WriteFooter() {
   size_t writed;
-  return file_.Write("#EXT-X-ENDLIST", &writed);
+  return file_.WriteBuffer("#EXT-X-ENDLIST", &writed);
 }
 
 common::ErrnoError M3u8Writer::Close() {