Postpone captive_fs_new() to the process of lufsd(8)

[captive.git] / src / client / lufs / captivefs-misc.c

diff --git a/src/client/lufs/captivefs-misc.c b/src/client/lufs/captivefs-misc.c
index 63ffc9a..8eeb397 100644 (file)
--- a/src/client/lufs/captivefs-misc.c
+++ b/src/client/lufs/captivefs-misc.c
@@ -21,6 +21,7 @@
 
 #include "captivefs-misc.h"    /* self */
 #include <glib/gmessages.h>
+#include "captivefs-vfs.h"
 
 #include <captive/client-vfs.h>
 
@@ -32,14 +33,14 @@ G_LOCK_DEFINE(libcaptive);
 /* Resolve a link (if the info was not added to the dir cache when 
  * reading the parent dir)
  */
-int captivefs_readlink(CaptiveVfsObject *captive_vfs_object,const char *link,char *buf,int buflen)
+int captivefs_readlink(struct captivefs_vfs *captivefs_vfs,const char *link,char *buf,int buflen)
 {
-       g_return_val_if_fail(CAPTIVE_VFS_IS_OBJECT(captive_vfs_object),-1);
+       g_return_val_if_fail(captivefs_vfs_validate(captivefs_vfs),-1);
        g_return_val_if_fail(link!=NULL,-1);
        g_return_val_if_fail(buf!=NULL,-1);
        g_return_val_if_fail(buflen>0,-1);
 
-       if (VFS_DEBUG_MESSAGES(captive_vfs_object))
+       if (captivefs_vfs->options.debug_messages)
                g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"captivefs_readlink: link=%s,buflen=%d",link,buflen);
 
        return -1;      /* unsupported by W32 */
@@ -48,13 +49,13 @@ int captivefs_readlink(CaptiveVfsObject *captive_vfs_object,const char *link,cha
 
 /* Create a link
  */
-int captivefs_link(CaptiveVfsObject *captive_vfs_object,const char *target,const char *lnk)
+int captivefs_link(struct captivefs_vfs *captivefs_vfs,const char *target,const char *lnk)
 {
-       g_return_val_if_fail(CAPTIVE_VFS_IS_OBJECT(captive_vfs_object),-1);
+       g_return_val_if_fail(captivefs_vfs_validate(captivefs_vfs),-1);
        g_return_val_if_fail(target!=NULL,-1);
        g_return_val_if_fail(lnk!=NULL,-1);
 
-       if (VFS_DEBUG_MESSAGES(captive_vfs_object))
+       if (captivefs_vfs->options.debug_messages)
                g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"captivefs_link: target=%s,lnk=%s",target,lnk);
 
        return -1;      /* unsupported by W32 */
@@ -63,13 +64,13 @@ int captivefs_link(CaptiveVfsObject *captive_vfs_object,const char *target,const
 
 /* Create a symlink
  */
-int captivefs_symlink(CaptiveVfsObject *captive_vfs_object,const char *target,const char *link)
+int captivefs_symlink(struct captivefs_vfs *captivefs_vfs,const char *target,const char *link)
 {
-       g_return_val_if_fail(CAPTIVE_VFS_IS_OBJECT(captive_vfs_object),-1);
+       g_return_val_if_fail(captivefs_vfs_validate(captivefs_vfs),-1);
        g_return_val_if_fail(target!=NULL,-1);
        g_return_val_if_fail(link!=NULL,-1);
 
-       if (VFS_DEBUG_MESSAGES(captive_vfs_object))
+       if (captivefs_vfs->options.debug_messages)
                g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"captivefs_symlink: target=%s,link=%s",target,link);
 
        return -1;      /* unsupported by W32 */