Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / src / libcaptive / cc / bcbmap.c

diff --git a/src/libcaptive/cc/bcbmap.c b/src/libcaptive/cc/bcbmap.c
index 4e37add..cde1cdd 100644 (file)
--- a/src/libcaptive/cc/bcbmap.c
+++ b/src/libcaptive/cc/bcbmap.c
@@ -76,6 +76,10 @@ BOOLEAN CcMapData(IN PFILE_OBJECT FileObject,
 {
 CaptiveSharedCacheMapObject *SharedCacheMap;
 CaptivePrivateBcbMapObject *captive_private_bcb_map_object;
+BOOLEAN r;
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"enter: CcMapData: FileObject=0x%lX,FileOffset=0x%lX,Length=0x%lX,Flags=0x%lX",
+                       (long)FileObject,(!FileOffset ? -1 : (long)FileOffset->QuadPart),Length,Flags);
 
        g_return_val_if_fail(FileObject!=NULL,FALSE);
        g_return_val_if_fail(FileOffset!=NULL,FALSE);
@@ -85,9 +89,6 @@ CaptivePrivateBcbMapObject *captive_private_bcb_map_object;
        g_return_val_if_fail(Bcb!=NULL,FALSE);
        g_return_val_if_fail(Buffer!=NULL,FALSE);
 
-       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: FileObject=%p,FileOffset=0x%llX,Length=0x%lX,Flags=0x%lX",G_STRLOC,
-                       FileObject,(guint64)FileOffset->QuadPart,(gulong)Length,(gulong)Flags);
-
        SharedCacheMap=captive_FileObject_to_SharedCacheMap(FileObject);
        captive_private_bcb_map_object=captive_private_bcb_map_object_get_ref(SharedCacheMap);
 
@@ -95,8 +96,12 @@ CaptivePrivateBcbMapObject *captive_private_bcb_map_object;
 
        *Bcb=captive_private_bcb_object_get_PublicBcb(CAPTIVE_PRIVATE_BCB_OBJECT(captive_private_bcb_map_object));
        *Buffer=captive_shared_cache_map_get_buffer(SharedCacheMap)+FileOffset->QuadPart;
+       r=TRUE;
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"leave: CcMapData: r=%d,Bcb=0x%lX,Buffer=0x%lX",
+                               r,(!Bcb ? -1 : (long)*Bcb),(!Buffer ? -1 : (long)*Buffer));
 
-       return TRUE;
+       return r;
 }
 
 
@@ -129,6 +134,8 @@ CaptiveSharedCacheMapObject *SharedCacheMap;
 CaptivePrivateBcbMapObject *captive_private_bcb_map_object;
 PUBLIC_BCB *PublicBcb;
 
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"enter: CcRemapBcb: Bcb=0x%lX",(long)Bcb);
+
        g_return_val_if_fail(Bcb!=NULL,NULL);
 
        captive_private_bcb_object=captive_PublicBcb_to_PrivateBcbObject(Bcb);
@@ -139,5 +146,7 @@ PUBLIC_BCB *PublicBcb;
 
        PublicBcb=captive_private_bcb_object_get_PublicBcb(CAPTIVE_PRIVATE_BCB_OBJECT(captive_private_bcb_map_object));
 
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"leave: CcRemapBcb: r=0x%lX",(long)PublicBcb);
+
        return PublicBcb;
 }