Changeset 8238

Timestamp:

01/30/13 01:35:29 (10 years ago)

Author:

gf

Message:

Remove dead code.

File:

• trunk/oscam.c (modified) (4 diffs)

trunk/oscam.c

@@ -816 +816 @@
 void set_signal_handler(int32_t sig, int32_t flags, void (*sighandler))
 {
-#ifdef CS_SIGBSD
-  if ((signal(sig, sighandler)==SIG_IGN) && (flags & 2))
-  {
-    signal(sig, SIG_IGN);
-    siginterrupt(sig, 0);
-  }
-  else
-    siginterrupt(sig, (flags & 1) ? 0 : 1);
-#else
   struct sigaction sa;
   sigaction(sig, (struct sigaction *) 0, &sa);
@@ -834 +825 @@
     sigaction(sig, &sa, (struct sigaction *) 0);
   }
-#endif
 }
 
@@ -948 +938 @@
 {
         set_signal_handler(SIGINT, 3, cs_exit);
-        //set_signal_handler(SIGKILL, 3, cs_exit);
 #if defined(__APPLE__)
         set_signal_handler(SIGEMT, 3, cs_exit);
-#else
-        //set_signal_handler(SIGPOLL, 3, cs_exit);
-#endif
-        //set_signal_handler(SIGPROF, 3, cs_exit);
+#endif
         set_signal_handler(SIGTERM, 3, cs_exit);
-        //set_signal_handler(SIGVTALRM, 3, cs_exit);
 
         set_signal_handler(SIGWINCH, 1, SIG_IGN);
-        //  set_signal_handler(SIGPIPE , 0, SIG_IGN);
         set_signal_handler(SIGPIPE , 0, cs_sigpipe);
-        //  set_signal_handler(SIGALRM , 0, cs_alarm);
         set_signal_handler(SIGALRM , 0, cs_master_alarm);
-        // set_signal_handler(SIGCHLD , 1, cs_child_chk);
         set_signal_handler(SIGHUP  , 1, isDaemon?cs_dummy:cs_reload_config);
-        //set_signal_handler(SIGHUP , 1, cs_sighup);
         set_signal_handler(SIGUSR1, 1, isDaemon?cs_dummy:cs_debug_level);
         set_signal_handler(SIGUSR2, 1, isDaemon?cs_dummy:cs_card_info);
@@ -980 +961 @@
             }
 
-            cs_log("signal handling initialized (type=%s)",
-#ifdef CS_SIGBSD
-            "bsd"
-#else
-            "sysv"
-#endif
-            );
+            cs_log("signal handling initialized");
         }
     return;