clang-format: fs_test

diff --git a/fs_test/lwext4_client.c b/fs_test/lwext4_client.c
index b2e5a65a66d795b8a876ee4179669106048e2431..a4db7fa6a02b5b69e4eb84825f212ab7b2dd305e 100644 (file)
--- a/fs_test/lwext4_client.c
+++ b/fs_test/lwext4_client.c
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
  */\r
 \r
-\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
@@ -69,21 +68,19 @@ Usage:                                                          \n\
     --addr (-a) - server ip address                             \n\\r
 \n";\r
 \r
-\r
-\r
 static int client_connect(void)\r
 {\r
     int fd = 0;\r
     struct sockaddr_in serv_addr;\r
 \r
-    if(winsock_init() < 0) {\r
+    if (winsock_init() < 0) {\r
         printf("winsock_init error\n");\r
         exit(-1);\r
     }\r
 \r
     memset(&serv_addr, '0', sizeof(serv_addr));\r
     fd = socket(AF_INET, SOCK_STREAM, 0);\r
-    if(fd < 0) {\r
+    if (fd < 0) {\r
         printf("socket() error: %s\n", strerror(errno));\r
         exit(-1);\r
     }\r
@@ -91,12 +88,12 @@ static int client_connect(void)
     serv_addr.sin_family = AF_INET;\r
     serv_addr.sin_port = htons(connection_port);\r
 \r
-    if(!inet_pton(AF_INET, server_addr, &serv_addr.sin_addr)){\r
+    if (!inet_pton(AF_INET, server_addr, &serv_addr.sin_addr)) {\r
         printf("inet_pton() error\n");\r
         exit(-1);\r
     }\r
 \r
-    if(connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr))){\r
+    if (connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr))) {\r
         printf("connect() error: %s\n", strerror(errno));\r
         exit(-1);\r
     }\r
@@ -104,24 +101,20 @@ static int client_connect(void)
     return fd;\r
 }\r
 \r
