[Pinfo-devel] r40 - pinfo/branches/cxx/src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-08-26 08:19:49 +0000 (Fri, 26 Aug 2005)
New Revision: 40

Modified:
   pinfo/branches/cxx/src/common_includes.h
   pinfo/branches/cxx/src/mainfunction.cxx
   pinfo/branches/cxx/src/pinfo.cxx
   pinfo/branches/cxx/src/signal_handler.cxx
   pinfo/branches/cxx/src/signal_handler.h
Log:
Rename "signal_handler()" to "install_signal_handlers()".
Remove some gratuitousness from common_includes.h.


Modified: pinfo/branches/cxx/src/common_includes.h
===================================================================
--- pinfo/branches/cxx/src/common_includes.h	2005-08-26 08:09:27 UTC (rev 39)
+++ pinfo/branches/cxx/src/common_includes.h	2005-08-26 08:19:49 UTC (rev 40)
@@ -52,19 +52,13 @@
 #include "menu_and_note_utils.h"
 #include "mainfunction.h"
 #include "utils.h"
-#include "signal_handler.h"
 #include "colors.h"
 #include "regexp_search.h"
 #include "manual.h"
 #include "parse_config.h"
 #include "keyboard.h"
 #include "initializelinks.h"
-#include "printinfo.h"
 
-#ifndef HAVE_SIGBLOCK
-#include "sigblock.h"
-#endif
-
 /* I hear voices, that it is needed by RH5.2 ;) */
 #define _REGEX_RE_COMP
 #endif

Modified: pinfo/branches/cxx/src/mainfunction.cxx
===================================================================
--- pinfo/branches/cxx/src/mainfunction.cxx	2005-08-26 08:09:27 UTC (rev 39)
+++ pinfo/branches/cxx/src/mainfunction.cxx	2005-08-26 08:19:49 UTC (rev 40)
@@ -19,6 +19,7 @@
  *  USA
  ***************************************************************************/
 #include "common_includes.h"
+#include "printinfo.h"
 
 RCSID("$Id$")
 

Modified: pinfo/branches/cxx/src/pinfo.cxx
===================================================================
--- pinfo/branches/cxx/src/pinfo.cxx	2005-08-26 08:09:27 UTC (rev 39)
+++ pinfo/branches/cxx/src/pinfo.cxx	2005-08-26 08:19:49 UTC (rev 40)
@@ -20,6 +20,7 @@
  ***************************************************************************/
 
 #include "common_includes.h"
+#include "signal_handler.h"
 #include "utils.h"
 
 RCSID(PKG_VER "$Id$")
@@ -85,7 +86,7 @@
 		{0, 0, 0, 0}};
 #endif
 		/* take care of SIGSEGV, SIGTERM, SIGINT */
-		signal_handler();
+		install_signal_handlers();
 		searchagain.type = 0;
 		searchagain.search = 0;
 		initlocale();

Modified: pinfo/branches/cxx/src/signal_handler.cxx
===================================================================
--- pinfo/branches/cxx/src/signal_handler.cxx	2005-08-26 08:09:27 UTC (rev 39)
+++ pinfo/branches/cxx/src/signal_handler.cxx	2005-08-26 08:19:49 UTC (rev 40)
@@ -20,6 +20,10 @@
  ***************************************************************************/
 #include "common_includes.h"
 
+#ifndef HAVE_SIGBLOCK
+#include "sigblock.h"
+#endif
+
 RCSID("$Id$")
 
 #include <termios.h>
@@ -44,7 +48,7 @@
 }
 
 void
-signal_handler()
+install_signal_handlers()
 {
 	signal(SIGINT, handle_crash);	/* handle ^C */
 	signal(SIGTERM, handle_crash);	/* handle soft kill */

Modified: pinfo/branches/cxx/src/signal_handler.h
===================================================================
--- pinfo/branches/cxx/src/signal_handler.h	2005-08-26 08:09:27 UTC (rev 39)
+++ pinfo/branches/cxx/src/signal_handler.h	2005-08-26 08:19:49 UTC (rev 40)
@@ -21,5 +21,5 @@
 
 #ifndef __SIGNAL_HANDLER_H
 #define __SIGNAL_HANDLER_H
-void signal_handler ();		/* handles various signals, coming to pinfo */
+void install_signal_handlers ();		/* handles various signals, coming to pinfo */
 #endif