Changeset 0143f72 in mainline

Timestamp:

2009-07-02T15:01:08Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bb8dc88

Parents:

271283b

Message:

Statically allocated stat structure will do.

Location:

uspace

Files:

• lib/libfs/libfs.c (modified) (2 diffs)
• srv/fs/devfs/devfs_ops.c (modified) (3 diffs)

uspace/lib/libfs/libfs.c

@@ -440 +440 @@
         size_t size;
         if (!ipc_data_read_receive(&callid, &size) ||
-            size < sizeof(struct stat)) {
+            size != sizeof(struct stat)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -446 +446 @@
         }
 
-        struct stat *stat = malloc(sizeof(struct stat));
-        if (!stat) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        memset(stat, 0, sizeof(struct stat));
-        
-        stat->fs_handle = fs_handle;
-        stat->dev_handle = dev_handle;
-        stat->index = index;
-        stat->lnkcnt = ops->lnkcnt_get(fn); 
-        stat->is_file = ops->is_file(fn);
-        stat->size = ops->size_get(fn);
-
-        ipc_data_read_finalize(callid, stat, sizeof(struct stat));
+        struct stat stat;
+        memset(&stat, 0, sizeof(struct stat));
+        
+        stat.fs_handle = fs_handle;
+        stat.dev_handle = dev_handle;
+        stat.index = index;
+        stat.lnkcnt = ops->lnkcnt_get(fn); 
+        stat.is_file = ops->is_file(fn);
+        stat.size = ops->size_get(fn);
+
+        ipc_data_read_finalize(callid, &stat, sizeof(struct stat));
         ipc_answer_0(rid, EOK);
-
-        free(stat);
 }
 

uspace/srv/fs/devfs/devfs_ops.c

@@ -287 +287 @@
         size_t size;
         if (!ipc_data_read_receive(&callid, &size) ||
-            size < sizeof(struct stat)) {
+            size != sizeof(struct stat)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -293 +293 @@
         }
 
-        struct stat *stat = malloc(sizeof(struct stat));
-        if (!stat) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                return;
-        }
-        memset(stat, 0, sizeof(struct stat));
-
-        stat->fs_handle = devfs_reg.fs_handle;
-        stat->dev_handle = dev_handle;
-        stat->index = index;
-        stat->lnkcnt = 1;
-        stat->is_file = (index != 0);
-        stat->size = 0;
+        struct stat stat;
+        memset(&stat, 0, sizeof(struct stat));
+
+        stat.fs_handle = devfs_reg.fs_handle;
+        stat.dev_handle = dev_handle;
+        stat.index = index;
+        stat.lnkcnt = 1;
+        stat.is_file = (index != 0);
+        stat.size = 0;
         
         if (index != 0) {
@@ -316 +311 @@
                 link_t *lnk = hash_table_find(&devices, key);
                 if (lnk != NULL) 
-                        stat->devfs_stat.device = (dev_handle_t)index;
+                        stat.devfs_stat.device = (dev_handle_t)index;
                 fibril_mutex_unlock(&devices_mutex);
         }
 
-        ipc_data_read_finalize(callid, stat, sizeof(struct stat));
+        ipc_data_read_finalize(callid, &stat, sizeof(struct stat));
         ipc_answer_0(rid, EOK);
-
-        free(stat);
 }