diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2008-07-29 14:51:22 +1000 | 
|---|---|---|
| committer | Gerald Van Baren <vanbaren@cideas.com> | 2008-08-24 22:20:49 -0400 | 
| commit | f171746f701ea58bf6a53e835b53d2aaebee0d81 (patch) | |
| tree | b54b72052cb48e4c215777a49b410591c3a2f59b | |
| parent | 46390da15411351fc3b498bd8c1615f78fe80df0 (diff) | |
| download | olio-uboot-2014.01-f171746f701ea58bf6a53e835b53d2aaebee0d81.tar.xz olio-uboot-2014.01-f171746f701ea58bf6a53e835b53d2aaebee0d81.zip | |
libfdt: Forgot one function when cleaning the namespace
In commit b6d80a20fc293f3b995c3ce1a6744a5574192125, we renamed all
libfdt functions to be prefixed with fdt_ or _fdt_ to minimise the
chance of collisions with things from whatever package libfdt is
embedded in, pulled into the libfdt build via that environment's
libfdt_env.h.
Except... I missed one.  This patch applies the same treatment to
_stringlist_contains().  While we're at it, also make it static since
it's only used in the same file.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | libfdt/fdt_ro.c | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index 326d19c21..6292a00be 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -412,7 +412,8 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)  					     &phandle, sizeof(phandle));  } -int _stringlist_contains(const char *strlist, int listlen, const char *str) +static int _fdt_stringlist_contains(const char *strlist, int listlen, +				    const char *str)  {  	int len = strlen(str);  	const char *p; @@ -438,7 +439,7 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset,  	prop = fdt_getprop(fdt, nodeoffset, "compatible", &len);  	if (!prop)  		return len; -	if (_stringlist_contains(prop, len, compatible)) +	if (_fdt_stringlist_contains(prop, len, compatible))  		return 0;  	else  		return 1; |