File 0431-erl_interface-Silence-CodeChecker-in-ei_co... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0431-erl_interface-Silence-CodeChecker-in-ei_connect.c.patch of Package erlang (Revision c45f22bce6f654206ec2729d74bc90ca)

Currently displaying revision c45f22bce6f654206ec2729d74bc90ca , Show latest

From 8a05240eb8df6dcb86db56f74831b6089716e429 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 11 Feb 2021 12:09:43 +0100
Subject: [PATCH 31/34] erl_interface: Silence CodeChecker in ei_connect.c

and remove unused *version argument to recv_challenge.
---
 lib/erl_interface/src/connect/ei_connect.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 4adba7a6a6..1edf66fabb 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -104,7 +104,7 @@ static int send_challenge(ei_cnode *ec, void *ctx, int pkt_sz,
                           unsigned challenge,
                           DistFlags version, unsigned ms);
 static int recv_challenge(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
-                          unsigned *challenge, unsigned *version,
+                          unsigned *challenge,
 			  DistFlags *flags, char *namebuf, unsigned ms);
 static int send_challenge_reply(ei_socket_callbacks *cbs, void *ctx,
                                 int pkt_sz, unsigned char digest[16], 
@@ -1298,7 +1298,7 @@ static int ei_connect_helper(ei_cnode* ec,
         goto error;
     if (recv_status(ec, ctx, pkt_sz, tmo))
         goto error;
-    if (recv_challenge(cbs, ctx, pkt_sz, &her_challenge, &her_version,
+    if (recv_challenge(cbs, ctx, pkt_sz, &her_challenge,
                        &her_flags, NULL, tmo))
         goto error;
     her_version = (her_flags & DFLAG_HANDSHAKE_23) ? EI_DIST_6 : EI_DIST_5;
@@ -2420,7 +2420,7 @@ static int send_challenge(ei_cnode *ec,
 }
 
 static int recv_challenge(ei_socket_callbacks *cbs, void *ctx,
-                          int pkt_sz, unsigned *challenge, unsigned *version,
+                          int pkt_sz, unsigned *challenge,
 			  DistFlags *flags, char *namebuf, unsigned ms)
 {
     char dbuf[DEFBUF_SIZ];
@@ -2428,6 +2428,7 @@ static int recv_challenge(ei_socket_callbacks *cbs, void *ctx,
     int is_static = 1;
     int buflen = DEFBUF_SIZ;
     int rlen, nodename_len;
+    unsigned version;
     char *s;
     char tag;
     char tmp_nodename[MAXNODELEN+1];
@@ -2449,7 +2450,6 @@ static int recv_challenge(ei_socket_callbacks *cbs, void *ctx,
 	goto error;
     }
     if (tag == 'n') { /* OLD */
-        unsigned int version;
         if (rlen < 1+2+4+4) {
             EI_TRACE_ERR1("recv_challenge","<- RECV_CHALLENGE 'n' packet too short (%d)",
                           rlen)
@@ -2473,7 +2473,7 @@ static int recv_challenge(ei_socket_callbacks *cbs, void *ctx,
                           rlen)
             goto error;
         }
-        *version = EI_DIST_6;
+        version = EI_DIST_6;
         *flags = get64be(s);
         *challenge = get32be(s);
         s += 4; /* ignore peer 'creation' */
@@ -2524,7 +2524,7 @@ static int recv_challenge(ei_socket_callbacks *cbs, void *ctx,
 	    "flags = %u, "
 	    "challenge = %d",
 	    namebuf,
-	    *version,
+	    version,
 	    *flags,
 	    *challenge
 	    );
-- 
2.26.2

Places

File 0431-erl_interface-Silence-CodeChecker-in-ei_connect.c.patch of Package erlang (Revision c45f22bce6f654206ec2729d74bc90ca)

Places