diff mbox series

[v13,11/21] lib: Always set errno in hcreate_r

Message ID	20200521161503.384823-12-seanga2@gmail.com
State	Accepted
Commit	60ffcf218fb2ed73dac1bd44ef0d45661b7577db
Headers	show List-Id: U-Boot discussion <u-boot.lists.denx.de> From: seanga2 at gmail.com (Sean Anderson) Date: Thu, 21 May 2020 12:14:53 -0400 Subject: [PATCH v13 11/21] lib: Always set errno in hcreate_r In-Reply-To: <20200521161503.384823-1-seanga2@gmail.com> References: <20200521161503.384823-1-seanga2@gmail.com> Message-ID: <20200521161503.384823-12-seanga2@gmail.com>
Series	riscv: Add Sipeed Maix support \| expand [v13,00/21] riscv: Add Sipeed Maix support [v13,01/21] clk: Always use the supplied struct clk [v13,02/21] clk: Check that ops of composite clock components exist before calling [v13,03/21] clk: Unconditionally recursively en-/dis-able clocks [v13,04/21] clk: Fix clk_get_by_* handling of index [v13,05/21] clk: Add K210 pll support [v13,06/21] clk: Add a bypass clock for K210 [v13,07/21] clk: Add K210 clock support [v13,08/21] dm: Add support for simple-pm-bus [v13,09/21] dm: Fix error handling for dev_read_addr_ptr [v13,10/21] reset: Add generic reset driver [v13,11/21] lib: Always set errno in hcreate_r [v13,12/21] riscv: Add headers for asm/global_data.h [v13,13/21] riscv: Clear pending interrupts before enabling IPIs [v13,14/21] riscv: Clean up IPI initialization code [v13,15/21] riscv: Add option to support RISC-V privileged spec 1.9 [v13,16/21] riscv: Allow use of reset drivers [v13,17/21] riscv: Try to get cpu frequency from a "clocks" node if it exists [v13,18/21] riscv: Enable cpu clock if it is present [v13,19/21] riscv: Add device tree for K210 and Sipeed Maix BitM [v13,20/21] doc: riscv: Add documentation for Sipeed Maix Bit [v13,21/21] riscv: Add Sipeed Maix support

Commit Message

Sean Anderson May 21, 2020, 4:14 p.m. UTC

This could give a confusing error message if it failed and didn't set
errno.

Signed-off-by: Sean Anderson <seanga2 at gmail.com>
Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
---

Changes in v5:
- New

 lib/hashtable.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/lib/hashtable.c b/lib/hashtable.c
index b96dbe19be..7b6781bc35 100644
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -110,8 +110,10 @@  int hcreate_r(size_t nel, struct hsearch_data *htab)
 	}
 
 	/* There is still another table active. Return with error. */
-	if (htab->table != NULL)
+	if (htab->table != NULL) {
+		__set_errno(EINVAL);
 		return 0;
+	}
 
 	/* Change nel to the first prime number not smaller as nel. */
 	nel |= 1;		/* make odd */
@@ -124,8 +126,10 @@  int hcreate_r(size_t nel, struct hsearch_data *htab)
 	/* allocate memory and zero out */
 	htab->table = (struct env_entry_node *)calloc(htab->size + 1,
 						sizeof(struct env_entry_node));
-	if (htab->table == NULL)
+	if (htab->table == NULL) {
+		__set_errno(ENOMEM);
 		return 0;
+	}
 
 	/* everything went alright */
 	return 1;