diff --git a/src/sys/include/ubixfs/dirCache.h b/src/sys/include/ubixfs/dirCache.h index 3583b9b..4598417 100644 --- a/src/sys/include/ubixfs/dirCache.h +++ b/src/sys/include/ubixfs/dirCache.h @@ -15,9 +15,9 @@ unsigned int dirBlock; }; /* cacheNode */ -struct cacheNode * dirCacheFind(struct cacheNode *, char *); -struct cacheNode * dirCacheNew(const char *); -void dirCacheDelete(struct cacheNode **); -void dirCacheAdd(struct cacheNode *, struct cacheNode *); +struct cacheNode * ubixfs_dirCacheFind(struct cacheNode *, char *); +struct cacheNode * ubixfs_dirCacheNew(const char *); +void ubixfs_dirCacheDelete(struct cacheNode **); +void ubixfs_dirCacheAdd(struct cacheNode *, struct cacheNode *); #endif /* !DIRCACHE_H */ diff --git a/src/sys/ubixfs/dirCache.c b/src/sys/ubixfs/dirCache.c index a745f09..e7f24cf 100644 --- a/src/sys/ubixfs/dirCache.c +++ b/src/sys/ubixfs/dirCache.c @@ -6,7 +6,7 @@ struct cacheNode * -dirCacheFind(struct cacheNode * head, char * name) { +ubixfs_dirCacheFind(struct cacheNode * head, char * name) { struct cacheNode * tmp = head; unsigned int i; char dirName[256]; @@ -43,7 +43,7 @@ if (*nextDir != '\0') { while (tmp != NULL) { if (strcmp(tmp->name, dirName) == 0) - return dirCacheFind(tmp->subDirsHead, nextDir); + return ubixfs_dirCacheFind(tmp->subDirsHead, nextDir); tmp = tmp->next; } /* while */ /* if we're here, then one level of the dir isn't cached */ @@ -82,10 +82,10 @@ } /* while */ return NULL; /* couldn't find it */ -} /* findNode */ +} /* ubixfs_dirCacheFind */ struct cacheNode * -dirCacheNew(const char * name) { +ubixfs_dirCacheNew(const char * name) { struct cacheNode * tmp = kmalloc(sizeof(struct cacheNode)); assert(tmp); tmp->parent = tmp; @@ -95,10 +95,10 @@ tmp->name = (char *)kmalloc(strlen(name)); strcpy(tmp->name, name); return tmp; -} /* newNode */ +} /* ubixfs_dirCacheNew */ void -dirCacheDelete(struct cacheNode ** head) { +ubixfs_dirCacheDelete(struct cacheNode ** head) { struct cacheNode * tmp = NULL; struct cacheNode * del = NULL; @@ -114,7 +114,7 @@ * will be caught with the above checks */ /* if (tmp->subDirsHead != NULL) */ - dirCacheDelete(&tmp->subDirsHead); + ubixfs_dirCacheDelete(&tmp->subDirsHead); kfree(tmp->dirList); kfree(tmp->name); @@ -138,7 +138,7 @@ #endif void -dirCacheAdd(struct cacheNode *node, struct cacheNode * newNode) { +ubixfs_dirCacheAdd(struct cacheNode *node, struct cacheNode * newNode) { struct cacheNode * tmp; assert(node); @@ -153,5 +153,5 @@ node->subDirsHead = newNode; tmp = node->subDirsHead; return; -} /* dirCacheAdd */ +} /* ubixfs_dirCacheAdd */