From: Martin Simmons Date: Sun, 27 Jan 2019 10:30:09 +0000 (+0100) Subject: Apply recv() hide patch from Martin X-Git-Tag: Release-9.4.2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06ab20b0b702dd0edb940e871f3754f6fdae189f;p=thirdparty%2Fbacula.git Apply recv() hide patch from Martin --- diff --git a/bacula/src/lib/bsockcore.c b/bacula/src/lib/bsockcore.c index 2cda1f798..9b68c1d8e 100644 --- a/bacula/src/lib/bsockcore.c +++ b/bacula/src/lib/bsockcore.c @@ -590,7 +590,7 @@ bool BSOCKCORE::fsend(const char *fmt, ...) * Returns number of bytes read (may return zero), the msglen is set accordingly. * Returns -1 on error so msglen will be zero. */ -int32_t BSOCKCORE::recv(int len) +int32_t BSOCKCORE::recvn(int len) { /* The method has to be redesigned from scratch */ int32_t nbytes; diff --git a/bacula/src/lib/bsockcore.h b/bacula/src/lib/bsockcore.h index 695ad38d4..a9cba8519 100644 --- a/bacula/src/lib/bsockcore.h +++ b/bacula/src/lib/bsockcore.h @@ -137,7 +137,7 @@ public: bool connect(JCR * jcr, int retry_interval, utime_t max_retry_time, utime_t heart_beat, const char *name, char *host, char *service, int port, int verbose); - virtual int32_t recv(int /*len*/); + virtual int32_t recvn(int /*len*/); virtual bool send(); bool fsend(const char*, ...); void close(); /* close connection and destroy packet */