Changeset 92f9baca in mainline for uspace/lib/libfs/libfs.c

Timestamp:

2008-05-25T19:49:29Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fa832eb

Parents:

64b67c3

Message:

Optimize conditions in libfs_lookup(). Perform primitive comparisons in the
left-hand subexpression and potentially expensive calls to libfs operations in
the right-hand subexpression.

File:

• uspace/lib/libfs/libfs.c (modified) (3 diffs)

uspace/lib/libfs/libfs.c

@@ -156 +156 @@
                 next++;         /* eat slash */
         
-        while (ops->has_children(cur) && next <= last) {
+        while (next <= last && ops->has_children(cur)) {
                 /* collect the component */
                 len = 0;
@@ -198 +198 @@
                                 if (nodep) {
                                         if (!ops->link(cur, nodep, component)) {
-                                                if (lflag & L_CREATE)
-                                                        (void)ops->destroy(nodep);
+                                                if (lflag & L_CREATE) {
+                                                        (void)ops->destroy(
+                                                            nodep);
+                                                }
                                                 ipc_answer_0(rid, ENOSPC);
                                         } else {
@@ -233 +235 @@
 
         /* handle miss: excessive components */
-        if (!ops->has_children(cur) && next <= last) {
+        if (next <= last && !ops->has_children(cur)) {
                 if (lflag & (L_CREATE | L_LINK)) {
                         if (!ops->is_directory(cur)) {