Remove unneeded switch statement to fix warning

https://github.com/openssl/openssl/issues/10958

CLA: trivial

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11125)

diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c
index aef9a85459b3a0b45ab1c5a4f35d48bafccefa7e..5f9d3f094bc0507ed819a0980a3753c138a1f404 100644 (file)
--- a/crypto/evp/bio_b64.c
+++ b/crypto/evp/bio_b64.c
@@ -534,17 +534,12 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
 
 static long b64_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {
 
 static long b64_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {

-    long ret = 1;

     BIO *next = BIO_next(b);
 
     if (next == NULL)
         return 0;
     BIO *next = BIO_next(b);
 
     if (next == NULL)
         return 0;

-    switch (cmd) {
-    default:
-        ret = BIO_callback_ctrl(next, cmd, fp);
-        break;
-    }
-    return ret;
+
+    return BIO_callback_ctrl(next, cmd, fp);

 }
 
 static int b64_puts(BIO *b, const char *str)
 }
 
 static int b64_puts(BIO *b, const char *str)

diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index 9fa10ebff69455ac24a09822220746224a2554de..e780135b3d0c32ecd1f6e62e7e802d46ac230549 100644 (file)
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -388,17 +388,12 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
 
 static long enc_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {
 
 static long enc_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {

-    long ret = 1;

     BIO *next = BIO_next(b);
 
     if (next == NULL)
         return 0;
     BIO *next = BIO_next(b);
 
     if (next == NULL)
         return 0;

-    switch (cmd) {
-    default:
-        ret = BIO_callback_ctrl(next, cmd, fp);
-        break;
-    }
-    return ret;
+    
+    return BIO_callback_ctrl(next, cmd, fp);

 }
 
 int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
 }
 
 int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index aca177e9da7b9aeef78ca2c9b1ba3b5bfb942f14..dbc9f395d08048d08c845ba9a4bb11ec8b63bb7c 100644 (file)
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -197,7 +197,6 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
 
 static long md_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {
 
 static long md_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {

-    long ret = 1;

     BIO *next;
 
     next = BIO_next(b);
     BIO *next;
 
     next = BIO_next(b);


@@ -205,12 +204,7 @@ static long md_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
     if (next == NULL)
         return 0;
 
     if (next == NULL)
         return 0;
 

-    switch (cmd) {
-    default:
-        ret = BIO_callback_ctrl(next, cmd, fp);
-        break;
-    }
-    return ret;
+    return BIO_callback_ctrl(next, cmd, fp);

 }
 
 static int md_gets(BIO *bp, char *buf, int size)
 }
 
 static int md_gets(BIO *bp, char *buf, int size)

diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index f94882829b0fa6fa791879f7f8462e94b15bad62..9129fe038ec11361e76995b09a989e5c6cc2830a 100644 (file)
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -406,7 +406,6 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr)
 
 static long ok_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {
 
 static long ok_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {

-    long ret = 1;

     BIO *next;
 
     next = BIO_next(b);
     BIO *next;
 
     next = BIO_next(b);


@@ -414,13 +413,7 @@ static long ok_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
     if (next == NULL)
         return 0;
 
     if (next == NULL)
         return 0;
 

-    switch (cmd) {
-    default:
-        ret = BIO_callback_ctrl(next, cmd, fp);
-        break;
-    }
-
-    return ret;
+    return BIO_callback_ctrl(next, cmd, fp);

 }
 
 static void longswap(void *_ptr, size_t len)
 }
 
 static void longswap(void *_ptr, size_t len)