Menu
▾
▴
SF.net SVN: frontierkernel: [1451] Frontier/branches/FSRef_Migration/Common/source/fileverbs.c
|
From: <cre...@us...> - 2006-07-08 01:03:37
|
Revision: 1451 Author: creecode Date: 2006-07-07 18:03:35 -0700 (Fri, 07 Jul 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1451&view=rev Log Message: ----------- minor code formatting tweaks added extendfilespec to more cases of filefunctionvalue where needed 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-07-08 00:59:15 UTC (rev 1450) +++ Frontier/branches/FSRef_Migration/Common/source/fileverbs.c 2006-07-08 01:03:35 UTC (rev 1451) @@ -450,17 +450,6 @@ return (false); } - /* - - is this needed any more, FSRef migration? - - #ifdef MACVERSION - - (*fsvol).parID = fsRtParID; - - #endif - */ - break; default: @@ -557,7 +546,7 @@ if ( fs.path == NULL ) FSRefGetNameStr255 ( &fs.fsref, bs ); else - CFStringToStr255 ( fs.path, bs ); + CFStringRefToStr255 ( fs.path, bs ); #endif @@ -2719,15 +2708,15 @@ flnextparamislast = true; if ( ! getfilespecvalue ( hp1, 1, &fs ) ) - return ( FALSE ); + return ( false ); if ( ! extendfilespec ( &fs, &fst ) ) - return ( FALSE ); + return ( false ); if ( ! deletefile ( &fst ) ) - return ( FALSE ); + return ( false ); - return ( setbooleanvalue ( TRUE, vreturned ) ); + return ( setbooleanvalue ( true, vreturned ) ); } // filedeleteverb @@ -2742,7 +2731,7 @@ // 1992-06-02 dmb: make sure that destination path doesn't end in a colon; otherwise pathtofilespec will fail // - boolean fl = FALSE; + boolean fl = false; tyfilespec fs, fsalias; if (!langcanusealiases ()) @@ -2780,7 +2769,7 @@ fsaliast.vRefNum = catinfo.volume; fsaliast.parID = catinfo.nodeID; - CFStringToStr255 ( fsalias.path, fsaliast.name ); + CFStringRefToStr255 ( fsalias.path, fsaliast.name ); fl = MakeAliasFile ( &fst, &fsaliast ); @@ -2895,6 +2884,7 @@ #endif + static boolean filefunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) { // @@ -3041,6 +3031,8 @@ if (!getdatevalue (hp1, 2, &when)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!setfilecreated (&fs, when)) break; @@ -3061,6 +3053,8 @@ if (!getdatevalue (hp1, 2, &when)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!setfilemodified (&fs, when)) break; @@ -3132,6 +3126,8 @@ if (!getpathvalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!fileisbusy (&fs, &(*v).data.flvalue)) break; @@ -3139,17 +3135,21 @@ } case filehasbundlefunc: { + tyfilespec fs; flnextparamislast = true; - if (!getpathvalue (hp1, 1, &fs)) + if ( ! getpathvalue ( hp1, 1, &fs ) ) break; - if (!filehasbundle (&fs, &(*v).data.flvalue)) + ( void ) extendfilespec ( &fs, &fs ); + + if ( ! filehasbundle ( &fs, &( *v ).data.flvalue ) ) break; - return (true); + return ( true ); + } case filesetbundlefunc: { @@ -3170,6 +3170,8 @@ if (!flfolder) { + ( void ) extendfilespec ( &fs, &fs ); + if (!filesetbundle (&fs, flbundle)) break; @@ -3420,8 +3422,6 @@ return (true); - // return ( filenewverb ( hp1, v ) ); - } case newfolderfunc: { @@ -3458,6 +3458,8 @@ else */ + ( void ) extendfilespec ( &fs, &fs ); + if (!renamefile (&fs, bs)) break; @@ -3477,6 +3479,8 @@ if (!getpathvalue (hp1, 2, &fs2)) /*bs2 holds the new name*/ break; + ( void ) extendfilespec ( &fs1, &fs1 ); + if (!movefile (&fs1, &fs2)) break; @@ -3540,6 +3544,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!getfreespace (&fs, &ctbytes)) break; @@ -3556,6 +3562,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!getvolumesize (&fs, &ctbytes)) break; @@ -3572,6 +3580,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!langgetextendedvolumeinfo (&fs, &totalbytes, &freebytes)) break; @@ -3588,6 +3598,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!langgetextendedvolumeinfo (&fs, &totalbytes, &freebytes)) break; @@ -3604,6 +3616,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!getvolumeblocksize (&fs, &ctbytes)) break; @@ -3619,6 +3633,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!filesonvolume (&fs, &ctfiles)) break; @@ -3634,6 +3650,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!foldersonvolume (&fs, &ctfolders)) break; @@ -3757,6 +3775,8 @@ if (!getvolumevalue (hp1, 1, &fs)) break; + ( void ) extendfilespec ( &fs, &fs ); + if (!unmountvolume (&fs)) break; @@ -3941,6 +3961,8 @@ if (!fifopenfile (&fs, (long) currentprocess)) return (false); + ( void ) extendfilespec ( &fs, &fs ); + fl = getmp3info (&fs, &seconds, &bitrate, &frequency, &offset, &flvariablebitrate); if (!fifclosefile (&fs)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
