New loplugin:external

...warning about (for now only) functions and variables with external linkage
that likely don't need it.

The problems with moving entities into unnamed namespacs and breaking ADL
(as alluded to in comments in compilerplugins/clang/external.cxx) are
illustrated by the fact that while

struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }

returns 1, both moving just the struct S2 into an nunnamed namespace,

struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
namespace { struct S2: S1 { int f() { return 1; } }; }
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }

as well as moving just the function f overload into an unnamed namespace,

struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
namespace { int f(S2 s) { return s.f(); } }
}
int main() { return f(N::S2()); }

would each change the program to return 0 instead.

Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c
Reviewed-on: https://gerrit.libreoffice.org/60539
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

6 files changed, 48 insertions, 48 deletions

diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index 2e8c129082f9..26ae7fca3555 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -58,7 +58,7 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo
     return aDeviceInfo;
 }
 
-void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser )
+static void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser )
 {
     if ( rGraphicSettings.mbEmbedLinkedGraphics )
     {
@@ -84,7 +84,7 @@ void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntit
     }
 }
 
-void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference< XShape > const & rxShape, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
+static void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference< XShape > const & rxShape, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
 {
     Reference< XGraphic > xGraphic;
     Reference< XPropertySet > xShapePropertySet( rxShape, UNO_QUERY_THROW );
@@ -121,7 +121,7 @@ void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference
     }
 }
 
-void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const Reference< XPropertySet >& rxPropertySet, const awt::Size& rLogicalSize,
+static void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const Reference< XPropertySet >& rxPropertySet, const awt::Size& rLogicalSize,
     std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const Reference< XPropertySet >& rxPagePropertySet )
 {
     try
@@ -189,7 +189,7 @@ void ImpAddFillBitmapEntity( const Reference< XComponentContext >& rxMSF, const
     }
 }
 
-void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, const Reference< XDrawPage >& rxDrawPage, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
+static void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, const Reference< XDrawPage >& rxDrawPage, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
 {
     try
     {
@@ -207,7 +207,7 @@ void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, c
     }
 }
 
-void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxMSF, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
+static void ImpCollectGraphicObjects( const Reference< XComponentContext >& rxMSF, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities )
 {
     for ( sal_Int32 i = 0; i < rxShapes->getCount(); i++ )
     {
@@ -327,7 +327,7 @@ void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rx
     }
 }
 
-void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, sal_Int32& rnGraphics )
+static void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const Reference< XShapes >& rxShapes, const GraphicSettings& rGraphicSettings, sal_Int32& rnGraphics )
 {
     for ( sal_Int32 i = 0; i < rxShapes->getCount(); i++ )
     {
@@ -364,7 +364,7 @@ void ImpCountGraphicObjects( const Reference< XComponentContext >& rxMSF, const
     }
 }
 
-void ImpCountBackgroundGraphic(
+static void ImpCountBackgroundGraphic(
     const Reference< XDrawPage >& rxDrawPage, sal_Int32& rnGraphics )
 {
     try
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index a04cf0f93ebc..15de3f86a8ab 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::presentation;
 
-void ImpExtractCustomShow( const Reference< XModel >& rxModel, const OUString& rCustomShowName )
+static void ImpExtractCustomShow( const Reference< XModel >& rxModel, const OUString& rCustomShowName )
 {
     vector< Reference< XDrawPage > > vNonUsedPageList;
     try
@@ -91,7 +91,7 @@ void ImpExtractCustomShow( const Reference< XModel >& rxModel, const OUString& r
     }
 }
 
-void ImpDeleteUnusedMasterPages( const Reference< XModel >& rxModel )
+static void ImpDeleteUnusedMasterPages( const Reference< XModel >& rxModel )
 {
     vector< PageCollector::MasterPageEntity > aMasterPageList;
     PageCollector::CollectMasterPages( rxModel, aMasterPageList );
@@ -108,7 +108,7 @@ void ImpDeleteUnusedMasterPages( const Reference< XModel >& rxModel )
     }
 }
 
-void ImpDeleteHiddenSlides(  const Reference< XModel >& rxModel )
+static void ImpDeleteHiddenSlides(  const Reference< XModel >& rxModel )
 {
     try
     {
@@ -135,7 +135,7 @@ void ImpDeleteHiddenSlides(  const Reference< XModel >& rxModel )
     }
 }
 
-void ImpDeleteNotesPages( const Reference< XModel >& rxModel )
+static void ImpDeleteNotesPages( const Reference< XModel >& rxModel )
 {
     try
     {
@@ -158,7 +158,7 @@ void ImpDeleteNotesPages( const Reference< XModel >& rxModel )
     }
 }
 
-void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizationType )
+static void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizationType )
 {
     try
     {
@@ -206,7 +206,7 @@ void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOptimizati
     }
 }
 
