External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xm_internal.c: remove four useless comparisons after strchr

Browse Source 
* src/xm_internal.c (xenXMDomainConfigParse): After t=strchr...
don't test *t; it's known.  This was *not* detected by clang,
but I spotted it since once instance was in the vicinity of the
dead increment of "data".
This commit is contained in:
Jim Meyering 2009-09-07 10:09:20 +02:00
parent aecae56071
commit f7d5b4d613
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xm_internal.c
View File

@ -862,7 +862,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
*/
/* Extract the source file path*/
if (!(offset = strchr(head, ',')) || offset[0] == '\0')
if (!(offset = strchr(head, ',')))
goto skipdisk;
if ((offset - head) >= (PATH_MAX-1))
goto skipdisk;
@ -882,7 +882,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
head = head + 6;
/* Extract the dest device name */
if (!(offset = strchr(head, ',')) || offset[0] == '\0')
if (!(offset = strchr(head, ',')))
goto skipdisk;
if (VIR_ALLOC_N(disk->dst, (offset - head) + 1) < 0)
goto no_memory;
@ -1018,7 +1018,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
char *data;
char *nextkey = strchr(key, ',');
if (!(data = strchr(key, '=')) || (data[0] == '\0'))
if (!(data = strchr(key, '=')))
goto skipnic;
data++;
@ -1312,7 +1312,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
nextkey++;
}
if (!(data = strchr(key, '=')) || (data[0] == '\0'))
if (!(data = strchr(key, '=')))
break;
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {