Changeset 2b9e142 in mainline

Timestamp:

2011-11-10T08:26:02Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

b3d7277

Parents:

1e65444

Message:

used library function instead of while for string length

Location:

uspace/srv/fs/ext4fs

Files:

• Makefile (modified) (1 diff)
• ext4fs_ops.c (modified) (11 diffs)

uspace/srv/fs/ext4fs/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBEXT4_PREFIX)/libext4.a
-EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX)
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBEXT4_PREFIX)/libext4.a $(LIBPOSIX_PREFIX)/libposix.a 
+EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX) -I$(LIBPOSIX_PREFIX)
 BINARY = ext4fs
 

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -42 +42 @@
 #include <macros.h>
 #include <malloc.h>
+#include <string.h>
 #include <adt/hash_table.h>
 #include <ipc/loc.h>
@@ -216 +217 @@
         }
 
-        /* Find length of component in bytes
-         * TODO: check for library function call that does this
-         */
-        component_size = 0;
-        while (*(component+component_size) != 0) {
-                component_size++;
-        }
+        component_size = strlen(component);
 
         if (ext4_superblock_has_feature_compatible(fs->superblock, EXT4_FEATURE_COMPAT_DIR_INDEX) &&
@@ -395 +390 @@
 int ext4fs_node_open(fs_node_t *fn)
 {
-        // TODO stateless operation
+        // Stateless operation
         return EOK;
 }
@@ -882 +877 @@
 
         /* Check for sparse file
-         * If ext2_filesystem_get_inode_data_block_index returned
+         * If ext4_filesystem_get_inode_data_block_index returned
          * fs_block == 0, it means that the given block is not allocated for the
          * file and we need to return a buffer of zeros
@@ -964 +959 @@
         }
 
-//      EXT4FS_DBG("bytes == \%u", bytes);
-
         iblock =  pos / block_size;
 
@@ -971 +964 @@
 
         if (fblock == 0) {
-//              EXT4FS_DBG("Allocate block !!!");
                 rc =  ext4_bitmap_alloc_block(fs, inode_ref, &fblock);
                 if (rc != EOK) {
@@ -984 +976 @@
                 flags = BLOCK_FLAGS_NOREAD;
 
-//              EXT4FS_DBG("block \%u allocated", fblock);
         }
 
@@ -995 +986 @@
 
         if (flags == BLOCK_FLAGS_NOREAD) {
-//              EXT4FS_DBG("fill block with zeros");
                 memset(write_block->data, 0, block_size);
         }
@@ -1012 +1002 @@
                 return rc;
         }
-
-//      EXT4FS_DBG("writing finished");
 
         old_inode_size = ext4_inode_get_size(fs->superblock, inode_ref->inode);
@@ -1109 +1097 @@
 static int ext4fs_close(service_id_t service_id, fs_index_t index)
 {
-        // TODO
         return EOK;
 }
@@ -1155 +1142 @@
 /**
  * @}
- */ 
+ */