perf expr: Fix return value of ids__new
PATCH v3 1/1 perf expr: Fix return value of ids__new
callers of ids__new() function only do NULL checking for the return value. ids__new() calles hashmap__new(), which may return ERR_PTR(-ENOMEM). Instead of changing the checking one-by-one. return NULL instead of ERR_PTR(-ENOMEM) to keep consistent.
---
Changes in v3:
fix compilation error and add tags.
---
--- tools/perf/util/expr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/util/expr.c +7 -1
@@ -12,6 +12,7 @@#include "expr-bison.h" #include "expr-flex.h" #include "smt.h" +#include <linux/err.h> #include <linux/kernel.h> #include <linux/zalloc.h> #include <ctype.h>
@@ -65,7 +66,12 @@ static bool key_equal(const void *key1, const void *key2,struct hashmap *ids__new (void ) { -return hashmap__new (key_hash, key_equal,NULL ); +struct hashmap *hash; + + hash =hashmap__new (key_hash, key_equal,NULL ); +if (IS_ERR (hash)) +return NULL ; +return hash; }void ids__free (struct hashmap *ids)
Signature · 1 line
2.17.1
Quoted 9 lines · Miaoqian Lin
callers of
ids__new()function only do NULL checking for the return value.ids__new()calleshashmap__new(), which may returnERR_PTR(-ENOMEM). Instead of changing the checking one-by-one. return NULL instead ofERR_PTR(-ENOMEM)to keep consistent.---
Changes in v3:
fix compilation error and add tags.
thanks,
jirka
Quoted 37 lines
---
Signed-off-by Miaoqian Lin <[email protected]>Tested-by German Gomez <[email protected]>Reviewed-by German Gomez <[email protected]>--- tools/perf/util/expr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tools/perf/util/expr.c +7
-1@@ -12,6 +12,7 @@#include "expr-bison.h" #include "expr-flex.h" #include "smt.h" +#include <linux/err.h> #include <linux/kernel.h> #include <linux/zalloc.h> #include <ctype.h> @@ -65,7 +66,12 @@ static bool key_equal(const void *key1, const void *key2,struct hashmap *ids__new (void ) { -return hashmap__new (key_hash, key_equal,NULL ); +struct hashmap *hash; + + hash =hashmap__new (key_hash, key_equal,NULL ); +if (IS_ERR (hash)) +return NULL ; +return hash; }void ids__free (struct hashmap *ids)Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
maintainerEm Tue, Dec 14, 2021 at 01:10:27AM +0000, Miaoqian Lin escreveu:
Quoted 5 lines
callers of
ids__new()function only do NULL checking for the return value.ids__new()calleshashmap__new(), which may returnERR_PTR(-ENOMEM). Instead of changing the checking one-by-one. return NULL instead ofERR_PTR(-ENOMEM)to keep consistent.
Please don't use --- as a separator inside the commit message, it breaks scripts that expect it to be a separator from the commit log message to the diffstat + patch.
Applying after fixing this.
- Arnaldo
Quoted 39 lines
---
Changes in v3:
fix compilation error and add tags.
---Signed-off-by Miaoqian Lin <[email protected]>Tested-by German Gomez <[email protected]>Reviewed-by German Gomez <[email protected]>--- tools/perf/util/expr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tools/perf/util/expr.c +7
-1@@ -12,6 +12,7 @@#include "expr-bison.h" #include "expr-flex.h" #include "smt.h" +#include <linux/err.h> #include <linux/kernel.h> #include <linux/zalloc.h> #include <ctype.h> @@ -65,7 +66,12 @@ static bool key_equal(const void *key1, const void *key2,struct hashmap *ids__new (void ) { -return hashmap__new (key_hash, key_equal,NULL ); +struct hashmap *hash; + + hash =hashmap__new (key_hash, key_equal,NULL ); +if (IS_ERR (hash)) +return NULL ; +return hash; }void ids__free (struct hashmap *ids)Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
PATCH v4 1/1 perf expr: Fix return value of ids__new
callers of ids__new() function only do NULL checking for the return value. ids__new() calles hashmap__new(), which may return ERR_PTR(-ENOMEM). Instead of changing the checking one-by-one. return NULL instead of ERR_PTR(-ENOMEM) to keep consistent.
---
Changes in v4:
fix the separator in commit message.
--- tools/perf/util/expr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/util/expr.c +7 -1
@@ -12,6 +12,7 @@#include "expr-bison.h" #include "expr-flex.h" #include "smt.h" +#include <linux/err.h> #include <linux/kernel.h> #include <linux/zalloc.h> #include <ctype.h>
@@ -65,7 +66,12 @@ static bool key_equal(const void *key1, const void *key2,struct hashmap *ids__new (void ) { -return hashmap__new (key_hash, key_equal,NULL ); +struct hashmap *hash; + + hash =hashmap__new (key_hash, key_equal,NULL ); +if (IS_ERR (hash)) +return NULL ; +return hash; }void ids__free (struct hashmap *ids)
Signature · 1 line
2.17.1