Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

[netatalk.git] / bin / ad / ad.h

diff --git a/bin/ad/ad.h b/bin/ad/ad.h
index fcfe1220115c48e43639a65ea3db3e98f681ed0b..9155900c990f3f9f02773a11ffc7b6f1ea3fcbb6 100644 (file)
--- a/bin/ad/ad.h
+++ b/bin/ad/ad.h
@@ -38,6 +38,8 @@
     }
 #endif
 
+#define ADVOL_V2_OR_EA(ad) ((ad) == AD_VERSION2 || (ad) == AD_VERSION_EA)
+
 enum logtype {STD, DBG};
 
 #define SLOG(...)                             \
@@ -59,15 +61,14 @@ extern void _log(enum logtype lt, char *fmt, ...);
 
 extern int ad_ls(int argc, char **argv, AFPObj *obj);
 extern int ad_cp(int argc, char **argv, AFPObj *obj);
-
 extern int ad_rm(int argc, char **argv, AFPObj *obj);
 extern int ad_mv(int argc, char **argv, AFPObj *obj);
+extern int ad_set(int argc, char **argv, AFPObj *obj);
 extern int ad_find(int argc, char **argv, AFPObj *obj);
 
 /* ad_util.c */
 extern int openvol(AFPObj *obj, const char *path, afpvol_t *vol);
 extern void closevol(afpvol_t *vol);
-extern cnid_t cnid_for_path(const afpvol_t *vol, const char *path, cnid_t *did);
 extern cnid_t cnid_for_paths_parent(const afpvol_t *vol, const char *path, cnid_t *did);
 extern char *utompath(const struct vol *, const char *);
 extern int convert_dots_encoding(const afpvol_t *svol, const afpvol_t *dvol, char *path, size_t buflen);