extensions/source/scanner/sane.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
New commits: commit c480e9ffb7092dd006e7ac61a46a11765251338a Author: Mohamed Ali <[email protected]> AuthorDate: Mon Dec 2 22:35:12 2024 +0200 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Tue Dec 3 07:48:52 2024 +0100 tdf#130924 use SAL_WARN instead of fprintf Change-Id: Iefac2a4e58248c9fcead2bcf97817488097fb20d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177711 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 731355e59db4..e1fde5e5213c 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -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 ", - 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 ! ", 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!!! " ); + 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 !!! " ); + 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 " ); + SAL_WARN( "extensions.scanner", "Timeout on sane_read descriptor" ); } nLen = 0; nStatus = p_read( maHandle, pBuffer.get(), BYTE_BUFFER_SIZE, &nLen );
