libfdt: Forgot one function when cleaning the namespace
From: David Gibson <hidden>
Date: 2008-07-29 04:51:22
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 <redacted> Index: dtc/libfdt/fdt_ro.c ===================================================================
--- dtc.orig/libfdt/fdt_ro.c 2008-07-29 13:43:23.000000000 +1000
+++ dtc/libfdt/fdt_ro.c 2008-07-29 13:43:33.000000000 +1000@@ -408,7 +408,8 @@ int fdt_node_offset_by_phandle(const voi &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 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;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson