trival problem fix for SrsFilterWriter

Author: bluestn

trunk/src/app/srs_app_dvr.cpp

@@ -96,7 +96,7 @@ srs_error_t SrsDvrSegmenter::open()
     }
 
     // set libc file write cache buffer size
-    if ((err = fs->srs_set_iobuf_size(65536)) != srs_success) {
+    if ((err = fs->set_iobuf_size(65536)) != srs_success) {
         return srs_error_wrap(err, "set iobuf size for file %s", path.c_str());
     }
 

trunk/src/kernel/srs_kernel_file.cpp

@@ -28,7 +28,7 @@ srs_close_t _srs_close_fn = ::close;
 
 SrsFileWriter::SrsFileWriter()
 {
-    fd_  = NULL;
+    fp_  = NULL;
     buf_ = NULL;
 }
 
@@ -39,26 +39,27 @@ SrsFileWriter::~SrsFileWriter()
 }
 
 
-srs_error_t SrsFileWriter::srs_set_iobuf_size(int size)
+srs_error_t SrsFileWriter::set_iobuf_size(int size)
 {
     srs_error_t err = srs_success;
 
-    if (fd_ == NULL){
+    if (fp_ == NULL) {
         return srs_error_new(ERROR_SYSTEM_FILE_NOT_OPEN, "file %s is not opened", path_.c_str());
     }
 
     srs_freepa(buf_);
 
     int ret;
 
-    if (size > 0){
+    if (size > 0) {
         buf_ = new char[size];
-        ret = setvbuf(fd_, buf_, _IOFBF, size);
-    }else{
-        ret = setvbuf(fd_, NULL, _IONBF, size);
+        ret = setvbuf(fp_, buf_, _IOFBF, size);
+    }
+    else {
+        ret = setvbuf(fp_, NULL, _IONBF, size);
     }
 
-    if (ret != 0){
+    if (ret != 0) {
         return srs_error_new(ERROR_SYSTEM_FILE_SETVBUF, "file %s set vbuf error", path_.c_str());
     }
 
@@ -70,11 +71,11 @@ srs_error_t SrsFileWriter::open(string p)
 {
     srs_error_t err = srs_success;
 
-    if (fd_ != NULL) {
+    if (fp_ != NULL) {
         return srs_error_new(ERROR_SYSTEM_FILE_ALREADY_OPENED, "file %s already opened", p.c_str());
     }
 
-    if ((fd_ = fopen(p.c_str(), "wb")) == NULL) {
+    if ((fp_ = fopen(p.c_str(), "wb")) == NULL) {
         return srs_error_new(ERROR_SYSTEM_FILE_OPENE, "open file %s failed", p.c_str());
     }
 
@@ -87,11 +88,11 @@ srs_error_t SrsFileWriter::open_append(string p)
 {
     srs_error_t err = srs_success;
 
-    if (fd_ != NULL) {
+    if (fp_ != NULL) {
         return srs_error_new(ERROR_SYSTEM_FILE_ALREADY_OPENED, "file %s already opened", p.c_str());
     }
 
-    if ((fd_ = fopen(p.c_str(), "ab")) == NULL) {
+    if ((fp_ = fopen(p.c_str(), "ab")) == NULL) {
         return srs_error_new(ERROR_SYSTEM_FILE_OPENE, "open file %s failed", p.c_str());
     }
 
@@ -102,52 +103,52 @@ srs_error_t SrsFileWriter::open_append(string p)
 
 void SrsFileWriter::close()
 {
-    if (fd_ ==  NULL) {
+    if (fp_ ==  NULL) {
         return;
     }
 
-    if (fclose(fd_) < 0) {
+    if (fclose(fp_) < 0) {
         srs_warn("close file %s failed", path_.c_str());
     }
-    fd_ = NULL;
+    fp_ = NULL;
 
     return;
 }
 
 bool SrsFileWriter::is_open()
 {
-    return fd_ != NULL;
+    return fp_ != NULL;
 }
 
 void SrsFileWriter::seek2(int64_t offset)
 {
     srs_assert(is_open());
 
-    int r0 = fseek(fd_, (long)offset, SEEK_SET);
+    int r0 = fseek(fp_, (long)offset, SEEK_SET);
     srs_assert(r0 != -1);
 }
 
 int64_t SrsFileWriter::tellg()
 {
     srs_assert(is_open());
 
-    return ftell(fd_);
+    return ftell(fp_);
 }
 
 srs_error_t SrsFileWriter::write(void* buf, size_t count, ssize_t* pnwrite)
 {
     srs_error_t err = srs_success;
 
-    if (fd_ == NULL) {
+    if (fp_ == NULL) {
         return srs_error_new(ERROR_SYSTEM_FILE_NOT_OPEN, "file %s is not opened", path_.c_str());
     }
 
-    size_t n = fwrite(buf, 1, count, fd_);
-    if (n != count){
+    size_t n = fwrite(buf, 1, count, fp_);
+    if (n != count) {
         return srs_error_new(ERROR_SYSTEM_FILE_WRITE, "write to file %s failed", path_.c_str());
     }
 
-    if (pnwrite != NULL){
+    if (pnwrite != NULL) {
         *pnwrite = (ssize_t)n;
     }
 
@@ -162,7 +163,7 @@ srs_error_t SrsFileWriter::writev(const iovec* iov, int iovcnt, ssize_t* pnwrite
     for (int i = 0; i < iovcnt; i++) {
         const iovec* piov = iov + i;
         ssize_t this_nwrite = 0;
-        if ((err = write(piov->iov_base, piov->iov_len, &this_nwrite)) != NULL) {
+        if ((err = write(piov->iov_base, piov->iov_len, &this_nwrite)) != srs_success) {
             return srs_error_wrap(err, "writev");
         }
         nwrite += this_nwrite;
@@ -179,12 +180,12 @@ srs_error_t SrsFileWriter::lseek(off_t offset, int whence, off_t* seeked)
 {
     srs_assert(is_open());
 
-    if (fseek(fd_, (long)offset, whence) == -1) {
+    if (fseek(fp_, (long)offset, whence) == -1) {
         return srs_error_new(ERROR_SYSTEM_FILE_SEEK, "seek file");
     }
 
     if (seeked) {
-        *seeked = ftell(fd_);
+        *seeked = ftell(fp_);
     }
 
     return srs_success;

trunk/src/kernel/srs_kernel_file.hpp

@@ -27,7 +27,7 @@ class SrsFileWriter : public ISrsWriteSeeker
 {
 private:
     std::string path_;
-    FILE *fd_;
+    FILE *fp_;
     char *buf_;
 public:
     SrsFileWriter();
@@ -36,7 +36,7 @@ class SrsFileWriter : public ISrsWriteSeeker
     /**
      * set io buf size
     */
-   virtual srs_error_t srs_set_iobuf_size(int size);
+   virtual srs_error_t set_iobuf_size(int size);
 
     /**
      * open file writer, in truncate mode.

trunk/src/utest/srs_utest_kernel.cpp

@@ -4248,7 +4248,7 @@ VOID TEST(KernelFileTest, SeekCase)
 	SrsFileWriter w;
 	HELPER_EXPECT_SUCCESS(w.open(filepath.c_str()));
 
-    HELPER_EXPECT_SUCCESS(w.srs_set_iobuf_size(65536));
+	HELPER_EXPECT_SUCCESS(w.set_iobuf_size(65536));
 
 	SrsFileReader r;
 	HELPER_EXPECT_SUCCESS(r.open(filepath.c_str()));
@@ -4257,11 +4257,11 @@ VOID TEST(KernelFileTest, SeekCase)
 	HELPER_EXPECT_SUCCESS(w.write((void*)"Hello", 5, &nn));
 	EXPECT_EQ(5, nn);
 
-    // over 4g file test
-    long seek_pos = 0x100000002l;
-    off_t pos;  
-    HELPER_EXPECT_SUCCESS(w.lseek(seek_pos, SEEK_SET, &pos));
-    EXPECT_EQ(seek_pos, pos);
+	// over 4g file test
+	long seek_pos = 0x100000002l;
+	off_t pos;  
+	HELPER_EXPECT_SUCCESS(w.lseek(seek_pos, SEEK_SET, &pos));
+	EXPECT_EQ(seek_pos, pos);
 
 	HELPER_EXPECT_SUCCESS(w.write((void*)"World", 5, &nn));
 	EXPECT_EQ(5, nn);