Changeset d011038 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (3 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -69 +69 @@
         char *ncwd_path;
         char *ncwd_path_nc;
+        size_t total_size; 
 
         fibril_mutex_lock(&cwd_mutex);
@@ -77 +78 @@
                         return NULL;
                 }
-                ncwd_path_nc = malloc(cwd_size + 1 + size + 1);
+                total_size = cwd_size + 1 + size + 1;
+                ncwd_path_nc = malloc(total_size);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
                         return NULL;
                 }
-                str_cpy(ncwd_path_nc, cwd_size + 1 + size + 1, cwd_path);
+                str_cpy(ncwd_path_nc, total_size, cwd_path);
                 ncwd_path_nc[cwd_size] = '/';
                 ncwd_path_nc[cwd_size + 1] = '\0';
         } else {
-                ncwd_path_nc = malloc(size + 1);
+                total_size = size + 1;
+                ncwd_path_nc = malloc(total_size);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
@@ -93 +96 @@
                 ncwd_path_nc[0] = '\0';
         }
-        str_append(ncwd_path_nc, cwd_size + 1 + size + 1, path);
+        str_append(ncwd_path_nc, total_size, path);
         ncwd_path = canonify(ncwd_path_nc, retlen);
         if (!ncwd_path) {