|
 |
fbba1b |
diff -up pciutils-3.5.6/lib/init.c.vafix pciutils-3.5.6/lib/init.c
|
|
|
fbba1b |
--- pciutils-3.5.6/lib/init.c.vafix 2018-08-21 15:44:16.245141888 +0200
|
|
|
fbba1b |
+++ pciutils-3.5.6/lib/init.c 2018-08-21 16:31:06.836445935 +0200
|
|
|
fbba1b |
@@ -98,6 +98,7 @@ pci_generic_error(char *msg, ...)
|
|
|
fbba1b |
va_start(args, msg);
|
|
|
fbba1b |
fputs("pcilib: ", stderr);
|
|
|
fbba1b |
vfprintf(stderr, msg, args);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
fputc('\n', stderr);
|
|
|
fbba1b |
exit(1);
|
|
|
fbba1b |
}
|
|
|
fbba1b |
@@ -110,6 +111,7 @@ pci_generic_warn(char *msg, ...)
|
|
|
fbba1b |
va_start(args, msg);
|
|
|
fbba1b |
fputs("pcilib: ", stderr);
|
|
|
fbba1b |
vfprintf(stderr, msg, args);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
fputc('\n', stderr);
|
|
|
fbba1b |
}
|
|
|
fbba1b |
|
|
|
fbba1b |
diff -up pciutils-3.5.6/lib/names.c.vafix pciutils-3.5.6/lib/names.c
|
|
|
fbba1b |
--- pciutils-3.5.6/lib/names.c.vafix 2018-08-21 16:32:35.268983348 +0200
|
|
|
fbba1b |
+++ pciutils-3.5.6/lib/names.c 2018-08-21 16:33:22.184737911 +0200
|
|
|
fbba1b |
@@ -148,11 +148,13 @@ pci_lookup_name(struct pci_access *a, ch
|
|
|
fbba1b |
case PCI_LOOKUP_VENDOR:
|
|
|
fbba1b |
iv = va_arg(args, int);
|
|
|
fbba1b |
sprintf(numbuf, "%04x", iv);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name(buf, size, flags, id_lookup(a, flags, ID_VENDOR, iv, 0, 0, 0), numbuf, "Vendor");
|
|
|
fbba1b |
case PCI_LOOKUP_DEVICE:
|
|
|
fbba1b |
iv = va_arg(args, int);
|
|
|
fbba1b |
id = va_arg(args, int);
|
|
|
fbba1b |
sprintf(numbuf, "%04x", id);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name(buf, size, flags, id_lookup(a, flags, ID_DEVICE, iv, id, 0, 0), numbuf, "Device");
|
|
|
fbba1b |
case PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE:
|
|
|
fbba1b |
iv = va_arg(args, int);
|
|
|
fbba1b |
@@ -160,11 +162,13 @@ pci_lookup_name(struct pci_access *a, ch
|
|
|
fbba1b |
sprintf(numbuf, "%04x:%04x", iv, id);
|
|
|
fbba1b |
v = id_lookup(a, flags, ID_VENDOR, iv, 0, 0, 0);
|
|
|
fbba1b |
d = id_lookup(a, flags, ID_DEVICE, iv, id, 0, 0);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name_pair(buf, size, flags, v, d, numbuf);
|
|
|
fbba1b |
case PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR:
|
|
|
fbba1b |
isv = va_arg(args, int);
|
|
|
fbba1b |
sprintf(numbuf, "%04x", isv);
|
|
|
fbba1b |
v = id_lookup(a, flags, ID_VENDOR, isv, 0, 0, 0);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name(buf, size, flags, v, numbuf, "Unknown vendor");
|
|
|
fbba1b |
case PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE:
|
|
|
fbba1b |
iv = va_arg(args, int);
|
|
|
fbba1b |
@@ -172,6 +176,7 @@ pci_lookup_name(struct pci_access *a, ch
|
|
|
fbba1b |
isv = va_arg(args, int);
|
|
|
fbba1b |
isd = va_arg(args, int);
|
|
|
fbba1b |
sprintf(numbuf, "%04x", isd);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name(buf, size, flags, id_lookup_subsys(a, flags, iv, id, isv, isd), numbuf, "Device");
|
|
|
fbba1b |
case PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE | PCI_LOOKUP_SUBSYSTEM:
|
|
|
fbba1b |
iv = va_arg(args, int);
|
|
|
fbba1b |
@@ -181,6 +186,7 @@ pci_lookup_name(struct pci_access *a, ch
|
|
|
fbba1b |
v = id_lookup(a, flags, ID_VENDOR, isv, 0, 0, 0);
|
|
|
fbba1b |
d = id_lookup_subsys(a, flags, iv, id, isv, isd);
|
|
|
fbba1b |
sprintf(numbuf, "%04x:%04x", isv, isd);
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name_pair(buf, size, flags, v, d, numbuf);
|
|
|
fbba1b |
case PCI_LOOKUP_CLASS:
|
|
|
fbba1b |
icls = va_arg(args, int);
|
|
|
fbba1b |
@@ -191,6 +197,7 @@ pci_lookup_name(struct pci_access *a, ch
|
|
|
fbba1b |
if (!(flags & PCI_LOOKUP_NUMERIC)) /* Include full class number */
|
|
|
fbba1b |
flags |= PCI_LOOKUP_MIXED;
|
|
|
fbba1b |
}
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name(buf, size, flags, cls, numbuf, "Class");
|
|
|
fbba1b |
case PCI_LOOKUP_PROGIF:
|
|
|
fbba1b |
icls = va_arg(args, int);
|
|
|
fbba1b |
@@ -210,8 +217,10 @@ pci_lookup_name(struct pci_access *a, ch
|
|
|
fbba1b |
if (*pif)
|
|
|
fbba1b |
pif++;
|
|
|
fbba1b |
}
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return format_name(buf, size, flags, pif, numbuf, "ProgIf");
|
|
|
fbba1b |
default:
|
|
|
fbba1b |
+ va_end(args);
|
|
|
fbba1b |
return "<pci_lookup_name: invalid request>";
|
|
|
fbba1b |
}
|
|
|
fbba1b |
}
|