strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#130924 use SAL_WARN instead of fprintf

Browse source 
Change-Id: Iefac2a4e58248c9fcead2bcf97817488097fb20d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177711
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
This commit is contained in:
Mohamed Ali 2024-12-02 22:35:12 +02:00 committed by Ilmari Lauhakangas
parent 9a14a0fd8b
commit c480e9ffb7
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
extensions/source/scanner/sane.cxx
View file

@ -110,8 +110,7 @@ inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
oslGenericFunction pFunction = osl_getAsciiFunctionSymbol( pSaneLib, pSymbolname );
if( ! pFunction )
{
fprintf( stderr, "Could not load symbol %s\n",
pSymbolname );
SAL_WARN( "extensions.scanner", "Could not load symbol " << pSymbolname );
bSaneSymbolLoadFailed = true;
}
return pFunction;
@ -269,11 +268,11 @@ void Sane::ReloadOptions()
SANE_Status nStatus = p_control_option( maHandle, 0, SANE_ACTION_GET_VALUE,
static_cast<void*>(pOptions), nullptr );
if( nStatus != SANE_STATUS_GOOD )
fprintf( stderr, "Error: sane driver returned %s while reading number of options !\n", p_strstatus( nStatus ) );
SAL_WARN( "extensions.scanner", "Error: sane driver returned " << p_strstatus( nStatus ) << " while reading number of options !" );
mnOptions = pOptions[ 0 ];
if( o3tl::make_unsigned(pZero->size) > sizeof( SANE_Word ) )
fprintf( stderr, "driver returned number of options with larger size than SANE_Word!!!\n" );
SAL_WARN( "extensions.scanner", "driver returned number of options with larger size than SANE_Word!!!" );
mppOptions.reset(new const SANE_Option_Descriptor*[ mnOptions ]);
mppOptions[ 0 ] = pZero;
for( int i = 1; i < mnOptions; i++ )
@ -668,7 +667,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
eType = FrameStyle_Separated;
break;
default:
fprintf( stderr, "Warning: unknown frame style !!!\n" );
SAL_WARN( "extensions.scanner", "Unknown frame style" );
}
bool bSynchronousRead = true;
@ -717,7 +716,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
tv.tv_sec = 5;
tv.tv_usec = 0;
if( select( fd+1, &fdset, nullptr, nullptr, &tv ) == 0 )
fprintf( stderr, "Timeout on sane_read descriptor\n" );
SAL_WARN( "extensions.scanner", "Timeout on sane_read descriptor" );
}
nLen = 0;
nStatus = p_read( maHandle, pBuffer.get(), BYTE_BUFFER_SIZE, &nLen );