RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 13:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

msg/Pipe: simplify Pipe::tcp_read() return value

Browse Source 
0 for success; no reason to return length (always == len).

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-08-11 08:10:14 -07:00
parent 76954c13c1
commit d58df35f88
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/msg/Pipe.cc
View File

@ -179,8 +179,7 @@ int Pipe::accept()
// identify peer
char banner[strlen(CEPH_BANNER)+1];
rc = tcp_read(banner, strlen(CEPH_BANNER));
if (rc < 0) {
if (tcp_read(banner, strlen(CEPH_BANNER)) < 0) {
ldout(msgr->cct,10) << "accept couldn't read banner" << dendl;
state = STATE_CLOSED;
return -1;
@ -196,8 +195,7 @@ int Pipe::accept()
bufferptr tp(sizeof(peer_addr));
addrbl.push_back(tp);
}
rc = tcp_read(addrbl.c_str(), addrbl.length());
if (rc < 0) {
if (tcp_read(addrbl.c_str(), addrbl.length()) < 0) {
ldout(msgr->cct,10) << "accept couldn't read peer_addr" << dendl;
state = STATE_CLOSED;
return -1;
@ -232,8 +230,7 @@ int Pipe::accept()
int reply_tag = 0;
uint64_t existing_seq = -1;
while (1) {
rc = tcp_read((char*)&connect, sizeof(connect));
if (rc < 0) {
if (tcp_read((char*)&connect, sizeof(connect)) < 0) {
ldout(msgr->cct,10) << "accept couldn't read connect" << dendl;
goto fail_unlocked;
}
@ -632,8 +629,7 @@ int Pipe::connect()
// verify banner
// FIXME: this should be non-blocking, or in some other way verify the banner as we get it.
rc = tcp_read((char*)&banner, strlen(CEPH_BANNER));
if (rc < 0) {
if (tcp_read((char*)&banner, strlen(CEPH_BANNER)) < 0) {
ldout(msgr->cct,2) << "connect couldn't read banner, " << strerror_r(errno, buf, sizeof(buf)) << dendl;
goto fail;
}
@ -658,8 +654,7 @@ int Pipe::connect()
bufferptr p(sizeof(paddr) * 2);
addrbl.push_back(p);
}
rc = tcp_read(addrbl.c_str(), addrbl.length());
if (rc < 0) {
if (tcp_read(addrbl.c_str(), addrbl.length()) < 0) {
ldout(msgr->cct,2) << "connect couldn't read peer addrs, " << strerror_r(errno, buf, sizeof(buf)) << dendl;
goto fail;
}
@ -1104,8 +1099,7 @@ void Pipe::reader()
char buf[80];
char tag = -1;
ldout(msgr->cct,20) << "reader reading tag..." << dendl;
int rc = tcp_read((char*)&tag, 1);
if (rc < 0) {
if (tcp_read((char*)&tag, 1) < 0) {
pipe_lock.Lock();
ldout(msgr->cct,2) << "reader couldn't read tag, " << strerror_r(errno, buf, sizeof(buf)) << dendl;
fault(false, true);

2
src/msg/Pipe.h
View File

@ -243,7 +243,7 @@ class DispatchQueue;
*
* @param buf buffer to read into
* @param len exact number of bytes to read
* @return negative error code, or the number of bytes (always == len) read.
* @return 0 for success, or -1 on error
*/
int tcp_read(char *buf, int len);