shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

remove len == 0 check, the index root is always '\0'

Browse Source
This commit is contained in:
Kay Sievers 2008-11-13 18:21:28 +01:00
parent 3e39ff6365
commit 949075dbbd
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
udev/udev-rules.c
View File

@ -451,15 +451,10 @@ static int add_string(struct udev_rules *rules, const char *str)
unsigned int off; unsigned int off;
struct trie_node *parent; struct trie_node *parent;
len = strlen(str);
/* offset 0 is always '\0' */
if (len == 0)
return 0;
/* walk trie, start from last character of str to find matching tails */ /* walk trie, start from last character of str to find matching tails */
node_idx = 0; len = strlen(str);
key = str[len-1]; key = str[len-1];
node_idx = 0;
for (depth = 0; depth <= len; depth++) { for (depth = 0; depth <= len; depth++) {
struct trie_node *node; struct trie_node *node;
unsigned int child_idx; unsigned int child_idx;
@ -1723,7 +1718,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
if (rules->trie_nodes == NULL) if (rules->trie_nodes == NULL)
return NULL; return NULL;
rules->trie_nodes_max = PREALLOC_TRIE; rules->trie_nodes_max = PREALLOC_TRIE;
/* offset 0 is the trie root */ /* offset 0 is the trie root, with an empty string */
memset(rules->trie_nodes, 0x00, sizeof(struct trie_node)); memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));
rules->trie_nodes_cur = 1; rules->trie_nodes_cur = 1;