[PATCH] src: Merge assignment with return

[PATCH] src: Merge assignment with return

[Harsha Sharma]

Merge assignment with return statement to directly return the value.
Done using following coccinelle semantic patch

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
---
 src/mini-gmp.c  | 3 +--
 src/statement.c | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mini-gmp.c b/src/mini-gmp.c
index acbe1be..0579c46 100644
--- a/src/mini-gmp.c
+++ b/src/mini-gmp.c
@@ -1297,8 +1297,7 @@ mpn_set_str_bits (mp_ptr rp, const unsigned char *sp, size_t sn,
 	    }
 	}
     }
-  rn = mpn_normalized_size (rp, rn);
-  return rn;
+  return mpn_normalized_size(rp, rn);
 }

 static mp_size_t
diff --git a/src/statement.c b/src/statement.c
index 6166863..168f944 100644
--- a/src/statement.c
+++ b/src/statement.c
@@ -208,10 +208,7 @@ static const struct stmt_ops objref_stmt_ops = {

 struct stmt *objref_stmt_alloc(const struct location *loc)
 {
-	struct stmt *stmt;
-
-	stmt = stmt_alloc(loc, &objref_stmt_ops);
-	return stmt;
+	return stmt_alloc(loc, &objref_stmt_ops);
 }

 static const char *syslog_level[LOG_DEBUG + 1] = {
--
2.11.0

Re: [PATCH] src: Merge assignment with return

[Pablo Neira Ayuso]

Hi Harsha,

On Sat, Oct 07, 2017 at 04:00:33AM +0530, Harsha Sharma wrote:
> Merge assignment with return statement to directly return the value.
> Done using following coccinelle semantic patch
> 
> @@
> local idexpression ret;
> expression e;
> @@
> 
> -ret =
> +return
>      e;
> -return ret;
> 
> Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
> ---
>  src/mini-gmp.c  | 3 +--
>  src/statement.c | 5 +----
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mini-gmp.c b/src/mini-gmp.c
> index acbe1be..0579c46 100644
> --- a/src/mini-gmp.c
> +++ b/src/mini-gmp.c
> @@ -1297,8 +1297,7 @@ mpn_set_str_bits (mp_ptr rp, const unsigned char *sp, size_t sn,
>  	    }
>  	}
>      }
> -  rn = mpn_normalized_size (rp, rn);
> -  return rn;
> +  return mpn_normalized_size(rp, rn);

mini-gmp.c has been extracted from libgmp sources [1], so either you
submit this chunk to them, or you leave this part as is. I would like
we just cache a copy of the mini-gmp.c original file.

Probably you can just check if latest stable release of libgmp
contains updates for mini-gmp.{c,h} and send us a patch to get in sync
with them.

Thanks.

[1] https://gmplib.org/repo/gmp/file/tip/mini-gmp