Changeset 1433ecda in mainline for uspace/srv/bd

Timestamp:

2018-04-04T15:42:37Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

Location:

uspace/srv/bd

Files:

• file_bd/file_bd.c (modified) (3 diffs)
• sata_bd/sata_bd.c (modified) (3 diffs)
• vbd/disk.c (modified) (1 diff)

uspace/srv/bd/file_bd/file_bd.c

@@ -97 +97 @@
         block_size = DEFAULT_BLOCK_SIZE;
 
-        ++argv; --argc;
+        ++argv;
+        --argc;
         while (*argv != NULL && (*argv)[0] == '-') {
                 /* Option */
@@ -113 +114 @@
                                 return -1;
                         }
-                        ++argv; --argc;
+                        ++argv;
+                        --argc;
                 } else {
                         printf("Invalid option '%s'.\n", *argv);
@@ -119 +121 @@
                         return -1;
                 }
-                ++argv; --argc;
+                ++argv;
+                --argc;
         }
 

uspace/srv/bd/sata_bd/sata_bd.c

@@ -97 +97 @@
         /* If device is SATA, add device to the disk array. */
         disk[disk_count].sess = ahci_get_sess(funh, &disk[disk_count].dev_name);
-        if(disk[disk_count].sess != NULL) {
+        if (disk[disk_count].sess != NULL) {
 
                 ahci_get_sata_device_name(disk[disk_count].sess,
@@ -113 +113 @@
                 printf("Device %s - %s , blocks: %lu, block_size: %lu\n",
                     disk[disk_count].dev_name, disk[disk_count].sata_dev_name,
-                            (long unsigned int) disk[disk_count].blocks,
-                                (long unsigned int) disk[disk_count].block_size);
+                    (long unsigned int) disk[disk_count].blocks,
+                    (long unsigned int) disk[disk_count].block_size);
 
                 ++disk_count;
@@ -268 +268 @@
         }
 
-        for(int i = 0; i < disk_count; i++) {
+        for (int i = 0; i < disk_count; i++) {
                 char name[1024];
                 snprintf(name, 1024, "%s/%s", NAMESPACE, disk[i].dev_name);

uspace/srv/bd/vbd/disk.c

@@ -181 +181 @@
 
         list_foreach(vbds_disks, ldisks, vbds_disk_t, disk)
-                disk->present = false;
+            disk->present = false;
 
         for (i = 0; i < count; i++) {