[Crosstoolchain-logs] [device-tree-compiler] 294/357: libfdt: Forgot one function when cleaning the namespace

Hector Oron zumbi at moszumanska.debian.org
Thu Dec 8 17:06:25 UTC 2016


This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch upstream/1.3.x
in repository device-tree-compiler.

commit d5653618d26fb8025dc8ed34a920036b61c48153
Author: David Gibson <david at gibson.dropbear.id.au>
Date:   Tue Jul 29 14:51:22 2008 +1000

    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 at gibson.dropbear.id.au>
---
 libfdt/fdt_ro.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
index 129b532..8f105f2 100644
--- a/libfdt/fdt_ro.c
+++ b/libfdt/fdt_ro.c
@@ -408,7 +408,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;
@@ -434,7 +435,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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git



More information about the Crosstoolchain-logs mailing list