-\r
-\r
 static bool parse_opt(int argc, char **argv)\r
 {\r
     int option_index = 0;\r
     int c;\r
 \r
-    static struct option long_options[] =\r
-    {\r
-            {"call",    required_argument, 0, 'c'},\r
-            {"port",    required_argument, 0, 'p'},\r
-            {"addr",    required_argument, 0, 'a'},\r
-            {0, 0, 0, 0}\r
-    };\r
+    static struct option long_options[] = {{"call", required_argument, 0, 'c'},\r
+                                           {"port", required_argument, 0, 'p'},\r
+                                           {"addr", required_argument, 0, 'a'},\r
+                                           {0, 0, 0, 0}};\r
 \r
-    while(-1 != (c = getopt_long (argc, argv, "c:p:a:", long_options, &option_index))) {\r
+    while (-1 != (c = getopt_long(argc, argv, "c:p:a:", long_options,\r
+                                  &option_index))) {\r
 \r
-        switch(c){\r
+        switch (c) {\r
         case 'a':\r
             server_addr = optarg;\r
             break;\r
@@ -134,13 +127,11 @@ static bool parse_opt(int argc, char **argv)
         default:\r
             printf("%s", usage);\r
             return false;\r
-\r
         }\r
     }\r
     return true;\r
 }\r
 \r
-\r
 int main(int argc, char *argv[])\r
 {\r
     int sockfd;\r
@@ -148,27 +139,26 @@ int main(int argc, char *argv[])
     int rc;\r
     char recvBuff[1024];\r
 \r
-    if(!parse_opt(argc, argv))\r
+    if (!parse_opt(argc, argv))\r
         return -1;\r
 \r
     sockfd = client_connect();\r
 \r
-\r
     n = send(sockfd, op_code, strlen(op_code), 0);\r
-    if(n < 0) {\r
+    if (n < 0) {\r
         printf("\tWrite error: %s fd = %d\n", strerror(errno), sockfd);\r
         return -1;\r
     }\r
 \r
     n = recv(sockfd, (void *)&rc, sizeof(rc), 0);\r
-    if(n < 0) {\r
+    if (n < 0) {\r
         printf("\tWrite error: %s fd = %d\n", strerror(errno), sockfd);\r
         return -1;\r
     }\r
 \r
     printf("rc: %d %s\n", rc, strerror(rc));\r
-    if(rc)\r
-        printf("\t%s\n",op_code);\r
+    if (rc)\r
+        printf("\t%s\n", op_code);\r
 \r
     winsock_fini();\r
     return rc;\r
@@ -179,7 +169,7 @@ static int winsock_init(void)
 #if WIN32\r
     int rc;\r
     static WSADATA wsaData;\r
-    rc = WSAStartup(MAKEWORD(2,2), &wsaData);\r
+    rc = WSAStartup(MAKEWORD(2, 2), &wsaData);\r
     if (rc != 0) {\r
         return -1;\r
     }\r
@@ -194,21 +184,21 @@ static void winsock_fini(void)
 #endif\r
 }\r
 \r
-\r
 #if WIN32\r
 static int inet_pton(int af, const char *src, void *dst)\r
 {\r
     struct sockaddr_storage ss;\r
     int size = sizeof(ss);\r
-    char src_copy[INET6_ADDRSTRLEN+1];\r
+    char src_copy[INET6_ADDRSTRLEN + 1];\r
 \r
     ZeroMemory(&ss, sizeof(ss));\r
     /* stupid non-const API */\r
-    strncpy (src_copy, src, INET6_ADDRSTRLEN+1);\r
+    strncpy(src_copy, src, INET6_ADDRSTRLEN + 1);\r
     src_copy[INET6_ADDRSTRLEN] = 0;\r
 \r
-    if (WSAStringToAddress(src_copy, af, NULL, (struct sockaddr *)&ss, &size) == 0) {\r
-        switch(af) {\r
+    if (WSAStringToAddress(src_copy, af, NULL, (struct sockaddr *)&ss, &size) ==\r
+        0) {\r
+        switch (af) {\r
         case AF_INET:\r
             *(struct in_addr *)dst = ((struct sockaddr_in *)&ss)->sin_addr;\r
             return 1;\r

diff --git a/fs_test/lwext4_server.c b/fs_test/lwext4_server.c
index 623538561a93278d1832a954ad0ad8194992243e..d81588bb096ef43849995a631ec113c8c873bf75 100644 (file)
--- a/fs_test/lwext4_server.c
+++ b/fs_test/lwext4_server.c
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
  */\r
 \r
-\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <unistd.h>\r
@@ -48,7 +47,6 @@
 #include <sys/types.h>\r
 #endif\r
 \r
-\r
 #include <ext4_filedev.h>\r
 #include <io_raw.h>\r
 \r
@@ -57,14 +55,13 @@
 \r
 static int winsock_init(void);\r
 static void winsock_fini(void);\r
-static char* entry_to_str(uint8_t type);\r
-\r
-#define MAX_FILES   64\r
-#define MAX_DIRS    64\r
+static char *entry_to_str(uint8_t type);\r
 \r
-#define MAX_RW_BUFFER   (1024 * 1024)\r
-#define RW_BUFFER_PATERN    ('x')\r
+#define MAX_FILES 64\r
+#define MAX_DIRS 64\r
 \r
+#define MAX_RW_BUFFER (1024 * 1024)\r
+#define RW_BUFFER_PATERN ('x')\r
 \r
 /**@brief   Default connection port*/\r
 static int connection_port = 1234;\r
@@ -86,7 +83,6 @@ static int cache_wb = 0;
 static char read_buffer[MAX_RW_BUFFER];\r
 static char write_buffer[MAX_RW_BUFFER];\r
 \r
-\r
 static const char *usage = "                                    \n\\r
 Welcome in lwext4_server.                                       \n\\r
 Copyright (c) 2013 Grzegorz Kostka (kostka.grzegorz@gmail.com)  \n\\r
@@ -98,27 +94,29 @@ Usage:                                                          \n\
     --cache_wb  (-c) - cache writeback_mode                     \n\\r
 \n";\r
 \r
-\r
-\r
 /**@brief   Open file instance descriptor.*/\r
-struct lwext4_files {\r
-    char        name[255];\r
-    ext4_file   fd;\r
+struct lwext4_files\r
+{\r
+    char name[255];\r
+    ext4_file fd;\r
 };\r
 \r
 /**@brief   Open directory instance descriptor.*/\r
-struct lwext4_dirs {\r
-    char        name[255];\r
-    ext4_dir    fd;\r
+struct lwext4_dirs\r
+{\r
+    char name[255];\r
+    ext4_dir fd;\r
 };\r
 \r
 /**@brief   Library call opcode.*/\r
-struct lwext4_op_codes {\r
+struct lwext4_op_codes\r
+{\r
     char *func;\r
 };\r
 \r
 /**@brief   Library call wraper.*/\r
-struct lwext4_call {\r
+struct lwext4_call\r
+{\r
     int (*lwext4_call)(char *p);\r
 };\r
 \r
@@ -126,37 +124,18 @@ struct lwext4_call {
 static struct lwext4_files file_tab[MAX_FILES];\r
 \r
 /**@brief  */\r
-static struct lwext4_dirs  dir_tab[MAX_DIRS];\r
+static struct lwext4_dirs dir_tab[MAX_DIRS];\r
 \r
 /**@brief  */\r
 static struct lwext4_op_codes op_codes[] = {\r
-        "device_register",\r
-        "mount",\r
-        "umount",\r
-        "mount_point_stats",\r
-        "cache_write_back",\r
-        "fremove",\r
-        "fopen",\r
-        "fclose",\r
-        "fread",\r
-        "fwrite",\r
-        "fseek",\r
-        "ftell",\r
-        "fsize",\r
-        "dir_rm",\r
-        "dir_mk",\r
-        "dir_open",\r
-        "dir_close",\r
-        "dir_entry_get",\r
-\r
-        "multi_fcreate",\r
-        "multi_fwrite",\r
-        "multi_fread",\r
-        "multi_fremove",\r
-        "multi_dcreate",\r
-        "multi_dremove",\r
-        "stats_save",\r
-        "stats_check",\r
+    "device_register",  "mount",         "umount",      "mount_point_stats",\r
+    "cache_write_back", "fremove",       "fopen",       "fclose",\r
+    "fread",            "fwrite",        "fseek",       "ftell",\r
+    "fsize",            "dir_rm",        "dir_mk",      "dir_open",\r
+    "dir_close",        "dir_entry_get",\r
+\r
+    "multi_fcreate",    "multi_fwrite",  "multi_fread", "multi_fremove",\r
+    "multi_dcreate",    "multi_dremove", "stats_save",  "stats_check",\r
 };\r
 \r
 int _device_register(char *p);\r
@@ -190,33 +169,33 @@ int _stats_check(char *p);
 \r
 /**@brief  */\r
 static struct lwext4_call op_call[] = {\r
-        _device_register,  /*PARAMS(3):   0 cache_mode dev_name   */\r
-        _mount,            /*PARAMS(2):   dev_name mount_point    */\r
-        _umount,           /*PARAMS(1):   mount_point             */\r
-        _mount_point_stats,/*PARAMS(2):   mount_point, 0          */\r
-        _cache_write_back, /*PARAMS(2):   mount_point, en         */\r
-        _fremove,          /*PARAMS(1):   path                    */\r
-        _fopen,            /*PARAMS(2):   fid path flags          */\r
-        _fclose,           /*PARAMS(1):   fid                     */\r
-        _fread,            /*PARAMS(4):   fid 0 len 0             */\r
-        _fwrite,           /*PARAMS(4):   fid 0 len 0             */\r
-        _fseek,            /*PARAMS(2):   fid off origin          */\r
-        _ftell,            /*PARAMS(2):   fid exp                 */\r
-        _fsize,            /*PARAMS(2):   fid exp                 */\r
-        _dir_rm,           /*PARAMS(1):   path                    */\r
-        _dir_mk,           /*PARAMS(1):   path                    */\r
-        _dir_open,         /*PARAMS(2):   did, path               */\r
-        _dir_close,        /*PARAMS(1):   did                     */\r
-        _dir_entry_get,    /*PARAMS(2):   did, exp                */\r
-\r
-        _multi_fcreate,    /*PARAMS(3):   path prefix cnt         */\r
-        _multi_fwrite,     /*PARAMS(4):   path prefix cnt size    */\r
-        _multi_fread,      /*PARAMS(4):   path prefix cnt size    */\r
-        _multi_fremove,    /*PARAMS(2):   path prefix cnt         */\r
-        _multi_dcreate,    /*PARAMS(3):   path prefix cnt         */\r
-        _multi_dremove,    /*PARAMS(2):   path prefix             */\r
-        _stats_save,       /*PARAMS(1):   path                    */\r
-        _stats_check,      /*PARAMS(1):   path                    */\r
+    _device_register,   /*PARAMS(3):   0 cache_mode dev_name   */\r
+    _mount,             /*PARAMS(2):   dev_name mount_point    */\r
+    _umount,            /*PARAMS(1):   mount_point             */\r
+    _mount_point_stats, /*PARAMS(2):   mount_point, 0          */\r
+    _cache_write_back,  /*PARAMS(2):   mount_point, en         */\r
+    _fremove,           /*PARAMS(1):   path                    */\r
+    _fopen,             /*PARAMS(2):   fid path flags          */\r
+    _fclose,            /*PARAMS(1):   fid                     */\r
+    _fread,             /*PARAMS(4):   fid 0 len 0             */\r
+    _fwrite,            /*PARAMS(4):   fid 0 len 0             */\r
+    _fseek,             /*PARAMS(2):   fid off origin          */\r
+    _ftell,             /*PARAMS(2):   fid exp                 */\r
+    _fsize,             /*PARAMS(2):   fid exp                 */\r
+    _dir_rm,            /*PARAMS(1):   path                    */\r
+    _dir_mk,            /*PARAMS(1):   path                    */\r
+    _dir_open,          /*PARAMS(2):   did, path               */\r
+    _dir_close,         /*PARAMS(1):   did                     */\r
+    _dir_entry_get,     /*PARAMS(2):   did, exp                */\r
+\r
+    _multi_fcreate, /*PARAMS(3):   path prefix cnt         */\r
+    _multi_fwrite,  /*PARAMS(4):   path prefix cnt size    */\r
+    _multi_fread,   /*PARAMS(4):   path prefix cnt size    */\r
+    _multi_fremove, /*PARAMS(2):   path prefix cnt         */\r
+    _multi_dcreate, /*PARAMS(3):   path prefix cnt         */\r
+    _multi_dremove, /*PARAMS(2):   path prefix             */\r
+    _stats_save,    /*PARAMS(1):   path                    */\r
+    _stats_check,   /*PARAMS(1):   path                    */\r
 };\r
 \r
 static clock_t get_ms(void)\r
@@ -234,10 +213,10 @@ static int exec_op_code(char *opcode)
 \r
     for (i = 0; i < sizeof(op_codes) / sizeof(op_codes[0]); ++i) {\r
 \r
-        if(strncmp(op_codes[i].func, opcode, strlen(op_codes[i].func)))\r
+        if (strncmp(op_codes[i].func, opcode, strlen(op_codes[i].func)))\r
             continue;\r
 \r
-        if(opcode[strlen(op_codes[i].func)] != ' ')\r
+        if (opcode[strlen(op_codes[i].func)] != ' ')\r
             continue;\r
 \r
         printf("%s\n", opcode);\r
@@ -255,7 +234,6 @@ static int exec_op_code(char *opcode)
     return r;\r
 }\r
 \r
-\r
 static int server_open(void)\r
 {\r
     int fd = 0;\r
@@ -263,13 +241,13 @@ static int server_open(void)
 \r
     memset(&serv_addr, 0, sizeof(serv_addr));\r
 \r
-    if(winsock_init() < 0) {\r
+    if (winsock_init() < 0) {\r
         printf("winsock_init() error\n");\r
         exit(-1);\r
     }\r
 \r
     fd = socket(AF_INET, SOCK_STREAM, 0);\r
-    if(fd < 0) {\r
+    if (fd < 0) {\r
         printf("socket() error: %s\n", strerror(errno));\r
         exit(-1);\r
     }\r
@@ -284,12 +262,12 @@ static int server_open(void)
     serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);\r
     serv_addr.sin_port = htons(connection_port);\r
 \r
-    if(bind(fd, (struct sockaddr*)&serv_addr, sizeof(serv_addr))){\r
+    if (bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr))) {\r
         printf("bind() error: %s\n", strerror(errno));\r
         exit(-1);\r
     }\r
 \r
-    if(listen(fd, 1)){\r
+    if (listen(fd, 1)) {\r
         printf("listen() error: %s\n", strerror(errno));\r
         exit(-1);\r
     }\r
@@ -303,17 +281,17 @@ static bool parse_opt(int argc, char **argv)
     int c;\r
 \r
     static struct option long_options[] = {\r
-            {"image",   required_argument, 0, 'i'},\r
-            {"port",    required_argument, 0, 'p'},\r
-            {"verbose", required_argument, 0, 'v'},\r
-            {"winpart", required_argument, 0, 'w'},\r
-            {"cache_wb",required_argument, 0, 'c'},\r
-            {0, 0, 0, 0}\r
-    };\r
+        {"image", required_argument, 0, 'i'},\r
+        {"port", required_argument, 0, 'p'},\r
+        {"verbose", required_argument, 0, 'v'},\r
+        {"winpart", required_argument, 0, 'w'},\r
+        {"cache_wb", required_argument, 0, 'c'},\r
+        {0, 0, 0, 0}};\r
 \r
-    while(-1 != (c = getopt_long (argc, argv, "c:i:p:v:w:", long_options, &option_index))) {\r
+    while (-1 != (c = getopt_long(argc, argv, "c:i:p:v:w:", long_options,\r
+                                  &option_index))) {\r
 \r
-        switch(c){\r
+        switch (c) {\r
         case 'i':\r
             ext4_fname = optarg;\r
             break;\r
@@ -332,7 +310,6 @@ static bool parse_opt(int argc, char **argv)
         default:\r
             printf("%s", usage);\r
             return false;\r
-\r
         }\r
     }\r
     return true;\r
@@ -345,7 +322,7 @@ int main(int argc, char *argv[])
     int connfd;\r
     char op_code[128];\r
 \r
-    if(!parse_opt(argc, argv))\r
+    if (!parse_opt(argc, argv))\r
         return -1;\r
 \r
     listenfd = server_open();\r
@@ -353,13 +330,12 @@ int main(int argc, char *argv[])
     printf("lwext4_server: listening on port: %d\n", connection_port);\r
 \r
     memset(write_buffer, RW_BUFFER_PATERN, MAX_RW_BUFFER);\r
-    while(1)\r
-    {\r
-        connfd = accept(listenfd, (struct sockaddr*)NULL, NULL);\r
+    while (1) {\r
+        connfd = accept(listenfd, (struct sockaddr *)NULL, NULL);\r
 \r
         n = recv(connfd, op_code, sizeof(op_code), 0);\r
 \r
-        if(n < 0) {\r
+        if (n < 0) {\r
             printf("recv() error: %s fd = %d\n", strerror(errno), connfd);\r
             break;\r
         }\r
@@ -369,7 +345,7 @@ int main(int argc, char *argv[])
         int r = exec_op_code(op_code);\r
 \r
         n = send(connfd, (void *)&r, sizeof(r), 0);\r
-        if(n < 0) {\r
+        if (n < 0) {\r
             printf("send() error: %s fd = %d\n", strerror(errno), connfd);\r
             break;\r
         }\r
@@ -381,25 +357,23 @@ int main(int argc, char *argv[])
     return 0;\r
 }\r
 \r
-\r
 int _device_register(char *p)\r
 {\r
     int dev;\r
     int cache_mode;\r
     char dev_name[32];\r
 \r
-    if(sscanf(p, "%d %d %s", &dev, &cache_mode, dev_name) != 3){\r
+    if (sscanf(p, "%d %d %s", &dev, &cache_mode, dev_name) != 3) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
 #ifdef WIN32\r
-    if(winpart){\r
+    if (winpart) {\r
         ext4_io_raw_filename(ext4_fname);\r
         bd = ext4_io_raw_dev_get();\r
 \r
-    }\r
-    else\r
+    } else\r
 #endif\r
     {\r
         ext4_filedev_filename(ext4_fname);\r
@@ -414,13 +388,13 @@ int _mount(char *p)
     char mount_point[32];\r
     int rc;\r
 \r
-    if(sscanf(p, "%s %s", dev_name, mount_point) != 2){\r
+    if (sscanf(p, "%s %s", dev_name, mount_point) != 2) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
     rc = ext4_mount(dev_name, mount_point);\r
-    if(cache_wb)\r
+    if (cache_wb)\r
         ext4_cache_write_back(mount_point, 1);\r
     return rc;\r
 }\r
@@ -429,12 +403,12 @@ int _umount(char *p)
 {\r
     char mount_point[32];\r
 \r
-    if(sscanf(p, "%s", mount_point) != 1){\r
+    if (sscanf(p, "%s", mount_point) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(cache_wb)\r
+    if (cache_wb)\r
         ext4_cache_write_back(mount_point, 0);\r
 \r
     return ext4_umount(mount_point);\r
@@ -447,17 +421,17 @@ int _mount_point_stats(char *p)
     int rc;\r
     struct ext4_mount_stats stats;\r
 \r
-    if(sscanf(p, "%s %d", mount_point, &d) != 2){\r
+    if (sscanf(p, "%s %d", mount_point, &d) != 2) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
     rc = ext4_mount_point_stats(mount_point, &stats);\r
 \r
-    if(rc != EOK)\r
+    if (rc != EOK)\r
         return rc;\r
 \r
-    if(verbose){\r
+    if (verbose) {\r
         printf("\tinodes_count = %d\n", stats.inodes_count);\r
         printf("\tfree_inodes_count = %d\n", stats.free_inodes_count);\r
         printf("\tblocks_count = %llu\n", stats.blocks_count);\r
@@ -479,7 +453,7 @@ int _cache_write_back(char *p)
     char mount_point[32];\r
     int en;\r
 \r
-    if(sscanf(p, "%s %d", mount_point, &en) != 2){\r
+    if (sscanf(p, "%s %d", mount_point, &en) != 2) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -487,12 +461,11 @@ int _cache_write_back(char *p)
     return ext4_cache_write_back(mount_point, en);\r
 }\r
 \r
-\r
 int _fremove(char *p)\r
 {\r
     char path[255];\r
 \r
-    if(sscanf(p, "%s", path) != 1){\r
+    if (sscanf(p, "%s", path) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -507,19 +480,19 @@ int _fopen(char *p)
     char flags[8];\r
     int rc;\r
 \r
-    if(sscanf(p, "%d %s %s", &fid, path, flags) != 3){\r
+    if (sscanf(p, "%d %s %s", &fid, path, flags) != 3) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(fid < MAX_FILES)){\r
+    if (!(fid < MAX_FILES)) {\r
         printf("File id too big\n");\r
         return -1;\r
     }\r
 \r
     rc = ext4_fopen(&file_tab[fid].fd, path, flags);\r
 \r
-    if(rc == EOK)\r
+    if (rc == EOK)\r
         strcpy(file_tab[fid].name, path);\r
 \r
     return rc;\r
@@ -530,24 +503,24 @@ int _fclose(char *p)
     int fid = MAX_FILES;\r
     int rc;\r
 \r
-    if(sscanf(p, "%d", &fid) != 1){\r
+    if (sscanf(p, "%d", &fid) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(fid < MAX_FILES)){\r
+    if (!(fid < MAX_FILES)) {\r
         printf("File id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(file_tab[fid].name[0] == 0){\r
+    if (file_tab[fid].name[0] == 0) {\r
         printf("File id empty\n");\r
         return -1;\r
     }\r
 \r
     rc = ext4_fclose(&file_tab[fid].fd);\r
 \r
-    if(rc == EOK)\r
+    if (rc == EOK)\r
         file_tab[fid].name[0] = 0;\r
 \r
     return rc;\r
@@ -561,36 +534,36 @@ int _fread(char *p)
     int rc;\r
     int rb;\r
 \r
-    if(sscanf(p, "%d %d %d %d", &fid, &d, &len, &d) != 4){\r
+    if (sscanf(p, "%d %d %d %d", &fid, &d, &len, &d) != 4) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(fid < MAX_FILES)){\r
+    if (!(fid < MAX_FILES)) {\r
         printf("File id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(file_tab[fid].name[0] == 0){\r
+    if (file_tab[fid].name[0] == 0) {\r
         printf("File id empty\n");\r
         return -1;\r
     }\r
 \r
-    while(len){\r
+    while (len) {\r
         d = len > MAX_RW_BUFFER ? MAX_RW_BUFFER : len;\r
 \r
         memset(read_buffer, 0, MAX_RW_BUFFER);\r
         rc = ext4_fread(&file_tab[fid].fd, read_buffer, d, &rb);\r
 \r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
 \r
-        if(rb != d){\r
+        if (rb != d) {\r
             printf("Read count error\n");\r
             return -1;\r
         }\r
 \r
-        if(memcmp(read_buffer, write_buffer, d)){\r
+        if (memcmp(read_buffer, write_buffer, d)) {\r
             printf("Read compare error\n");\r
             return -1;\r
         }\r
@@ -609,29 +582,29 @@ int _fwrite(char *p)
     int rc;\r
     int wb;\r
 \r
-    if(sscanf(p, "%d %d %d %d", &fid, &d, &len, &d) != 4){\r
+    if (sscanf(p, "%d %d %d %d", &fid, &d, &len, &d) != 4) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(fid < MAX_FILES)){\r
+    if (!(fid < MAX_FILES)) {\r
         printf("File id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(file_tab[fid].name[0] == 0){\r
+    if (file_tab[fid].name[0] == 0) {\r
         printf("File id empty\n");\r
         return -1;\r
     }\r
 \r
-    while(len){\r
+    while (len) {\r
         d = len > MAX_RW_BUFFER ? MAX_RW_BUFFER : len;\r
         rc = ext4_fwrite(&file_tab[fid].fd, write_buffer, d, &wb);\r
 \r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
 \r
-        if(wb != d){\r
+        if (wb != d) {\r
             printf("Write count error\n");\r
             return -1;\r
         }\r
@@ -648,17 +621,17 @@ int _fseek(char *p)
     int off;\r
     int origin;\r
 \r
-    if(sscanf(p, "%d %d %d", &fid, &off, &origin) != 3){\r
+    if (sscanf(p, "%d %d %d", &fid, &off, &origin) != 3) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(fid < MAX_FILES)){\r
+    if (!(fid < MAX_FILES)) {\r
         printf("File id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(file_tab[fid].name[0] == 0){\r
+    if (file_tab[fid].name[0] == 0) {\r
         printf("File id empty\n");\r
         return -1;\r
     }\r
@@ -671,23 +644,22 @@ int _ftell(char *p)
     int fid = MAX_FILES;\r
     uint32_t exp_pos;\r
 \r
-    if(sscanf(p, "%d %u", &fid, &exp_pos) != 2){\r
+    if (sscanf(p, "%d %u", &fid, &exp_pos) != 2) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(fid < MAX_FILES)){\r
+    if (!(fid < MAX_FILES)) {\r
         printf("File id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(file_tab[fid].name[0] == 0){\r
+    if (file_tab[fid].name[0] == 0) {\r
         printf("File id empty\n");\r
         return -1;\r
     }\r
 \r
-\r
-    if(exp_pos != ext4_ftell(&file_tab[fid].fd)){\r
+    if (exp_pos != ext4_ftell(&file_tab[fid].fd)) {\r
         printf("Expected filepos error\n");\r
         return -1;\r
     }\r
@@ -700,22 +672,22 @@ int _fsize(char *p)
     int fid = MAX_FILES;\r
     uint32_t exp_size;\r
 \r
-    if(sscanf(p, "%d %u", &fid, &exp_size) != 2){\r
+    if (sscanf(p, "%d %u", &fid, &exp_size) != 2) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(fid < MAX_FILES)){\r
+    if (!(fid < MAX_FILES)) {\r
         printf("File id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(file_tab[fid].name[0] == 0){\r
+    if (file_tab[fid].name[0] == 0) {\r
         printf("File id empty\n");\r
         return -1;\r
     }\r
 \r
-    if(exp_size != ext4_fsize(&file_tab[fid].fd)){\r
+    if (exp_size != ext4_fsize(&file_tab[fid].fd)) {\r
         printf("Expected filesize error\n");\r
         return -1;\r
     }\r
@@ -727,7 +699,7 @@ int _dir_rm(char *p)
 {\r
     char path[255];\r
 \r
-    if(sscanf(p, "%s", path) != 1){\r
+    if (sscanf(p, "%s", path) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -739,7 +711,7 @@ int _dir_mk(char *p)
 {\r
     char path[255];\r
 \r
-    if(sscanf(p, "%s", path) != 1){\r
+    if (sscanf(p, "%s", path) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -753,19 +725,19 @@ int _dir_open(char *p)
     char path[255];\r
     int rc;\r
 \r
-    if(sscanf(p, "%d %s", &did, path) != 2){\r
+    if (sscanf(p, "%d %s", &did, path) != 2) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(did < MAX_DIRS)){\r
+    if (!(did < MAX_DIRS)) {\r
         printf("Dir id too big\n");\r
         return -1;\r
     }\r
 \r
     rc = ext4_dir_open(&dir_tab[did].fd, path);\r
 \r
-    if(rc == EOK)\r
+    if (rc == EOK)\r
         strcpy(dir_tab[did].name, path);\r
 \r
     return rc;\r
@@ -776,24 +748,24 @@ int _dir_close(char *p)
     int did = MAX_DIRS;\r
     int rc;\r
 \r
-    if(sscanf(p, "%d", &did) != 1){\r
+    if (sscanf(p, "%d", &did) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(did < MAX_DIRS)){\r
+    if (!(did < MAX_DIRS)) {\r
         printf("Dir id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(dir_tab[did].name[0] == 0){\r
+    if (dir_tab[did].name[0] == 0) {\r
         printf("Dir id empty\n");\r
         return -1;\r
     }\r
 \r
     rc = ext4_dir_close(&dir_tab[did].fd);\r
 \r
-    if(rc == EOK)\r
+    if (rc == EOK)\r
         dir_tab[did].name[0] = 0;\r
 \r
     return rc;\r
@@ -805,42 +777,40 @@ int _dir_entry_get(char *p)
     int exp;\r
     char name[256];\r
 \r
-    if(sscanf(p, "%d %d", &did, &exp) != 2){\r
+    if (sscanf(p, "%d %d", &did, &exp) != 2) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
-    if(!(did < MAX_DIRS)){\r
+    if (!(did < MAX_DIRS)) {\r
         printf("Dir id too big\n");\r
         return -1;\r
     }\r
 \r
-    if(dir_tab[did].name[0] == 0){\r
+    if (dir_tab[did].name[0] == 0) {\r
         printf("Dir id empty\n");\r
         return -1;\r
     }\r
 \r
-\r
     int idx = 0;\r
     ext4_direntry *d;\r
 \r
-    while(d = ext4_dir_entry_next(&dir_tab[did].fd)){\r
+    while (d = ext4_dir_entry_next(&dir_tab[did].fd)) {\r
 \r
         idx++;\r
         memcpy(name, d->name, d->name_length);\r
         name[d->name_length] = 0;\r
-        if(verbose){\r
+        if (verbose) {\r
             printf("\t%s %s\n", entry_to_str(d->inode_type), name);\r
         }\r
     }\r
 \r
-\r
-    if(idx < 2){\r
+    if (idx < 2) {\r
         printf("Minumum dir entry error\n");\r
         return -1;\r
     }\r
 \r
-    if((idx - 2) != exp){\r
+    if ((idx - 2) != exp) {\r
         printf("Expected dir entry error\n");\r
         return -1;\r
     }\r
@@ -856,9 +826,9 @@ int _multi_fcreate(char *p)
     int cnt;\r
     int rc;\r
     int i;\r
-    ext4_file   fd;\r
+    ext4_file fd;\r
 \r
-    if(sscanf(p, "%s %s %d", path, prefix, &cnt) != 3){\r
+    if (sscanf(p, "%s %s %d", path, prefix, &cnt) != 3) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -867,7 +837,7 @@ int _multi_fcreate(char *p)
         sprintf(path1, "%s%s%d", path, prefix, i);\r
         rc = ext4_fopen(&fd, path1, "wb+");\r
 \r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
     }\r
 \r
@@ -883,9 +853,9 @@ int _multi_fwrite(char *p)
     int len, ll;\r
     int rc;\r
     int i, d, wb;\r
-    ext4_file   fd;\r
+    ext4_file fd;\r
 \r
-    if(sscanf(p, "%s %s %d %d", path, prefix, &cnt, &ll) != 4){\r
+    if (sscanf(p, "%s %s %d %d", path, prefix, &cnt, &ll) != 4) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -894,18 +864,18 @@ int _multi_fwrite(char *p)
         sprintf(path1, "%s%s%d", path, prefix, i);\r
         rc = ext4_fopen(&fd, path1, "rb+");\r
 \r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
 \r
         len = ll;\r
-        while(len){\r
+        while (len) {\r
             d = len > MAX_RW_BUFFER ? MAX_RW_BUFFER : len;\r
             rc = ext4_fwrite(&fd, write_buffer, d, &wb);\r
 \r
-            if(rc != EOK)\r
+            if (rc != EOK)\r
                 break;\r
 \r
-            if(wb != d){\r
+            if (wb != d) {\r
                 printf("Write count error\n");\r
                 return -1;\r
             }\r
@@ -926,9 +896,9 @@ int _multi_fread(char *p)
     int len, ll;\r
     int rc;\r
     int i, d, rb;\r
-    ext4_file   fd;\r
+    ext4_file fd;\r
 \r
-    if(sscanf(p, "%s %s %d %d", path, prefix, &cnt, &ll) != 4){\r
+    if (sscanf(p, "%s %s %d %d", path, prefix, &cnt, &ll) != 4) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -937,25 +907,25 @@ int _multi_fread(char *p)
         sprintf(path1, "%s%s%d", path, prefix, i);\r
         rc = ext4_fopen(&fd, path1, "rb+");\r
 \r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
 \r
         len = ll;\r
-        while(len){\r
+        while (len) {\r
             d = len > MAX_RW_BUFFER ? MAX_RW_BUFFER : len;\r
 \r
             memset(read_buffer, 0, MAX_RW_BUFFER);\r
             rc = ext4_fread(&fd, read_buffer, d, &rb);\r
 \r
-            if(rc != EOK)\r
+            if (rc != EOK)\r
                 break;\r
 \r
-            if(rb != d){\r
+            if (rb != d) {\r
                 printf("Read count error\n");\r
                 return -1;\r
             }\r
 \r
-            if(memcmp(read_buffer, write_buffer, d)){\r
+            if (memcmp(read_buffer, write_buffer, d)) {\r
                 printf("Read compare error\n");\r
                 return -1;\r
             }\r
@@ -972,9 +942,9 @@ int _multi_fremove(char *p)
     char path[256];\r
     char path1[256];\r
     char prefix[32];\r
-    int  cnt, i, rc;\r
+    int cnt, i, rc;\r
 \r
-    if(sscanf(p, "%s %s %d", path, prefix, &cnt) != 3){\r
+    if (sscanf(p, "%s %s %d", path, prefix, &cnt) != 3) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -982,7 +952,7 @@ int _multi_fremove(char *p)
     for (i = 0; i < cnt; ++i) {\r
         sprintf(path1, "%s%s%d", path, prefix, i);\r
         rc = ext4_fremove(path1);\r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
     }\r
 \r
@@ -994,9 +964,9 @@ int _multi_dcreate(char *p)
     char path[256];\r
     char path1[256];\r
     char prefix[32];\r
-    int  cnt, i, rc;\r
+    int cnt, i, rc;\r
 \r
-    if(sscanf(p, "%s %s %d", path, prefix, &cnt) != 3){\r
+    if (sscanf(p, "%s %s %d", path, prefix, &cnt) != 3) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -1004,7 +974,7 @@ int _multi_dcreate(char *p)
     for (i = 0; i < cnt; ++i) {\r
         sprintf(path1, "%s%s%d", path, prefix, i);\r
         rc = ext4_dir_mk(path1);\r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
     }\r
 \r
@@ -1016,9 +986,9 @@ int _multi_dremove(char *p)
     char path[256];\r
     char path1[256];\r
     char prefix[32];\r
-    int  cnt, i, rc;\r
+    int cnt, i, rc;\r
 \r
-    if(sscanf(p, "%s %s %d", path, prefix, &cnt) != 3){\r
+    if (sscanf(p, "%s %s %d", path, prefix, &cnt) != 3) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -1026,20 +996,20 @@ int _multi_dremove(char *p)
     for (i = 0; i < cnt; ++i) {\r
         sprintf(path1, "%s%s%d", path, prefix, i);\r
         rc = ext4_dir_rm(path1);\r
-        if(rc != EOK)\r
+        if (rc != EOK)\r
             break;\r
     }\r
 \r
     return rc;\r
 }\r
 \r
-struct ext4_mount_stats  saved_stats;\r
+struct ext4_mount_stats saved_stats;\r
 \r
 int _stats_save(char *p)\r
 {\r
     char path[256];\r
 \r
-    if(sscanf(p, "%s", path) != 1){\r
+    if (sscanf(p, "%s", path) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
@@ -1052,26 +1022,27 @@ int _stats_check(char *p)
     char path[256];\r
     int rc;\r
 \r
-    struct ext4_mount_stats  actual_stats;\r
+    struct ext4_mount_stats actual_stats;\r
 \r
-    if(sscanf(p, "%s", path) != 1){\r
+    if (sscanf(p, "%s", path) != 1) {\r
         printf("Param list error\n");\r
         return -1;\r
     }\r
 \r
     rc = ext4_mount_point_stats(path, &actual_stats);\r
 \r
-    if(rc != EOK)\r
+    if (rc != EOK)\r
         return rc;\r
 \r
-    if(memcmp(&saved_stats, &actual_stats, sizeof(struct ext4_mount_stats))){\r
-        if(verbose){\r
+    if (memcmp(&saved_stats, &actual_stats, sizeof(struct ext4_mount_stats))) {\r
+        if (verbose) {\r
             printf("\tMount point stats error:\n");\r
             printf("\tsaved_stats:\n");\r
             printf("\tinodes_count = %d\n", saved_stats.inodes_count);\r
             printf("\tfree_inodes_count = %d\n", saved_stats.free_inodes_count);\r
             printf("\tblocks_count = %llu\n", saved_stats.blocks_count);\r
-            printf("\tfree_blocks_count = %llu\n", saved_stats.free_blocks_count);\r
+            printf("\tfree_blocks_count = %llu\n",\r
+                   saved_stats.free_blocks_count);\r
             printf("\tblock_size = %d\n", saved_stats.block_size);\r
             printf("\tblock_group_count = %d\n", saved_stats.block_group_count);\r
             printf("\tblocks_per_group = %d\n", saved_stats.blocks_per_group);\r
@@ -1079,11 +1050,14 @@ int _stats_check(char *p)
             printf("\tvolume_name = %s\n", saved_stats.volume_name);\r
             printf("\tactual_stats:\n");\r
             printf("\tinodes_count = %d\n", actual_stats.inodes_count);\r
-            printf("\tfree_inodes_count = %d\n", actual_stats.free_inodes_count);\r
+            printf("\tfree_inodes_count = %d\n",\r
+                   actual_stats.free_inodes_count);\r
             printf("\tblocks_count = %llu\n", actual_stats.blocks_count);\r
-            printf("\tfree_blocks_count = %llu\n", actual_stats.free_blocks_count);\r
+            printf("\tfree_blocks_count = %llu\n",\r
+                   actual_stats.free_blocks_count);\r
             printf("\tblock_size = %d\n", actual_stats.block_size);\r
-            printf("\tblock_group_count = %d\n", actual_stats.block_group_count);\r
+            printf("\tblock_group_count = %d\n",\r
+                   actual_stats.block_group_count);\r
             printf("\tblocks_per_group = %d\n", actual_stats.blocks_per_group);\r
             printf("\tinodes_per_group = %d\n", actual_stats.inodes_per_group);\r
             printf("\tvolume_name = %s\n", actual_stats.volume_name);\r
@@ -1091,14 +1065,12 @@ int _stats_check(char *p)
         return -1;\r
     }\r
 \r
-\r
-   return rc;\r
+    return rc;\r
 }\r
 \r
-\r
-static char* entry_to_str(uint8_t type)\r
+static char *entry_to_str(uint8_t type)\r
 {\r
-    switch(type){\r
+    switch (type) {\r
     case EXT4_DIRENTRY_UNKNOWN:\r
         return "[UNK] ";\r
     case EXT4_DIRENTRY_REG_FILE:\r
@@ -1126,7 +1098,7 @@ static int winsock_init(void)
 #if WIN32\r
     int rc;\r
     static WSADATA wsaData;\r
-    rc = WSAStartup(MAKEWORD(2,2), &wsaData);\r
+    rc = WSAStartup(MAKEWORD(2, 2), &wsaData);\r
     if (rc != 0) {\r
         return -1;\r
     }\r
@@ -1140,4 +1112,3 @@ static void winsock_fini(void)
     WSACleanup();\r
 #endif\r
 }\r
-\r