Apple-2-Tools/apple2_prodos_utils
1
0 Fork 0
mirror of https://github.com/Michaelangel007/apple2_prodos_utils.git synced 2026-10-22 00:02:22 +00:00
Code Issues Projects Releases Wiki Activity

Refactor to cleanup compiler warning about null file handle

Browse Source
This commit is contained in:
michaelangel007 committed 2025-01-26 13:27:20 -08:00
1 parent 53a8789539
commit 08aa668f7f
1 file changed
+51 -47
Download Patch File Download Diff File Expand all files Collapse all files
generic.disk.cpp
+51 -47
View File
@@ -253,59 +253,63 @@ bool DskLoad( const char *dsk_filename, SectorOrder_e sector_order )
// ======================================================================== // ========================================================================
bool DskSave() bool DskSave()
{ {
bool status = false;
FILE *pFile = fopen( gpDskName, "w+b" ); FILE *pFile = fopen( gpDskName, "w+b" );
if( !pFile ) if( pFile )
{
fseek( pFile, 0L, SEEK_SET );
if( giInterleaveLastUsed == INTERLEAVE_PRODOS_ORDER )
{
size_t wrote = fwrite( gaDsk, 1, gnDskSize, pFile );
(void) wrote;
#if DEBUG_DSK_SAVE
printf( "DskSave() wrote .po: %d\n", wrote );
#endif
}
else
if( giInterleaveLastUsed == INTERLEAVE_DOS33_ORDER )
{
int nTracks = DSK_GetNumTracks();
size_t offset = 0;
#if DEBUG_DSK_SAVE
printf( "Tracks: %d\n", nTracks );
#endif
for( int iTracks = 0; iTracks < nTracks; iTracks++ )
{
size_t dst = offset;
for( int iSector = 0; iSector < 16; iSector++ )
{
size_t src;
size_t dst;
Interleave_Reverse( iSector, &src, &dst );
#if DEBUG_DSK_SAVE
if( iTracks == 0 )
printf( "%06X -> T0S%X\n", dst, iSector );
#endif
fseek( pFile, (long)(offset + dst), SEEK_SET );
fwrite( &gaDsk[ offset + src ], 1, DSK_SECTOR_SIZE, pFile );
}
offset += 16 * DSK_SECTOR_SIZE;
}
}
fclose( pFile );
status = true;
}
else
{ {
printf( "ERROR: Couldn't write to: %s\n", gpDskName ); printf( "ERROR: Couldn't write to: %s\n", gpDskName );
} }
fseek( pFile, 0L, SEEK_SET ); return status;
if( giInterleaveLastUsed == INTERLEAVE_PRODOS_ORDER )
{
size_t wrote = fwrite( gaDsk, 1, gnDskSize, pFile );
(void) wrote;
#if DEBUG_DSK_SAVE
printf( "DskSave() wrote .po: %d\n", wrote );
#endif
}
else
if( giInterleaveLastUsed == INTERLEAVE_DOS33_ORDER )
{
int nTracks = DSK_GetNumTracks();
size_t offset = 0;
#if DEBUG_DSK_SAVE
printf( "Tracks: %d\n", nTracks );
#endif
for( int iTracks = 0; iTracks < nTracks; iTracks++ )
{
size_t dst = offset;
for( int iSector = 0; iSector < 16; iSector++ )
{
size_t src;
size_t dst;
Interleave_Reverse( iSector, &src, &dst );
#if DEBUG_DSK_SAVE
if( iTracks == 0 )
printf( "%06X -> T0S%X\n", dst, iSector );
#endif
fseek( pFile, (long)(offset + dst), SEEK_SET );
fwrite( &gaDsk[ offset + src ], 1, DSK_SECTOR_SIZE, pFile );
}
offset += 16 * DSK_SECTOR_SIZE;
}
}
fclose( pFile );
return true;
} }