Merge remote branch 'sf/branch-allea' into branch-allea

[netatalk.git] / include / atalk / netatalk_conf.h

diff --git a/include/atalk/netatalk_conf.h b/include/atalk/netatalk_conf.h
index a8d525f5726874d290e470f03556c8276ba03f38..5715df748fed5f9c05198a0a8b4d3b59db61aeaa 100644 (file)
--- a/include/atalk/netatalk_conf.h
+++ b/include/atalk/netatalk_conf.h
@@ -22,11 +22,13 @@
 
 extern int        afp_config_parse(AFPObj *obj);
 
+extern int        load_charset(struct vol *vol);
 extern int        load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *));
 extern void       unload_volumes(AFPObj *obj);
 extern struct vol *getvolumes(void);
 extern struct vol *getvolbyvid(const uint16_t);
-extern struct vol *getvolbypath(const char *path);
+extern struct vol *getvolbypath(AFPObj *obj, const char *path);
+extern struct vol *getvolbyname(const char *name);
 extern void       volume_free(struct vol *vol);
 extern void       volume_unlink(struct vol *volume);
 #endif