Changeset 92fd52d7 in mainline for uspace/srv/fs/tmpfs/tmpfs_ops.c

Timestamp:

2009-04-09T21:16:50Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7afb4a5

Parents:

a2c58f6

Message:

Nuke strcpy() and strcmp().

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (8 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -256 +256 @@
         assert(hlp);
         tmpfs_name_t *namep = hash_table_get_instance(hlp, tmpfs_name_t, link);
-        return !strcmp(namep->name, component);
+        return !str_cmp(namep->name, component);
 }
 
@@ -320 +320 @@
                 return ENOMEM;
         tmpfs_name_initialize(namep);
-        size_t len = strlen(nm);
-        namep->name = malloc(len + 1);
+        size_t size = str_size(nm);
+        namep->name = malloc(size + 1);
         if (!namep->name) {
                 free(namep);
@@ -455 +455 @@
          */
         ipc_callid_t callid;
-        size_t len;
-        if (!ipc_data_read_receive(&callid, &len)) {
+        size_t size;
+        if (!ipc_data_read_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);   
                 ipc_answer_0(rid, EINVAL);
@@ -464 +464 @@
         size_t bytes;
         if (dentry->type == TMPFS_FILE) {
-                bytes = max(0, min(dentry->size - pos, len));
+                bytes = max(0, min(dentry->size - pos, size));
                 (void) ipc_data_read_finalize(callid, dentry->data + pos,
                     bytes);
@@ -495 +495 @@
 
                 (void) ipc_data_read_finalize(callid, namep->name,
-                    strlen(namep->name) + 1);
+                    str_size(namep->name) + 1);
                 bytes = 1;
         }
@@ -528 +528 @@
          */
         ipc_callid_t callid;
-        size_t len;
-        if (!ipc_data_write_receive(&callid, &len)) {
+        size_t size;
+        if (!ipc_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);   
                 ipc_answer_0(rid, EINVAL);
@@ -538 +538 @@
          * Check whether the file needs to grow.
          */
-        if (pos + len <= dentry->size) {
+        if (pos + size <= dentry->size) {
                 /* The file size is not changing. */
-                (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
-                ipc_answer_2(rid, EOK, len, dentry->size);
-                return;
-        }
-        size_t delta = (pos + len) - dentry->size;
+                (void) ipc_data_write_finalize(callid, dentry->data + pos, size);
+                ipc_answer_2(rid, EOK, size, dentry->size);
+                return;
+        }
+        size_t delta = (pos + size) - dentry->size;
         /*
          * At this point, we are deliberately extremely straightforward and
@@ -562 +562 @@
         dentry->size += delta;
         dentry->data = newdata;
-        (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
-        ipc_answer_2(rid, EOK, len, dentry->size);
+        (void) ipc_data_write_finalize(callid, dentry->data + pos, size);
+        ipc_answer_2(rid, EOK, size, dentry->size);
 }