External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-03 16:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

commandhelper: Simplify envsort

Browse Source 
This saves two invocations of each `strndup` and `free`.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-02-01 12:27:47 +01:00 committed by Peter Krempa
parent 9f9b133e0c
commit d274092131
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/commandhelper.c
View File

@ -37,24 +37,19 @@ extern char **environ;
static int envsort(const void *a, const void *b)
{
const char *const*astrptr = a;
const char *const*bstrptr = b;
const char *astr = *astrptr;
const char *bstr = *bstrptr;
char *aeq = strchr(astr, '=');
char *beq = strchr(bstr, '=');
char *akey;
char *bkey;
int ret;
const char *astr = *(const char**)a;
const char *bstr = *(const char**)b;
if (!(akey = strndup(astr, aeq - astr)))
abort();
if (!(bkey = strndup(bstr, beq - bstr)))
abort();
ret = strcmp(akey, bkey);
free(akey);
free(bkey);
return ret;
while (true) {
char achar = (*astr == '=') ? '\0' : *astr;
char bchar = (*bstr == '=') ? '\0' : *bstr;
if ((achar == '\0') || (achar != bchar))
return achar - bchar;
astr++;
bstr++;
}
}
int main(int argc, char **argv) {