From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 3 Nov 2023 08:06:00 +0000 (+0100)
Subject: Fix warning about BSOCK::send()
X-Git-Tag: Beta-15.0.1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf32a06330175e6d43f9c5ec69b1cad0b8161115;p=thirdparty%2Fbacula.git

Fix warning about BSOCK::send()
---

diff --git a/bacula/src/lib/bsockcore.c b/bacula/src/lib/bsockcore.c
index 80b16be2c..6f830a69c 100644
--- a/bacula/src/lib/bsockcore.c
+++ b/bacula/src/lib/bsockcore.c
@@ -534,10 +534,10 @@ void BSOCKCORE::clear_locking()
  */
 bool BSOCKCORE::send()
 {
-   return send(msg, msglen);
+   return send2(msg, msglen);
 }
 
-bool BSOCKCORE::send(char *buf, uint32_t len)
+bool BSOCKCORE::send2(char *buf, uint32_t len)
 {
    int32_t rc;
    bool ok = true;
diff --git a/bacula/src/lib/bsockcore.h b/bacula/src/lib/bsockcore.h
index f7384869c..4913101b2 100644
--- a/bacula/src/lib/bsockcore.h
+++ b/bacula/src/lib/bsockcore.h
@@ -139,7 +139,7 @@ public:
                 char *service, int port, int verbose);
    virtual int32_t recvn(int /*len*/);
    virtual bool send();
-   virtual bool send(char *buf, uint32_t len);
+   virtual bool send2(char *buf, uint32_t len);
    bool fsend(const char*, ...);
    virtual void close();              /* close connection and destroy packet */
    void destroy();                    /* destroy socket packet */
diff --git a/bacula/src/plugins/fd/antivirus-fd.c b/bacula/src/plugins/fd/antivirus-fd.c
index ee037a3bc..4dd8f64fc 100644
--- a/bacula/src/plugins/fd/antivirus-fd.c
+++ b/bacula/src/plugins/fd/antivirus-fd.c
@@ -387,7 +387,7 @@ static bRC pluginIO(bpContext *ctx, struct io_pkt *io)
          //Dmsg(ctx, dbglvl, "verifyplug: writing\n");
          POOLMEM *p = pack_chunk(io->buf, io->count);
          //Dmsg(ctx, dbglvl, "verifyplug: pack_chunk write %d %s\nOuput :%s",io->count, io->buf, p);
-         if (!self->bs->send(p, io->count+sizeof(uint32_t))) {
+         if (!self->bs->send2(p, io->count+sizeof(uint32_t))) {
             Jmsg(ctx, M_ERROR, "INSTREAM WRITE failed: fname=%s ERR=%s\n", self->fname, strerror(errno));
             delete (self->bs);
             self->bs = NULL;
@@ -405,7 +405,7 @@ static bRC pluginIO(bpContext *ctx, struct io_pkt *io)
          self->bs->msglen = 0;
          POOLMEM *p = pack_chunk(self->bs->msg, self->bs->msglen);
          //Dmsg(ctx, dbglvl, "verifyplug: pack_chunk close %d %s\nOuput :%s",io->count, io->buf, p);
-         if (!self->bs->send(p, self->bs->msglen+sizeof(uint32_t))) {
+         if (!self->bs->send2(p, self->bs->msglen+sizeof(uint32_t))) {
             Jmsg(ctx, M_ERROR, "INSTREAM CLOSE failed: fname=%s ERR=%s\n", self->fname, strerror(errno));
             delete (self->bs);
             self->bs = NULL;