xnu-2782.1.97.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_catalog.h

diff --git a/bsd/hfs/hfs_catalog.h b/bsd/hfs/hfs_catalog.h
index 3eea08ac8cb22c175c0130e8b18a07b781d9c433..a48ca2fb6e408e6a1dcab6151214ec39199c4c72 100644 (file)
--- a/bsd/hfs/hfs_catalog.h
+++ b/bsd/hfs/hfs_catalog.h
@@ -107,7 +107,17 @@ struct cat_attr {
            u_int32_t   cau_dircount;   /* count of sub dirs (for posix nlink) */
            u_int32_t   cau_firstlink;  /* first hardlink link (files only) */
        } ca_union3;
-       u_int8_t        ca_finderinfo[32]; /* Opaque Finder information */
+       union {
+               u_int8_t        ca_finderinfo[32]; /* Opaque Finder information */
+               struct {
+                       FndrFileInfo                                    ca_finderfileinfo;
+                       struct FndrExtendedFileInfo     ca_finderextendedfileinfo;
+               };
+               struct {
+                       FndrDirInfo                                     ca_finderdirinfo;
+                       struct FndrExtendedDirInfo              ca_finderextendeddirinfo;
+               };
+       };
 };
 
 /* Aliases for common fields */
@@ -353,7 +363,8 @@ extern int cat_findname (struct hfsmount *hfsmp,
 extern int cat_getentriesattr(
                        struct hfsmount *hfsmp,
                        directoryhint_t *dirhint,
-                       struct cat_entrylist *ce_list);
+                       struct cat_entrylist *ce_list, 
+                       int *reachedeof);
 
 extern int cat_rename (        struct hfsmount * hfsmp,
                        struct cat_desc * from_cdp,
@@ -364,8 +375,8 @@ extern int cat_rename (     struct hfsmount * hfsmp,
 extern int cat_update (        struct hfsmount *hfsmp,
                        struct cat_desc *descp,
                        struct cat_attr *attrp,
-                       struct cat_fork *dataforkp,
-                       struct cat_fork *rsrcforkp);
+                       const struct cat_fork *dataforkp,
+                       const struct cat_fork *rsrcforkp);
 
 extern int cat_getdirentries(
                        struct hfsmount *hfsmp,