SF.net SVN: frontierkernel: [1618] Frontier/branches/ Frontier_Long_File_Paths/Common/source/claycallbacks.c

[<cre...@us...>]

Revision: 1618
          http://svn.sourceforge.net/frontierkernel/?rev=1618&view=rev
Author:   creecode
Date:     2007-02-23 10:20:35 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
in clayfolderloopvisit function, dispose handle fs.name

formatting tweaks

Modified Paths:
--------------
    Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c

Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c	2007-02-23 18:16:53 UTC (rev 1617)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/claycallbacks.c	2007-02-23 18:20:35 UTC (rev 1618)
@@ -594,6 +594,7 @@
 	fileinfotobrowserinfo (info, &browserinfo);
 	
 	return ((*(*cb).callback) (bsitem, &browserinfo, (*cb).refcon));
+	
 	} /*clayfolderexpandvisit*/
 
 #endif
@@ -606,13 +607,14 @@
 	#pragma unused(hnode, val)
 	
 	//
-	// 2007-01-17 creedon: support for long odb item names and file paths
+	// 2007-02-23 creedon: support for long odb item names and file paths
 	//
 	// 5.0a17 dmb: no, let clayfolderloop do it, once, even if table is empty
 	//
 	// 5.0a3 dmb: set flmayaffectdisplay for the parent table
 	//
 	
+	boolean fl;
 	tybrowserinfo info;
 	tybrowserspec fs;
 	tycallbackinfo *cbinfo = ( tycallbackinfo * ) refcon;
@@ -627,8 +629,12 @@
 	
 	claygetfileinfo ( &fs, &info );
 	
-	return ( ! ( *( *cbinfo ).callback ) ( handleName, &info, ( *cbinfo ).refcon ) );
+	fl = ! ( *( *cbinfo ).callback ) ( handleName, &info, ( *cbinfo ).refcon );
 	
+	disposehandle ( fs.name );
+	
+	return ( fl );
+	
 	} // clayfolderloopvisit
 	
 #endif
@@ -678,7 +684,7 @@
 	} // clayfolderloop
 
 
-boolean claygetfileinfo (const tybrowserspec *fs, tybrowserinfo *info) {
+boolean claygetfileinfo ( const tybrowserspec *fs, tybrowserinfo *info ) {
 
 	/*
 	5.0a3 dmb: side effect: set flmayaffectdisplay flags
@@ -714,34 +720,37 @@
 			hashcountitems (roottable, &ct);
 			
 			(*info).filesize = ct;
+			
 			}
 		else {
+		
 			if (claylookupvalue (fs, &val, &hnode)) {
+			
+				if (val.valuetype == externalvaluetype) {
 				
-				if (val.valuetype == externalvaluetype) {
-					
 					hv = (hdlexternalvariable) val.data.externalvalue;
 					
 					(**hv).flmayaffectdisplay = true;
 					
 					if (istablevariable (hv)) {
-						
+					
 						(*info).flfolder = true;
 						
 						(*info).filesize = 1; // can expand; don't care about actual #
 						
 						if ((**hv).flinmemory) {
-							
+						
 							if (langexternalvaltotable (val, &ht, hnode))
 								(**ht).flmayaffectdisplay = true;
 							}
 						}
 					}
-				
+					
 		//		langgetvalsize (val, &(*info).filesize);
+		
 				}
 			}
-		
+			
 		/*		*** replace fields with odb-specific info
 		(*fs).filetype = (*fileinfo).filetype;
 		
@@ -883,6 +892,7 @@
 		}
 		
 	pushstring (adj, bs);
+	
 	} /*pushadjective*/
 	
 
@@ -982,6 +992,7 @@
 		} /*switch*/
 	
 	copystring (BIGSTRING ("\x08" "document"), bs);
+	
 	} /*claygetfilekindstring*/
 	
 
@@ -1020,14 +1031,17 @@
 			pushstring (BIGSTRING ("\x01" "s"), bs);
 	
 		return;
+		
 		}
 		
 	numbertostring ((*browserinfo).filesize, bs);
+	
 	} /*claygetfatsizestring*/
 
 
 #endif
 
+
 boolean browsertextchanged ( hdlheadrecord hnode, const Handle handleOriginalName ) {
 
 	//


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.