-void ImpCompressGraphic( Reference< XGraphicProvider > const & rxGraphicProvider, const Reference< XGraphic >& rxGraphic, Reference< XOutputStream > const & rxOutputStream,
+static void ImpCompressGraphic( Reference< XGraphicProvider > const & rxGraphicProvider, const Reference< XGraphic >& rxGraphic, Reference< XOutputStream > const & rxOutputStream,
     const OUString& rDestMimeType, const awt::Size& rLogicalSize, sal_Int32 nJPEGQuality, sal_Int32 nImageResolution, bool bRemoveCropping, const text::GraphicCrop& rGraphicCropLogic )
 {
     try
@@ -247,7 +247,7 @@ void ImpCompressGraphic( Reference< XGraphicProvider > const & rxGraphicProvider
     }
 }
 
-Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& rxContext,
+static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& rxContext,
     const Reference< XGraphic >& xGraphic, const awt::Size& aLogicalSize, const text::GraphicCrop& aGraphicCropLogic,
         const GraphicSettings& rGraphicSettings )
 {
@@ -371,7 +371,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
     return xNewGraphic;
 }
 
-void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentContext >& rxContext, const GraphicSettings& rGraphicSettings,
+static void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentContext >& rxContext, const GraphicSettings& rGraphicSettings,
     std::vector< GraphicCollector::GraphicEntity >& rGraphicList )
 {
     try
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index fdb56af5464e..987557920c58 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::presentation;
 
 
-void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl )
+static void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl )
 {
     FontDescriptor aFontDescriptor;
     if ( rOptimizerDialog.getControlProperty( rControl, "FontDescriptor" ) >>= aFontDescriptor )
@@ -55,7 +55,7 @@ void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl )
 }
 
 
-OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation,
+static OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation,
                         sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight )
 {
     OUString pNames[] = {
@@ -85,7 +85,7 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo
 }
 
 
-OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener > const & xActionListener,
+static OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener > const & xActionListener,
     sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int16 nTabIndex, bool bEnabled, PPPOptimizerTokenEnum nResID, css::awt::PushButtonType nPushButtonType )
 {
     sal_Int32 nHeight = BUTTON_HEIGHT;
@@ -122,7 +122,7 @@ OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rContr
 }
 
 
-OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const OUString& rLabel,
+static OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const OUString& rLabel,
                                 sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, bool bMultiLine, bool bBold, sal_Int16 nTabIndex )
 {
     OUString pNames[] = {
@@ -157,7 +157,7 @@ OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rCo
 }
 
 
-OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
+static OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
     const Reference< XItemListener >& xItemListener, const OUString& rLabel,
         sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int16 nTabIndex )
 {
@@ -194,7 +194,7 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
 }
 
 
-OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
+static OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
         const Reference< XTextListener >& xTextListener, const Reference< XSpinListener >& xSpinListener, sal_Int32 nXPos, sal_Int32 nYPos,
         double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex )
 {
@@ -242,7 +242,7 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
 }
 
 
-OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
+static OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
     const Reference< XTextListener >& rTextListener, const bool bEnabled, const Sequence< OUString >& rItemList,
         sal_Int32 nXPos, sal_Int32 nYPos, sal_Int16 nTabIndex )
 {
@@ -284,7 +284,7 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
 }
 
 
-OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener >& rItemListener,
+static OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener >& rItemListener,
     const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int16 nTabIndex )
 {
     sal_Int32 nHeight = 8;
@@ -320,7 +320,7 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r
 }
 
 
-OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
+static OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
     const Reference< XActionListener >& rActionListener, const bool bEnabled, const Sequence< OUString >& rItemList,
         sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int16 nTabIndex )
 {
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index 2ccbffb5dcb3..3e5a452dee13 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -31,7 +31,7 @@
 using namespace pdfparse;
 
 
-void printHelp( const char* pExe )
+static void printHelp( const char* pExe )
 {
     fprintf( stdout,
     "USAGE: %s [-h,--help]\n"
@@ -212,7 +212,7 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned
 
 typedef int(*PDFFileHdl)(const char*, const char*, PDFFile*);
 
-int handleFile( const char* pInFile, const char* pOutFile, const char* pPassword, PDFFileHdl pHdl )
+static int handleFile( const char* pInFile, const char* pOutFile, const char* pPassword, PDFFileHdl pHdl )
 {
 
     PDFReader aParser;
@@ -236,7 +236,7 @@ int handleFile( const char* pInFile, const char* pOutFile, const char* pPassword
     return nRet;
 }
 
-int write_unzipFile( const char* pInFile, const char* pOutFile, PDFFile* pPDFFile )
+static int write_unzipFile( const char* pInFile, const char* pOutFile, PDFFile* pPDFFile )
 {
     FileEmitContext aContext( pOutFile, pInFile, pPDFFile );
     aContext.m_bDecrypt = pPDFFile->isEncrypted();
@@ -244,7 +244,7 @@ int write_unzipFile( const char* pInFile, const char* pOutFile, PDFFile* pPDFFil
     return 0;
 }
 
-int write_addStreamArray( const char* pOutFile, PDFArray* pStreams, PDFFile* pPDFFile, const char* pInFile )
+static int write_addStreamArray( const char* pOutFile, PDFArray* pStreams, PDFFile* pPDFFile, const char* pInFile )
 {
     int nRet = 0;
     unsigned int nArrayElements = pStreams->m_aSubElements.size();
@@ -285,7 +285,7 @@ int write_addStreamArray( const char* pOutFile, PDFArray* pStreams, PDFFile* pPD
     return nRet;
 }
 
-int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFile )
+static int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFile )
 {
     // find all trailers
     int nRet = 0;
@@ -309,7 +309,7 @@ int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFi
     return nRet;
 }
 
-int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFFile )
+static int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFFile )
 {
     int nRet = 0;
     unsigned int nElements = i_pPDFFile->m_aSubElements.size();
@@ -395,7 +395,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
 
 static std::vector< std::pair< sal_Int32, sal_Int32 > > s_aEmitObjects;
 
-int write_objects( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFFile )
+static int write_objects( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFFile )
 {
     int nRet = 0;
     unsigned int nElements = s_aEmitObjects.size();
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index b0d51c5cc2b8..d587ac97903e 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -648,7 +648,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< std::unique_pt
     elem.applyToChildren(*this);
 }
 
-bool isSpaces(TextElement* pTextElem)
+static bool isSpaces(TextElement* pTextElem)
 {
     for (sal_Int32 i = 0; i != pTextElem->Text.getLength(); ++i) {
         if (pTextElem->Text[i] != ' ') {
@@ -658,7 +658,7 @@ bool isSpaces(TextElement* pTextElem)
     return true;
 }
 
-bool notTransformed(const GraphicsContext& GC)
+static bool notTransformed(const GraphicsContext& GC)
 {
     return
         rtl::math::approxEqual(GC.Transformation.get(0,0), 100.00) &&
@@ -822,7 +822,7 @@ void DrawXmlFinalizer::visit( HyperlinkElement&, const std::list< std::unique_pt
 {
 }
 
-void SetFontsizeProperties(PropertyMap& props, double fontSize)
+static void SetFontsizeProperties(PropertyMap& props, double fontSize)
 {
     OUStringBuffer aBuf(32);
     aBuf.append(fontSize * 72 / PDFI_OUTDEV_RESOLUTION);
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 06e4faead383..942a5d60cc9f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -67,7 +67,7 @@ namespace pdfi
 {
 
 /// cut off very small numbers & clamp value to zero
-inline double normalize( double val )
+static inline double normalize( double val )
 {
     return fabs(val) < 0.0000001 ? 0.0 : val;
 }
@@ -118,12 +118,12 @@ std::vector<char> lcl_escapeLineFeeds(const char* const i_pStr)
 /// for the initial std::vector capacity when copying stream from xpdf
 #define WRITE_BUFFER_INITIAL_CAPACITY (1024*100)
 
-void initBuf(OutputBuffer& io_rBuffer)
+static void initBuf(OutputBuffer& io_rBuffer)
 {
     io_rBuffer.reserve(WRITE_BUFFER_INITIAL_CAPACITY);
 }
 
-void writeBinaryBuffer( const OutputBuffer& rBuffer )
+static void writeBinaryBuffer( const OutputBuffer& rBuffer )
 {
     // ---sync point--- see SYNC STREAMS above
     fflush(stdout);
@@ -138,7 +138,7 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
     fflush(g_binary_out);
 }
 
-bool ExtractJpegData(Stream* str, OutputBuffer& outBuf)
+static bool ExtractJpegData(Stream* str, OutputBuffer& outBuf)
 {
     int bytesToMarker = 0;
     int bytesToLen = -1;
@@ -204,7 +204,7 @@ bool ExtractJpegData(Stream* str, OutputBuffer& outBuf)
     }
 }
 
-void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str )
+static void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str )
 {
     // dump JPEG file as-is
 #if POPPLER_CHECK_VERSION(0, 17, 3)
@@ -223,7 +223,7 @@ void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str )
     str->close();
 }
 
-void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, bool bInvert )
+static void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, bool bInvert )
 {
     // write as PBM (char by char, to avoid stdlib lineend messing)
     o_rOutputBuf.clear();
@@ -265,7 +265,7 @@ void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, b
     str->close();
 }
 
-void writePpm_( OutputBuffer&     o_rOutputBuf,
+static void writePpm_( OutputBuffer&     o_rOutputBuf,
                 Stream*           str,
                 int               width,
                 int               height,
@@ -323,7 +323,7 @@ void writePpm_( OutputBuffer&     o_rOutputBuf,
 }
 
 // call this only for 1 bit image streams !
-void writePng_( OutputBuffer&     o_rOutputBuf,
+static void writePng_( OutputBuffer&     o_rOutputBuf,
                 Stream*           str,
                 int               width,
                 int               height,
@@ -340,7 +340,7 @@ void writePng_( OutputBuffer&     o_rOutputBuf,
     printf("\n");
 }
 
-void writePng_( OutputBuffer& o_rOutputBuf,
+static void writePng_( OutputBuffer& o_rOutputBuf,
                 Stream* str,
                 int width, int height, GfxImageColorMap* colorMap,
                 Stream* maskStr,
@@ -355,7 +355,7 @@ void writePng_( OutputBuffer& o_rOutputBuf,
     printf("\n");
 }
 
-void writePng_( OutputBuffer& o_rOutputBuf,
+static void writePng_( OutputBuffer& o_rOutputBuf,
                 Stream* str,
                 int width, int height, GfxImageColorMap* colorMap,
                 Stream* maskStr,
@@ -371,7 +371,7 @@ void writePng_( OutputBuffer& o_rOutputBuf,
 }
 
 // stolen from ImageOutputDev.cc
-void writeMask_( OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, bool bInvert )
+static void writeMask_( OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, bool bInvert )
 {
     if( str->getKind() == strDCT )
         writeJpeg_(o_rOutputBuf, str);
@@ -379,7 +379,7 @@ void writeMask_( OutputBuffer& o_rOutputBuf, Stream* str, int width, int height,
         writePbm_(o_rOutputBuf, str, width, height, bInvert );
 }
 
-void writeImage_( OutputBuffer&     o_rOutputBuf,
+static void writeImage_( OutputBuffer&     o_rOutputBuf,
                   Stream*           str,
                   int               width,
                   int               height,
@@ -415,12 +415,12 @@ void writeImage_( OutputBuffer&     o_rOutputBuf,
 // forwarders
 
 
-inline void writeImageLF( OutputBuffer&     o_rOutputBuf,
+static inline void writeImageLF( OutputBuffer&     o_rOutputBuf,
                           Stream*           str,
                           int               width,
                           int               height,
                           GfxImageColorMap* colorMap ) { writeImage_(o_rOutputBuf,str,width,height,colorMap); }
-inline void writeMaskLF( OutputBuffer&     o_rOutputBuf,
+static inline void writeMaskLF( OutputBuffer&     o_rOutputBuf,
                          Stream*           str,
                          int               width,
                          int               height,