Changeset a35b458 in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/srv/vfs/vfs_lookup.c (modified) (19 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -108 +108 @@
          */
         list_append(&entry->plb_link, &plb_entries);
-        
+
         fibril_mutex_unlock(&plb_mutex);
 
@@ -116 +116 @@
         size_t cnt1 = min(len, (PLB_SIZE - first) + 1);
         size_t cnt2 = len - cnt1;
-        
+
         memcpy(&plb[first], path, cnt1);
         memcpy(plb, &path[cnt1], cnt2);
@@ -145 +145 @@
         assert(child->fs_handle);
         assert(path != NULL);
-        
+
         vfs_lookup_res_t res;
         char component[NAME_MAX + 1];
         errno_t rc;
-        
+
         size_t len;
         char *npath = canonify(path, &len);
@@ -157 +157 @@
         }
         path = npath;
-        
+
         vfs_triplet_t *triplet;
-        
+
         char *slash = str_rchr(path, L'/');
         if (slash && slash != path) {
@@ -166 +166 @@
                         goto out;
                 }
-                
+
                 memcpy(component, slash + 1, str_size(slash));
                 *slash = 0;
-                
+
                 rc = vfs_lookup_internal(base, path, L_DIRECTORY, &res);
                 if (rc != EOK)
                         goto out;
                 triplet = &res.triplet;
-                
+
                 *slash = '/';
         } else {
@@ -181 +181 @@
                         goto out;
                 }
-                
+
                 memcpy(component, path + 1, str_size(path));
                 triplet = (vfs_triplet_t *) base;
         }
-        
+
         if (triplet->fs_handle != child->fs_handle ||
             triplet->service_id != child->service_id) {
@@ -191 +191 @@
                 goto out;
         }
-        
+
         async_exch_t *exch = vfs_exchange_grab(triplet->fs_handle);
         aid_t req = async_send_3(exch, VFS_OUT_LINK, triplet->service_id,
             triplet->index, child->index, NULL);
-        
+
         rc = async_data_write_start(exch, component, str_size(component) + 1);
         errno_t orig_rc;
@@ -202 +202 @@
         if (orig_rc != EOK)
                 rc = orig_rc;
-        
+
 out:
         return rc;
@@ -212 +212 @@
         assert(base);
         assert(result);
-        
+
         errno_t rc;
         ipc_call_t answer;
@@ -221 +221 @@
         async_wait_for(req, &rc);
         vfs_exchange_release(exch);
-        
+
         if (rc != EOK)
                 return rc;
-        
+
         unsigned last = *pfirst + *plen;
         *pfirst = IPC_GET_ARG3(answer) & 0xffff;
         *plen = last - *pfirst;
-        
+
         result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
         result->triplet.service_id = base->service_id;
@@ -248 +248 @@
         if (rc != EOK)
                 return rc;
-        
+
         size_t next = first;
         size_t nlen = len;
-        
+
         vfs_lookup_res_t res;
-        
+
         /* Resolve path as long as there are mount points to cross. */
         while (nlen > 0) {
@@ -261 +261 @@
                                 goto out;
                         }
-                        
+
                         base = base->mount;
                 }
-                
+
                 rc = out_lookup((vfs_triplet_t *) base, &next, &nlen, lflag,
                     &res);
                 if (rc != EOK)
                         goto out;
-                
+
                 if (nlen > 0) {
                         base = vfs_node_peek(&res);
@@ -288 +288 @@
                 }
         }
-        
+
         assert(nlen == 0);
         rc = EOK;
-        
+
         if (result != NULL) {
                 /* The found file may be a mount point. Try to cross it. */
@@ -303 +303 @@
                                         base = nbase;
                                 }
-                                
+
                                 result->triplet = *((vfs_triplet_t *) base);
                                 result->type = base->type;
@@ -316 +316 @@
                 *result = res;
         }
-        
+
 out:
         plb_clear_entry(&entry, first, len);
@@ -339 +339 @@
         assert(base != NULL);
         assert(path != NULL);
-        
+
         size_t len;
         errno_t rc;
@@ -348 +348 @@
         }
         path = npath;
-        
+
         assert(path[0] == '/');
 
@@ -367 +367 @@
                 char *slash = str_rchr(path, L'/');
                 vfs_node_t *parent = base;
-                
+
                 if (slash != path) {
                         int tflag = lflag;
@@ -392 +392 @@
                 rc = _vfs_lookup_internal(base, path, lflag, result, len);
         }
-        
+
         return rc;
 }