diff --git a/src/sys/include/ubixfs/dirCache.h b/src/sys/include/ubixfs/dirCache.h index f8fc89c..c5d41ee 100644 --- a/src/sys/include/ubixfs/dirCache.h +++ b/src/sys/include/ubixfs/dirCache.h @@ -11,15 +11,15 @@ struct cacheNode * subDirsHead; struct cacheNode * subDirsTail; void * info; - int flags; - int dirListEntryCount; - int dirty; + uInt16 attributes; + int dirListEntryCount; + int dirty; unsigned int dirBlock; }; /* cacheNode */ -struct cacheNode * ubixfs_dirCacheFind(struct cacheNode *, char *); -struct cacheNode * ubixfs_dirCacheNew(const char *); -void ubixfs_dirCacheDelete(struct cacheNode **); -struct cacheNode * ubixfs_dirCacheAdd(struct cacheNode *, struct cacheNode *); +struct cacheNode * ubixfs_cacheFind(struct cacheNode *, char *); +struct cacheNode * ubixfs_cacheNew(const char *); +void ubixfs_cacheDelete(struct cacheNode **); +struct cacheNode * ubixfs_cacheAdd(struct cacheNode *, struct cacheNode *); #endif /* !DIRCACHE_H */ diff --git a/src/sys/ubixfs/dirCache.c b/src/sys/ubixfs/dirCache.c index ffa10ee..75ea023 100644 --- a/src/sys/ubixfs/dirCache.c +++ b/src/sys/ubixfs/dirCache.c @@ -82,8 +82,8 @@ dirList = (struct directoryEntry *)tmp->info; for (i = 0; i < tmp->dirListEntryCount; i++) { if (strcmp(dirList[i].fileName, nextDir) == 0) { - tmp = ubixfs_cacheAdd(tmp, ubixfs_dirCacheNew(dirList[i].fileName)); - + tmp = ubixfs_cacheAdd(tmp, ubixfs_cacheNew(dirList[i].fileName)); + tmp->attributes = dirList[i].attributes; } /* if */ } /* for */ return NULL; @@ -131,6 +131,7 @@ tmp->prev = tmp->next = tmp->subDirsHead = tmp->subDirsTail = NULL; tmp->info = NULL; tmp->dirListEntryCount = tmp->dirty = tmp->dirBlock = 0; + tmp->attributes = 0; tmp->name = (char *)kmalloc(strlen(name)); strcpy(tmp->name, name); return tmp; @@ -153,7 +154,7 @@ * will be caught with the above checks */ /* if (tmp->subDirsHead != NULL) */ - ubixfs_CacheDelete(&tmp->subDirsHead); + ubixfs_cacheDelete(&tmp->subDirsHead); kfree(tmp->info); kfree(tmp->name); @@ -196,6 +197,9 @@ /*** $Log$ + Revision 1.10 2004/07/21 22:07:18 flameshadow + chg: renamed caching functions (again) + Revision 1.9 2004/07/21 22:00:04 flameshadow chg: ubixfws_dirCacheAdd now returns a pointer to the node it added chg: minor fix in ubixfs_dirCacheFind() @@ -205,6 +209,9 @@ Revision 1.5 2004/07/20 19:21:30 reddawg You like leaving out $Log$ + You like leaving out Revision 1.10 2004/07/21 22:07:18 flameshadow + You like leaving out chg: renamed caching functions (again) + You like leaving out You like leaving out Revision 1.9 2004/07/21 22:00:04 flameshadow You like leaving out chg: ubixfws_dirCacheAdd now returns a pointer to the node it added You like leaving out chg: minor fix in ubixfs_dirCacheFind()