diff mbox series

[15/33] sandbox: Rename strdup() functions

Message ID	20200112120216.15.Ia17e6b1cf15e09c3ff420ce4023dfbe236e72658@changeid
State	Accepted
Commit	f72bdc60b230f5e5d77eaad0b2defe07a46c02a9
Headers	show List-Id: U-Boot discussion <u-boot.lists.denx.de> From: sjg at chromium.org (Simon Glass) Date: Sun, 12 Jan 2020 12:06:06 -0700 Subject: [PATCH 15/33] sandbox: Rename strdup() functions In-Reply-To: <20200112190624.79077-1-sjg@chromium.org> References: <20200112190624.79077-1-sjg@chromium.org> Message-ID: <20200112120216.15.Ia17e6b1cf15e09c3ff420ce4023dfbe236e72658@changeid>
Series	sandbox: Move to SDL2 \| expand [00/33] sandbox: Move to SDL2 [01/33] sandbox: Sort the help options [02/33] video: Support truetype fonts on a 32-bit display [03/33] video: sandbox: Enable all colour depths [04/33] mailbox: Rename free() to rfree() [05/33] power-domain: Rename free() to rfree() [06/33] reset: Rename free() to rfree() [07/33] gpio: Rename free() to rfree() [08/33] clk: Rename free() to rfree() [09/33] dma: Rename free() to rfree() [10/33] mtd: Rename free() to rfree() [11/33] sandbox: Rename 'free' variable [12/33] sandbox: Use a prefix for all allocation functions [13/33] exports: Add the malloc.h header [14/33] string: Allow arch override of strndup() also [15/33] sandbox: Rename strdup() functions [16/33] sandbox: Drop use of special os_malloc() where possible [17/33] sandbox: Drop os_realloc() [18/33] sandbox: Ensure that long-options array is terminated [19/33] sandbox: Add a new header for the system malloc() [20/33] sound: Add a new stop_play() method [21/33] sandbox: sound: Handle errors better in sound_beep() [22/33] sandbox: Add comments to the sdl struct [23/33] sandbox: sdl: Improve error handling [24/33] sandbox: sdl: Support waiting for audio to complete [25/33] gitlab: Disable SDL when building sandbox [26/33] sandbox: sdl: Move to use SDL2 [27/33] sandbox: sdl: Add an option to double the screen size [28/33] sandbox: Support changing the LCD colour depth [29/33] dm: core: Require users of devres to include the header [30/33] dm: core: Create a new header file for 'compat' features [31/33] dm: core: Drop the inclusion of linux/compat.h in dm.h [32/33] sandbox: Complete migration away from os_malloc() [33/33] video: Drop the Nimbus font

Commit Message

Simon Glass Jan. 12, 2020, 7:06 p.m. UTC

These functions include calls to a memory-allocation routine and so need
to use the system routine when called from a library.

To preserve access to these functions for libraries that need it, such as
SDL, rename these functions within U-Boot.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 include/linux/string.h | 5 +++++
 1 file changed, 5 insertions(+)

diff mbox series

Patch

diff --git a/include/linux/string.h b/include/linux/string.h
index bb1d5ab07e..d67998e5c4 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -91,6 +91,11 @@  extern __kernel_size_t strnlen(const char *,__kernel_size_t);
 size_t strcspn(const char *s, const char *reject);
 #endif
 
+#ifdef CONFIG_SANDBOX
+# define strdup		sandbox_strdup
+# define strndup		sandbox_strndup
+#endif
+
 #ifndef __HAVE_ARCH_STRDUP
 extern char * strdup(const char *);
 extern char * strndup(const char *, size_t);