Changes in / [0464967:ccbf93f] in mainline

Location:

uspace

Files:

• app/mkmfs/mkmfs.c (modified) (2 diffs)
• app/sbi/src/os/helenos.c (modified) (1 diff)
• app/sbi/src/run_expr.c (modified) (2 diffs)
• drv/bus/pci/pciintel/pci.c (modified) (1 diff)
• drv/intctl/apic/apic.h (modified) (1 diff)
• drv/intctl/i8259/i8259.h (modified) (1 diff)
• drv/intctl/icp-ic/icp-ic.h (modified) (1 diff)
• lib/bithenge/src/compound.c (modified) (1 diff)
• lib/trackmod/xm.c (modified) (1 diff)

uspace/app/mkmfs/mkmfs.c

@@ -348 +348 @@
         unsigned int i;
         uint8_t *itable_buf;
-        int rc = EOK;
+        int rc;
 
         long itable_off = sb->zbmap_blocks + sb->ibmap_blocks + 2;
@@ -633 +633 @@
         const unsigned int zbmap_nblocks = sb->zbmap_blocks;
         unsigned int i;
-        int rc = EOK;
+        int rc;
 
         ibmap_buf = malloc(ibmap_nblocks * sb->block_size);

uspace/app/sbi/src/os/helenos.c

@@ -155 +155 @@
         size_t offset;
         int i;
-        wchar_t c = 0;
+        wchar_t c;
 
         if (index < 0)

uspace/app/sbi/src/run_expr.c

@@ -2504 +2504 @@
         elem_index = 0;
 
-        assert(node != NULL);
-
         i = 0;
-        do {
+        while (node != NULL) {
                 if (i >= 1) {
                         printf("Error: Too many indices string.\n");
@@ -2529 +2527 @@
                 node = list_next(args, node);
                 i += 1;
-        } while (node != NULL);
+        }
 
         if (i < 1) {

uspace/drv/bus/pci/pciintel/pci.c

@@ -293 +293 @@
         const uint32_t conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg);
         pci_bus_t *bus = pci_bus_from_fun(fun);
-        uint32_t val = 0;
+        uint32_t val;
         
         fibril_mutex_lock(&bus->conf_mutex);

uspace/drv/intctl/apic/apic.h

@@ -33 +33 @@
  */
 
-#ifndef APIC_H_
-#define APIC_H_
+#ifndef ICP_IC_H_
+#define ICP_IC_H
 
 #include <ddf/driver.h>

uspace/drv/intctl/i8259/i8259.h

@@ -33 +33 @@
  */
 
-#ifndef I8259_H_
-#define I8259_H_
+#ifndef ICP_IC_H_
+#define ICP_IC_H
 
 #include <ddf/driver.h>

uspace/drv/intctl/icp-ic/icp-ic.h

@@ -34 +34 @@
 
 #ifndef ICP_IC_H_
-#define ICP_IC_H_
+#define ICP_IC_H
 
 #include <ddf/driver.h>

uspace/lib/bithenge/src/compound.c

@@ -81 +81 @@
 
         *out = in;
-        return EOK;
+        return rc;
 }
 

uspace/lib/trackmod/xm.c

@@ -289 +289 @@
         size_t instr_size;
         size_t smp_size;
-        size_t smp_hdr_size = 0;  /* GCC false alarm on uninitialized */
+        size_t smp_hdr_size = 0; /* GCC false alarm on uninitialized */
         ssize_t nread;
         uint8_t ltype;