Changeset 5b3cf90 in mainline

Timestamp:

2009-08-02T19:38:02Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

fa5526d

Parents:

f019cc07

Message:

Fix warnings in Bdsh and PCI lib.

Location:

uspace

Files:

• app/bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• app/bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• app/bdsh/cmds/modules/ls/ls.h (modified) (1 diff)
• app/bdsh/cmds/modules/rm/rm.c (modified) (1 diff)
• srv/pci/libpci/generic.c (modified) (1 diff)
• srv/pci/libpci/i386-ports.c (modified) (1 diff)
• srv/pci/libpci/names.c (modified) (7 diffs)

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -173 +173 @@
 int cmd_cp(char **argv)
 {
-        unsigned int argc, buffer = 0, verbose = 0;
+        unsigned int argc, verbose = 0;
+        int buffer = 0;
         int c, opt_ind;
         int64_t ret;

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -90 +90 @@
         int rc;
 
-        if (rc = stat(pathname, &s)) {
+        rc = stat(pathname, &s);
+        if (rc != 0) {
                 /* Odd chance it was deleted from the time readdir() found it */
                 printf("ls: skipping bogus node %s\n", pathname);

uspace/app/bdsh/cmds/modules/ls/ls.h

@@ -7 +7 @@
 #define LS_DIR   2
 
-
-static unsigned int ls_scope(const char *);
 static void ls_scan_dir(const char *, DIR *);
 static void ls_print(const char *, const char *);

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -210 +210 @@
         }
 
-        if (optind == argc) {
+        if ((unsigned) optind == argc) {
                 cli_error(CL_EFAIL,
                         "%s: insufficient arguments. Try %s --help", cmdname, cmdname);

uspace/srv/pci/libpci/generic.c

@@ -30 +30 @@
                 t->dev = dev;
                 multi = 0;
-                for (t->func = 0; !t->func || multi && t->func < 8;
+                for (t->func = 0; !t->func || (multi && t->func < 8);
                      t->func++) {
                         u32 vd = pci_read_long(t, PCI_VENDOR_ID);

uspace/srv/pci/libpci/i386-ports.c

@@ -80 +80 @@
         for (d.dev = 0; d.dev < 32; d.dev++) {
                 u16 class, vendor;
-                if (m->read(&d, PCI_CLASS_DEVICE, (byte *) & class,
+                if ((m->read(&d, PCI_CLASS_DEVICE, (byte *) & class,
                          sizeof(class))
                     && (class == cpu_to_le16(PCI_CLASS_BRIDGE_HOST)
-                        || class == cpu_to_le16(PCI_CLASS_DISPLAY_VGA))
-                    || m->read(&d, PCI_VENDOR_ID, (byte *) & vendor,
+                        || class == cpu_to_le16(PCI_CLASS_DISPLAY_VGA)))
+                    || (m->read(&d, PCI_VENDOR_ID, (byte *) & vendor,
                                sizeof(vendor))
                     && (vendor == cpu_to_le16(PCI_VENDOR_ID_INTEL)
-                        || vendor == cpu_to_le16(PCI_VENDOR_ID_COMPAQ))) {
+                        || vendor == cpu_to_le16(PCI_VENDOR_ID_COMPAQ)))) {
                         a->debug("...outside the Asylum at 0/%02x/0",
                                  d.dev);

uspace/srv/pci/libpci/names.c

@@ -151 +151 @@
         int nest;
         static const char parse_error[] = "Parse error";
-        int i;
+        size_t 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))
+                else if ((v = id_lookup(a, ID_VENDOR, iv, 0, 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))
+                else if ((d = id_lookup(a, ID_DEVICE, iv, id, 0, 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))
+                else if ((v = id_lookup(a, ID_VENDOR, isv, 0, 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))
+                else if ((d = id_lookup_subsys(a, iv, id, isv, isd)) != 0)
                         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))
+                else if ((cls = id_lookup(a, ID_SUBCLASS, icls >> 8, icls & 0xff, 0, 0)) != 0)
                         return (char *) cls->name;
-                else if (cls = id_lookup(a, ID_CLASS, icls, 0, 0, 0))
+                else if ((cls = id_lookup(a, ID_CLASS, icls, 0, 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))
+                else if ((pif = id_lookup(a, ID_PROGIF, icls >> 8, icls & 0xff, ipif, 0)) != 0)
                         return (char *) pif->name;
                 else if (icls == 0x0101 && !(ipif & 0x70)) {