minor comments

This commit is contained in:
Josh Coalson
2006-10-10 00:35:35 +00:00
parent 35a07eea25
commit 59717c20a2
6 changed files with 13 additions and 13 deletions

View File

@@ -36,11 +36,11 @@ if FLaC__CPU_PPC
# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction # The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
# into cpu.c with an asm(). # into cpu.c with an asm().
if FLaC__SYS_DARWIN if FLaC__SYS_DARWIN
#@@@@@@ PPC optimizations temporarily disabled #@@@ PPC optimizations temporarily disabled
CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
else else
# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
#@@@@@@ PPC optimizations temporarily disabled #@@@ PPC optimizations temporarily disabled
CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
endif endif
endif endif

View File

@@ -28,7 +28,7 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#@@@@@@ #@@@
if FLaC__HAS_AS__TEMPORARILY_DISABLED if FLaC__HAS_AS__TEMPORARILY_DISABLED
SUFFIXES = .s .lo SUFFIXES = .s .lo

View File

@@ -28,7 +28,7 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#@@@@@@ #@@@
if FLaC__HAS_GAS__TEMPORARILY_DISABLED if FLaC__HAS_GAS__TEMPORARILY_DISABLED
SUFFIXES = .s .lo SUFFIXES = .s .lo

View File

@@ -21,7 +21,7 @@
#endif #endif
#include <errno.h> #include <errno.h>
#include <stdio.h> /* for snprintf() */ #include <stdio.h>
#include <string.h> #include <string.h>
#include "options.h" #include "options.h"
#include "utils.h" #include "utils.h"

View File

@@ -330,11 +330,11 @@ static bool write_chain_(FLAC::Metadata::Chain &chain, bool use_padding, bool pr
return false; return false;
} }
if(0 == (file = fopen(filename, "rb"))) if(0 == (file = fopen(filename, "rb")))
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
if(!open_tempfile_(filename, &tempfile, &tempfilename)) { if(!open_tempfile_(filename, &tempfile, &tempfilename)) {
fclose(file); fclose(file);
cleanup_tempfile_(&tempfile, &tempfilename); cleanup_tempfile_(&tempfile, &tempfilename);
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
} }
if(!chain.write(use_padding, (::FLAC__IOHandle)file, callbacks, (::FLAC__IOHandle)tempfile, callbacks)) { if(!chain.write(use_padding, (::FLAC__IOHandle)file, callbacks, (::FLAC__IOHandle)tempfile, callbacks)) {
fclose(file); fclose(file);
@@ -352,7 +352,7 @@ static bool write_chain_(FLAC::Metadata::Chain &chain, bool use_padding, bool pr
else { else {
FILE *file = fopen(filename, "r+b"); FILE *file = fopen(filename, "r+b");
if(0 == file) if(0 == file)
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
if(!chain.write(use_padding, (::FLAC__IOHandle)file, callbacks)) if(!chain.write(use_padding, (::FLAC__IOHandle)file, callbacks))
return false; return false;
fclose(file); fclose(file);
@@ -378,7 +378,7 @@ static bool read_chain_(FLAC::Metadata::Chain &chain, const char *filename, bool
bool ret; bool ret;
FILE *file = fopen(filename, "rb"); FILE *file = fopen(filename, "rb");
if(0 == file) if(0 == file)
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
ret = chain.read((::FLAC__IOHandle)file, callbacks); ret = chain.read((::FLAC__IOHandle)file, callbacks);
fclose(file); fclose(file);
return ret; return ret;

View File

@@ -317,11 +317,11 @@ static FLAC__bool write_chain_(FLAC__Metadata_Chain *chain, FLAC__bool use_paddi
return false; return false;
} }
if(0 == (file = fopen(filename, "rb"))) if(0 == (file = fopen(filename, "rb")))
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
if(!open_tempfile_(filename, &tempfile, &tempfilename)) { if(!open_tempfile_(filename, &tempfile, &tempfilename)) {
fclose(file); fclose(file);
cleanup_tempfile_(&tempfile, &tempfilename); cleanup_tempfile_(&tempfile, &tempfilename);
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
} }
if(!FLAC__metadata_chain_write_with_callbacks_and_tempfile(chain, use_padding, (FLAC__IOHandle)file, callbacks, (FLAC__IOHandle)tempfile, callbacks)) { if(!FLAC__metadata_chain_write_with_callbacks_and_tempfile(chain, use_padding, (FLAC__IOHandle)file, callbacks, (FLAC__IOHandle)tempfile, callbacks)) {
fclose(file); fclose(file);
@@ -339,7 +339,7 @@ static FLAC__bool write_chain_(FLAC__Metadata_Chain *chain, FLAC__bool use_paddi
else { else {
FILE *file = fopen(filename, "r+b"); FILE *file = fopen(filename, "r+b");
if(0 == file) if(0 == file)
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
if(!FLAC__metadata_chain_write_with_callbacks(chain, use_padding, (FLAC__IOHandle)file, callbacks)) if(!FLAC__metadata_chain_write_with_callbacks(chain, use_padding, (FLAC__IOHandle)file, callbacks))
return false; return false;
fclose(file); fclose(file);
@@ -365,7 +365,7 @@ static FLAC__bool read_chain_(FLAC__Metadata_Chain *chain, const char *filename,
FLAC__bool ret; FLAC__bool ret;
FILE *file = fopen(filename, "rb"); FILE *file = fopen(filename, "rb");
if(0 == file) if(0 == file)
return false; /*@@@ chain status still says OK though */ return false; /*@@@@ chain status still says OK though */
ret = FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks); ret = FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, callbacks);
fclose(file); fclose(file);
return ret; return ret;