LineageOS/android_external_dtc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add strstarts() helper function

Browse Source 
nodename_from_path() in flattree.c uses strneq() to test that one
string starts with another. This is, in fact, the only correct usage
of strneq() in the entire tree.  To make things harder to confuse, add
a strstarts() function for this purpose.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson
2017-10-29 18:56:03 +01:00
parent cc392f0890
commit fca296445e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dtc.h
View File

@@ -68,6 +68,7 @@ typedef uint32_t cell_t;
#define streq(a, b) (strcmp((a), (b)) == 0) #define streq(a, b) (strcmp((a), (b)) == 0)
#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0) #define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
#define strstarts(s, prefix) (strncmp((s), (prefix), strlen(prefix)) == 0)
#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) #define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))

2
flattree.c
View File

@@ -731,7 +731,7 @@ static char *nodename_from_path(const char *ppath, const char *cpath)
plen = strlen(ppath); plen = strlen(ppath);
if (!strneq(ppath, cpath, plen)) if (!strstarts(cpath, ppath))
die("Path \"%s\" is not valid as a child of \"%s\"\n", die("Path \"%s\" is not valid as a child of \"%s\"\n",
cpath, ppath); cpath, ppath);