SF.net SVN: frontierkernel: [1567] Frontier/branches/FSRef_Migration/Common /source/fileverbs.c

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

Revision: 1567
          http://svn.sourceforge.net/frontierkernel/?rev=1567&view=rev
Author:   creecode
Date:     2006-10-17 11:04:48 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
minor formatting and code tweaks, no functional change

Modified Paths:
--------------
    Frontier/branches/FSRef_Migration/Common/source/fileverbs.c

Modified: Frontier/branches/FSRef_Migration/Common/source/fileverbs.c
===================================================================
--- Frontier/branches/FSRef_Migration/Common/source/fileverbs.c	2006-10-17 17:36:00 UTC (rev 1566)
+++ Frontier/branches/FSRef_Migration/Common/source/fileverbs.c	2006-10-17 18:04:48 UTC (rev 1567)
@@ -3615,6 +3615,7 @@
 		*/
 		
 		case volumeisejectablefunc: {
+		
 			tyfilespec fs;
 			
 			flnextparamislast = true;
@@ -3622,134 +3623,130 @@
 			if (!getvolumevalue (hp1, 1, &fs))
 				break;
 			
-			return (isejectable (&fs, &(*v).data.flvalue));	
+			return (isejectable (&fs, &(*v).data.flvalue));
+			
 			}
 
-
 		case volumefreespacefunc: {
-			tyfilespec fs;
+		
 			long ctbytes;
+			tyfilespec fs;
 			
 			flnextparamislast = true;
 			
 			if (!getvolumevalue (hp1, 1, &fs))
 				break;
 			
-			( void ) extendfilespec ( &fs, &fs );
-			
 			if (!getfreespace (&fs, &ctbytes))
 				break;
 
 			return (setlongvalue (ctbytes, v));
+			
 			}
 		
-
 		case volumesizefunc: {
-			tyfilespec fs;
+		
 			long ctbytes;
+			tyfilespec fs;
 			
 			flnextparamislast = true;
 			
 			if (!getvolumevalue (hp1, 1, &fs))
 				break;
 
-			( void ) extendfilespec ( &fs, &fs );
-			
 			if (!getvolumesize (&fs, &ctbytes))
 				break;
 			
 			return (setlongvalue (ctbytes, v));
+			
 			}
 		
-
-		case volumefreespacedoublefunc: { /*6.1b16 AR*/
+		case volumefreespacedoublefunc: { // 6.1b16 AR
+		
+			double freebytes, totalbytes;
 			tyfilespec fs;
-			double totalbytes, freebytes;
 			
 			flnextparamislast = true;
 			
 			if (!getvolumevalue (hp1, 1, &fs))
 				break;
 			
-			( void ) extendfilespec ( &fs, &fs );
-			
 			if (!langgetextendedvolumeinfo (&fs, &totalbytes, &freebytes))
 				break;
 
 			return (setdoublevalue (freebytes, v));
+			
 			}
 		
-
-		case volumesizedoublefunc: { /*6.1b16 AR*/
+		case volumesizedoublefunc: { // 6.1b16 AR
+		
+			double freebytes, totalbytes;
 			tyfilespec fs;
-			double totalbytes, freebytes;
 			
 			flnextparamislast = true;
 			
 			if (!getvolumevalue (hp1, 1, &fs))
 				break;
 			
-			( void ) extendfilespec ( &fs, &fs );
-			
 			if (!langgetextendedvolumeinfo (&fs, &totalbytes, &freebytes))
 				break;
 
 			return (setdoublevalue (totalbytes, v));
+			
 			}
 
-
+		
 		case volumeblocksizefunc: {
-			tyfilespec fs;
+		
 			long ctbytes;
-			
+			tyfilespec fs;
+
 			flnextparamislast = true;
 			
 			if (!getvolumevalue (hp1, 1, &fs))
 				break;
 			
-			( void ) extendfilespec ( &fs, &fs );
-			
 			if (!getvolumeblocksize (&fs, &ctbytes))
 				break;
 			
 			return (setlongvalue (ctbytes, v));
+			
 			}
 		
 		case filesonvolumefunc: {
-			tyfilespec fs;
+		
 			long ctfiles;
+			tyfilespec fs;
 			
 			flnextparamislast = true;
 			
-			if (!getvolumevalue (hp1, 1, &fs))
+			if ( ! getvolumevalue ( hp1, 1, &fs ) )
 				break;
 			
-			( void ) extendfilespec ( &fs, &fs );
-			
-			if (!filesonvolume (&fs, &ctfiles))
+			if ( ! filesonvolume ( &fs, &ctfiles ) )
 				break;
 			
-			return (setlongvalue (ctfiles, v));
-			}	
+			return ( setlongvalue ( ctfiles, v ) );
+			
+			}
 		
 		case foldersonvolumefunc: {
-			tyfilespec fs;
+		
 			long ctfolders;
+			tyfilespec fs;
 			
 			flnextparamislast = true;
 			
 			if (!getvolumevalue (hp1, 1, &fs))
 				break;
 			
-			( void ) extendfilespec ( &fs, &fs );
-			
 			if (!foldersonvolume (&fs, &ctfolders))
 				break;
 			
 			return (setlongvalue (ctfolders, v));
+			
 			}
 		
-		
 		/* 11/7/91 dmb: now called from shellsysverbs.c
 		case filelaunchfunc:
 			return (filelaunchanythingverb (hp1, v));


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