Changeset 2024 for Whitix/trunk

Timestamp:

04/02/09 21:26:47 (3 years ago)

Author:

mwhitworth

Message:

Move readFunc and writeFunc to entry.

Files:

• Whitix/trunk/fs/icfs/info.c (modified) (6 diffs)

Whitix/trunk/fs/icfs/info.c

@@ -28 +28 @@
         DWORD copied;
         
-        copied=MIN(size-*position, (DWORD)strlen(iEnt->sVal)-*position);
-        
-        memcpy(data, iEnt->sVal+*position, copied);
+        copied=MIN(size-*position, (DWORD)strlen(*iEnt->sVal)-*position);
+        
+        memcpy(data, (*iEnt->sVal)+*position, copied);
         
         *position+=copied;
@@ -54 +54 @@
         int ret;
 
-        if (iEnt->readFunc == NULL)
+        if (iEnt->entry.readFunc == NULL)
                 return -EPERM;
 
-        ret = iEnt->readFunc(data, size, *position);
+        ret = iEnt->entry.readFunc(data, size, *position);
 
         if (ret >= 0)
@@ -140 +140 @@
 SYMBOL_EXPORT(IcFsAddIntEntry);
 
-struct IcFsEntry* IcFsAddStrEntry(struct KeFsEntry* dir, char* name, char* str, DWORD permissions)
+struct IcFsEntry* IcFsAddStrEntry(struct KeFsEntry* dir, char* name, char** str, DWORD permissions)
 {
         struct KeFsEntry* entry;
@@ -203 +203 @@
         newEnt = IcEntryAlloc();
         newEnt->type = ICFS_TYPE_FUNC;
-        newEnt->readFunc = readFunc;
-        newEnt->writeFunc = writeFunc;
+        newEnt->entry.readFunc = readFunc;
+        newEnt->entry.writeFunc = writeFunc;
         
         entry->file = newEnt;
@@ -247 +247 @@
 
 /* Process an array of IC attributes and add them to a particular directory. */
-int IcAddAttributes(struct KeObject* object, struct IcAttribute* attributes)
+int IcAddAttributes(struct KeObject* object, struct IcAttribute* attributes, int objOffset)
 {
         char* base;
-        int objOffset;
-        
-        if (!object->parent || !object->parent->type || !object->dir)
+                
+        if (!object->parent || !object->dir)
                 return -EFAULT;
-                
-        objOffset = object->parent->type->offset;
-                
-        if (objOffset < 0)
-        {
-                KePrint(KERN_DEBUG "icfs: invalid object offset in type.\n");
-                return -EFAULT;
-        }
-        
-        base = ((char*)object - objOffset);
+        
+        base = ((char*)object) - objOffset;
         
         /* Go through the array and register each element.*/
@@ -284 +275 @@
                                 
                         case ICFS_TYPE_STR:
-                                IcFsAddStrEntry(object->dir, attributes->name, *(char**)(base+attributes->offset),
-                                        permissions);
+                        {
+                                char** p = (char**)(base+attributes->offset);
+                                IcFsAddStrEntry(object->dir, attributes->name, p, permissions);
+                                break;
+                        }
+                                
+                        case ICFS_TYPE_FUNC:
+                                IcFsAddFuncEntry(object->dir, attributes->name, attributes->readFunc,
+                                        attributes->writeFunc);
                                 break;