Changeset 8565a42 in mainline for uspace/app/bdsh/cmds/modules/ls/ls.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (10 diffs)

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

@@ -111 +111 @@
         struct dir_elem_t const *da = a;
         struct dir_elem_t const *db = b;
-        
+
         if ((da->s.is_directory && db->s.is_file) ||
             ((da->s.is_directory == db->s.is_directory) &&
@@ -141 +141 @@
         struct dir_elem_t *tosort;
         struct dirent *dp;
-        
+
         if (!dirp)
                 return -1;
@@ -150 +150 @@
                 return -1;
         }
-        
+
         tosort = (struct dir_elem_t *) malloc(alloc_blocks * sizeof(*tosort));
         if (!tosort) {
@@ -157 +157 @@
                 return -1;
         }
-        
+
         while ((dp = readdir(dirp))) {
                 if (nbdirs + 1 > alloc_blocks) {
                         alloc_blocks += alloc_blocks;
-                        
+
                         tmp = (struct dir_elem_t *) realloc(tosort,
                             alloc_blocks * sizeof(struct dir_elem_t));
@@ -170 +170 @@
                         tosort = tmp;
                 }
-                
+
                 /* fill the name field */
                 tosort[nbdirs].name = (char *) malloc(str_size(dp->d_name) + 1);
@@ -189 +189 @@
                 }
         }
-        
+
         if (ls.sort)
                 qsort(&tosort[0], nbdirs, sizeof(struct dir_elem_t), ls_cmp);
-        
+
         for (i = 0; i < nbdirs; i++)
                 ls_print(&tosort[i]);
@@ -214 +214 @@
                 }
         }
-        
+
 out:
         for(i = 0; i < nbdirs; i++)
@@ -239 +239 @@
         DIR *subdirp;
         struct dir_elem_t *dir_list;
-        
+
         const char * const trailing_slash = "/";
 
@@ -294 +294 @@
                 }
         }
-   
+
         ret = CMD_SUCCESS;
 
@@ -355 +355 @@
 
         argc = cli_count_args(argv);
-        
+
         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hur", long_options, &opt_ind);