Changeset 1064 for Whitix

Timestamp:

10/03/08 12:22:51 (3 months ago)

Author:

mwhitworth

Message:

Use a name pointer rather than copying the name into the structure.

Files:

• Whitix/branches/keobject/fs/kfs/dir.c (modified) (6 diffs)

Whitix/branches/keobject/fs/kfs/dir.c

@@ -7 +7 @@
 #include <print.h>
 
+/* TODO: Create KeFsEntry cache. */
+
+/* Returns number of entries in the directory. */
 int KeFsDirSize(struct KeFsDir* dir)
 {
@@ -33 +36 @@
 
         ListForEachEntry(entry,&dir->entries,next)
-        {
-                struct KeObject* object;
-                char* name;
-                
-                object = (struct KeObject*)entry->file;
-                name = KeObjGetName(object);
-                
-                if (strlen( name ) == nameLength &&
-                        !strnicmp(entry->name, name, nameLength))
+                if (!strnicmp(name, entry->name, nameLength))
                         goto found;
-        }
 
         /* Cycled through the whole directory with no luck */
@@ -143 +137 @@
         struct KeFsEntry* entry;
 
-        dir=KeFsNameToDir(dir, &name);
-        
-        if (!dir)
-                return NULL;
-
         /* Check it doesn't exist already. */
         ListForEachEntry(entry, &dir->entries, next)
-                if (!strnicmp(entry->name, name, strlen(name)))
+                if (!strnicmp(entry->name, name, strlen(name)) && strlen(entry->name) == strlen(name))
                         return entry;
         
@@ -159 +148 @@
                 return NULL;
                 
-        entry->type=VFS_ATTR_DIR | VFS_ATTR_READ;
-        strcpy(entry->name, name);
+        entry->type = VFS_ATTR_DIR | VFS_ATTR_READ;
+        entry->name = name;
         
         newDir=&entry->dir;
@@ -176 +165 @@
 {
         struct KeFsEntry* entry;
-
-        dir=KeFsNameToDir(dir, &name);
-        
-        if (!dir)
-                return NULL;
         
         /* Check if the name exists already */
-        ListForEachEntry(entry,&dir->entries,next)
-                if (!strnicmp(entry->name, name, strlen(entry->name)))
+        ListForEachEntry(entry, &dir->entries, next)
+                if (!strnicmp(entry->name, name, strlen(name)))
                         return NULL;
 
         /* Allocate the KeFsEntry, and the name with it */
-        entry=(struct KeFsEntry*)MemAlloc(sizeof(struct KeFsEntry)+strlen(name)+1);
+        entry=(struct KeFsEntry*)MemAlloc(sizeof(struct KeFsEntry));
         if (!entry)
                 return NULL;
 
-        entry->type=VFS_ATTR_FILE | permissions;
-        strcpy(entry->name, name);
+        entry->type = VFS_ATTR_FILE | permissions;
+        entry->name = name;
         
         ListAddTail(&entry->next, &dir->entries);
@@ -204 +188 @@
 void KeFsInitRoot(struct KeFsEntry* root)
 {
-        root->type=VFS_ATTR_DIR | VFS_ATTR_READ;
-        root->name[0]='\0';
+        root->type = VFS_ATTR_DIR | VFS_ATTR_READ;
+        root->name = NULL;
         INIT_LIST_HEAD(&root->dir.entries);
-        root->dir.parent=NULL;
+        root->dir.parent = NULL;
 }