Remove goto inside an if(0) block

[oweals/openssl.git] / crypto / comp / c_rle.c

diff --git a/crypto/comp/c_rle.c b/crypto/comp/c_rle.c
index b8b9b3e1bc2ee19f1dee44864994d148906e22cf..adf1663181fa056127c78958b5772d066ecc091d 100644 (file)
--- a/crypto/comp/c_rle.c
+++ b/crypto/comp/c_rle.c
@@ -1,69 +1,62 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "objects.h"
-#include "comp.h"
+#include <openssl/objects.h>
+#include <openssl/comp.h>
 
 static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
-       unsigned int olen, unsigned char *in, unsigned int ilen);
+                              unsigned int olen, unsigned char *in,
+                              unsigned int ilen);
 static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
-       unsigned int olen, unsigned char *in, unsigned int ilen);
+                            unsigned int olen, unsigned char *in,
+                            unsigned int ilen);
+
+static COMP_METHOD rle_method = {
+    NID_rle_compression,
+    LN_rle_compression,
+    NULL,
+    NULL,
+    rle_compress_block,
+    rle_expand_block,
+    NULL,
+    NULL,
+};
+
+COMP_METHOD *COMP_rle(void)
+{
+    return (&rle_method);
+}
 
-static COMP_METHOD rle_method={
-       NID_rle_compression,
-       LN_rle_compression,
-       NULL,
-       NULL,
-       rle_compress_block,
-       rle_expand_block,
-       NULL,
-       };
-
-COMP_METHOD *COMP_rle()
-       {
-       return(&rle_method);
-       }
-
-static int rle_compress_block(ctx,out,olen,in,ilen)
-COMP_CTX *ctx;
-unsigned char *out;
-unsigned int olen;
-unsigned char *in;
-unsigned int ilen;
-       {
-       /* int i; */
-
-       if (olen < (ilen+1))
-               {
-               /* ZZZZZZZZZZZZZZZZZZZZZZ */
-               return(-1);
-               }
-
-       *(out++)=0;
-       memcpy(out,in,ilen);
-       return(ilen+1);
-       }
-
-static int rle_expand_block(ctx,out,olen,in,ilen)
-COMP_CTX *ctx;
-unsigned char *out;
-unsigned int olen;
-unsigned char *in;
-unsigned int ilen;
-       {
-       int i;
+static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
+                              unsigned int olen, unsigned char *in,
+                              unsigned int ilen)
+{
+    /* int i; */
 
-       if (olen < (ilen-1))
-               {
-               /* ZZZZZZZZZZZZZZZZZZZZZZ */
-               return(-1);
-               }
+    if (olen < (ilen + 1)) {
+        /* ZZZZZZZZZZZZZZZZZZZZZZ */
+        return (-1);
+    }
 
-       i= *(in++);
-       if (i == 0)
-               {
-               memcpy(out,in,ilen-1);
-               }
-       return(ilen-1);
-       }
+    *(out++) = 0;
+    memcpy(out, in, ilen);
+    return (ilen + 1);
+}
 
+static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
+                            unsigned int olen, unsigned char *in,
+                            unsigned int ilen)
+{
+    int i;
+
+    if (ilen == 0 || olen < (ilen - 1)) {
+        /* ZZZZZZZZZZZZZZZZZZZZZZ */
+        return (-1);
+    }
+
+    i = *(in++);
+    if (i == 0) {
+        memcpy(out, in, ilen - 1);
+    }
+    return (ilen - 1);
+}