Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hashtable: preparations to use hexport_r() for "env grep"

Browse source 
The output of "env grep" is unsorted, and printing is done by a
private implementation to parse the hash table.  We have all the
needed code in place in hexport_r() alsready, so let's use this
instead.  Here we prepare the code for this, without any functional
changes yet.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2013-03-23 23:50:28 +00:00 • committed by Tom Rini
parent 2e222105c5
commit ea009d4743
3 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/hashtable.c
View file

@ -2,7 +2,7 @@
* This implementation is based on code from uClibc-0.9.30.3 but was
* modified and extended for use within U-Boot.
*
* Copyright (C) 2010 Wolfgang Denk <wd@denx.de>
* Copyright (C) 2010-2013 Wolfgang Denk <wd@denx.de>
*
* Original license header:
*
@ -563,6 +563,28 @@ static int cmpkey(const void *p1, const void *p2)
return (strcmp(e1->key, e2->key));
}
static int match_strings(ENTRY *ep, int flag,
int argc, char * const argv[])
{
int arg;
for (arg = 0; arg < argc; ++arg) {
if (flag & H_MATCH_KEY) {
switch (flag & H_MATCH_METHOD) {
case H_MATCH_IDENT:
if (strcmp(argv[arg], ep->key) == 0)
return 1;
break;
default:
printf("## ERROR: unsupported match method: 0x%02x\n",
flag & H_MATCH_METHOD);
break;
}
}
}
return 0;
}
ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
char **resp, size_t size,
int argc, char * const argv[])
@ -589,14 +611,8 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
if (htab->table[i].used > 0) {
ENTRY *ep = &htab->table[i].entry;
int arg, found = 0;
int found = match_strings(ep, flag, argc, argv);
for (arg = 0; arg < argc; ++arg) {
if (strcmp(argv[arg], ep->key) == 0) {
found = 1;
break;
}
}
if ((argc > 0) && (found == 0))
continue;