diff --git a/copy/btree.cpp b/copy/btree.cpp index 9c8ef75..e04822c 100644 --- a/copy/btree.cpp +++ b/copy/btree.cpp @@ -133,7 +133,7 @@ inode->prev = iptr->prev; inode->next = iptr; iptr->prev = inode; - if (inode->prev != NULL) inode->prev->next = inode; + if (inode->prev != NULL) inode->prev->next = (ubixfsInode *)inode; } else { inode->next = inode->prev = NULL; } // else @@ -635,11 +635,12 @@ if (node == NULL) return true; while (node != NULL) { - if (node->next != NULL) { + ubixfsInode * next = node->next; + if (next != NULL) { // cout << node->name << "::" << node->next->name << ":::" << strcmp(node->name, node->next->name) << endl; - if (strcmp(node->name, node->next->name) > 0) return false; + if (strcmp(node->name, next->name) > 0) return false; } - node = node->next; + node = next; } // while return true; } // bTree::Verify diff --git a/include/inode.h b/include/inode.h index 6a1bb18..1e9f900 100644 --- a/include/inode.h +++ b/include/inode.h @@ -38,14 +38,14 @@ // inodeAddr attributes __attribute__ ((packed)); uInt32 type __attribute__ ((packed)); int32 inodeSize __attribute__ ((packed)); - void * parentBigPtr __attribute__ ((packed)); - void * parent __attribute__ ((packed)); - void * nextBigPtr __attribute__ ((packed)); - void * next __attribute__ ((packed)); - void * prevBigPtr __attribute__ ((packed)); - void * prev __attribute__ ((packed)); + struct ubixfsInode * parentBigPtr __attribute__ ((packed)); + struct ubixfsInode * parent __attribute__ ((packed)); + struct ubixfsInode * nextBigPtr __attribute__ ((packed)); + struct ubixfsInode * next __attribute__ ((packed)); + struct ubixfsInode * prevBigPtr __attribute__ ((packed)); + struct ubixfsInode * prev __attribute__ ((packed)); // binodeEtc *etc ?? dataStream data __attribute__ ((packed)); - char smallData[3636] __attribute__ ((packed)); + char smallData[3220] __attribute__ ((packed)); } ubixfsInode; #endif