cleanup code

javiergutierrezchamorro · Oct 7, 2019 · 9410b11 · 9410b11
1 parent de016fc
commit 9410b11
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/bld/setupgui/c/utils.c b/bld/setupgui/c/utils.c
@@ -189,16 +189,20 @@ bool ModifyStartup( bool uninstall )
 
 //        if( !uninstall ) {
 #if defined( __NT__ )
-#ifdef __AXP__
+  #ifdef __AXP__
         ret = ModifyConfiguration( uninstall );
-#else
+  #else
         if( GetVariableBoolVal( "IsWin95" ) ) {
             ret = ModifyAutoExec( uninstall );
         } else {
             ret = ModifyConfiguration( uninstall );
         }
-#endif
+  #endif
 #elif defined( __UNIX__ )
+  #if !defined( GUI_IS_GUI )
+    /* unused parameters */ (void)uninstall;
+  #endif
+
 //        ret = ModifyAutoExec( uninstall );
 #else
         ret = ModifyAutoExec( uninstall );
@@ -213,6 +217,8 @@ bool ModifyAssociations( bool uninstall )
 #ifdef __NT__
     return( ModifyRegAssoc( uninstall ) );
 #else
+    /* unused parameters */ (void)uninstall;
+
     return( true );
 #endif
 }
@@ -223,6 +229,8 @@ bool ModifyUninstall( bool uninstall )
 #ifdef __NT__
     return( AddToUninstallList( uninstall ) );
 #else
+    /* unused parameters */ (void)uninstall;
+
     return( true );
 #endif
 }

diff --git a/bld/uninstal/uninstal.c b/bld/uninstal/uninstal.c
@@ -113,6 +113,8 @@ static void DeleteFolder( HWND hDlg, LPCSTR pszFolder, LPCSTR pszUninstallFile )
  */
 static INT_PTR CALLBACK ProgressDlgProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
 {
+    /* unused parameters */ (void)hDlg; (void)message; (void)wParam; (void)lParam;
+
     return( FALSE );
 
 } /* ProgressDlgProc */
@@ -136,6 +138,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     LPITEMIDLIST    pidlPrograms;
     char            szProgramsPath[MAX_PATH];
 
+    /* unused parameters */ (void)hPrevInstance; (void)lpCmdLine; (void)nCmdShow;
+
     /*
      * Load the title for message boxes.
      */

diff --git a/contrib/zlib/trees.c b/contrib/zlib/trees.c
@@ -235,7 +235,7 @@ local void send_bits(s, value, length)
 /* ===========================================================================
  * Initialize the various 'constant' tables.
  */
-local void tr_static_init()
+local void tr_static_init( void )
 {
 #if defined(GEN_TREES_H) || !defined(STDC)
     static int static_init_done = 0;