Changeset cb0ea39 in mainline for uspace/app/lspci/libpci/names.c

Timestamp:

2009-08-09T13:56:50Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

24f27bb

Parents:

24edc18

Message:

dd: initial import of the original svn branch

File:

• uspace/app/lspci/libpci/names.c (moved) (moved from uspace/srv/pci/libpci/names.c ) (7 diffs)

uspace/app/lspci/libpci/names.c

@@ -151 +151 @@
         int nest;
         static const char parse_error[] = "Parse error";
-        size_t i;
+        int i;
 
         *lino = 0;
@@ -331 +331 @@
                 if (num)
                         res = snprintf(buf, size, "%04x", iv);
-                else if ((v = id_lookup(a, ID_VENDOR, iv, 0, 0, 0)) != 0)
+                else if (v = id_lookup(a, ID_VENDOR, iv, 0, 0, 0))
                         return (char *) v->name;
                 else
@@ -341 +341 @@
                 if (num)
                         res = snprintf(buf, size, "%04x", id);
-                else if ((d = id_lookup(a, ID_DEVICE, iv, id, 0, 0)) != 0)
+                else if (d = id_lookup(a, ID_DEVICE, iv, id, 0, 0))
                         return (char *) d->name;
                 else if (synth)
@@ -371 +371 @@
                 if (num)
                         res = snprintf(buf, size, "%04x", isv);
-                else if ((v = id_lookup(a, ID_VENDOR, isv, 0, 0, 0)) != 0)
+                else if (v = id_lookup(a, ID_VENDOR, isv, 0, 0, 0))
                         return (char *) v->name;
                 else if (synth)
@@ -385 +385 @@
                 if (num)
                         res = snprintf(buf, size, "%04x", isd);
-                else if ((d = id_lookup_subsys(a, iv, id, isv, isd)) != 0)
+                else if (d = id_lookup_subsys(a, iv, id, isv, isd))
                         return (char *) d->name;
                 else if (synth)
@@ -416 +416 @@
                 if (num)
                         res = snprintf(buf, size, "%04x", icls);
-                else if ((cls = id_lookup(a, ID_SUBCLASS, icls >> 8, icls & 0xff, 0, 0)) != 0)
+                else if (cls = id_lookup(a, ID_SUBCLASS, icls >> 8, icls & 0xff, 0, 0))
                         return (char *) cls->name;
-                else if ((cls = id_lookup(a, ID_CLASS, icls, 0, 0, 0)) != 0)
+                else if (cls = id_lookup(a, ID_CLASS, icls, 0, 0, 0))
                         res = snprintf(buf, size, "%s [%04x]", cls->name, icls);
                 else if (synth)
@@ -430 +430 @@
                 if (num)
                         res = snprintf(buf, size, "%02x", ipif);
-                else if ((pif = id_lookup(a, ID_PROGIF, icls >> 8, icls & 0xff, ipif, 0)) != 0)
+                else if (pif = id_lookup(a, ID_PROGIF, icls >> 8, icls & 0xff, ipif, 0))
                         return (char *) pif->name;
                 else if (icls == 0x0101 && !(ipif & 0x70)) {