external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine code naming or comments.

Browse source
This commit is contained in:
winlin 2015-07-28 17:56:50 +08:00
parent 3d5fbc7a61
commit 8d86eb6516
5 changed files with 88 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

36
trunk/src/kernel/srs_kernel_file.cpp
View file

@ -46,50 +46,50 @@ SrsFileWriter::~SrsFileWriter()
close();
}
int SrsFileWriter::open(string file)
int SrsFileWriter::open(string p)
{
int ret = ERROR_SUCCESS;
if (fd > 0) {
ret = ERROR_SYSTEM_FILE_ALREADY_OPENED;
srs_error("file %s already opened. ret=%d", _file.c_str(), ret);
srs_error("file %s already opened. ret=%d", path.c_str(), ret);
return ret;
}
int flags = O_CREAT|O_WRONLY|O_TRUNC;
mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH;
if ((fd = ::open(file.c_str(), flags, mode)) < 0) {
if ((fd = ::open(p.c_str(), flags, mode)) < 0) {
ret = ERROR_SYSTEM_FILE_OPENE;
srs_error("open file %s failed. ret=%d", file.c_str(), ret);
srs_error("open file %s failed. ret=%d", p.c_str(), ret);
return ret;
}
_file = file;
path = p;
return ret;
}
int SrsFileWriter::open_append(string file)
int SrsFileWriter::open_append(string p)
{
int ret = ERROR_SUCCESS;
if (fd > 0) {
ret = ERROR_SYSTEM_FILE_ALREADY_OPENED;
srs_error("file %s already opened. ret=%d", _file.c_str(), ret);
srs_error("file %s already opened. ret=%d", path.c_str(), ret);
return ret;
}
int flags = O_APPEND|O_WRONLY;
mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH;
if ((fd = ::open(file.c_str(), flags, mode)) < 0) {
if ((fd = ::open(p.c_str(), flags, mode)) < 0) {
ret = ERROR_SYSTEM_FILE_OPENE;
srs_error("open file %s failed. ret=%d", file.c_str(), ret);
srs_error("open file %s failed. ret=%d", p.c_str(), ret);
return ret;
}
_file = file;
path = p;
return ret;
}
@ -104,7 +104,7 @@ void SrsFileWriter::close()
if (::close(fd) < 0) {
ret = ERROR_SYSTEM_FILE_CLOSE;
srs_error("close file %s failed. ret=%d", _file.c_str(), ret);
srs_error("close file %s failed. ret=%d", path.c_str(), ret);
return;
}
fd = -1;
@ -135,7 +135,7 @@ int SrsFileWriter::write(void* buf, size_t count, ssize_t* pnwrite)
// TODO: FIXME: use st_write.
if ((nwrite = ::write(fd, buf, count)) < 0) {
ret = ERROR_SYSTEM_FILE_WRITE;
srs_error("write to file %s failed. ret=%d", _file.c_str(), ret);
srs_error("write to file %s failed. ret=%d", path.c_str(), ret);
return ret;
}
@ -177,23 +177,23 @@ SrsFileReader::~SrsFileReader()
close();
}
int SrsFileReader::open(string file)
int SrsFileReader::open(string p)
{
int ret = ERROR_SUCCESS;
if (fd > 0) {
ret = ERROR_SYSTEM_FILE_ALREADY_OPENED;
srs_error("file %s already opened. ret=%d", _file.c_str(), ret);
srs_error("file %s already opened. ret=%d", path.c_str(), ret);
return ret;
}
if ((fd = ::open(file.c_str(), O_RDONLY)) < 0) {
if ((fd = ::open(p.c_str(), O_RDONLY)) < 0) {
ret = ERROR_SYSTEM_FILE_OPENE;
srs_error("open file %s failed. ret=%d", file.c_str(), ret);
srs_error("open file %s failed. ret=%d", p.c_str(), ret);
return ret;
}
_file = file;
path = p;
return ret;
}
@ -208,7 +208,7 @@ void SrsFileReader::close()
if (::close(fd) < 0) {
ret = ERROR_SYSTEM_FILE_CLOSE;
srs_error("close file %s failed. ret=%d", _file.c_str(), ret);
srs_error("close file %s failed. ret=%d", path.c_str(), ret);
return;
}
fd = -1;