From: serassio <>
Date: Thu, 14 Sep 2006 00:55:10 +0000 (+0000)
Subject: Windows port: remove obsolete break from command line functionality
X-Git-Tag: SQUID_3_0_PRE5~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3edbe5f2d8a3cf7d45786e6dd2df3e8d47f1283;p=thirdparty%2Fsquid.git

Windows port: remove obsolete break from command line functionality
---

diff --git a/src/globals.h b/src/globals.h
index f8b0da85d2..9a58646f6b 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: globals.h,v 1.138 2006/08/21 00:50:41 robertc Exp $
+ * $Id: globals.h,v 1.139 2006/09/13 18:55:10 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -171,10 +171,6 @@ extern "C"
     extern char *WIN32_Command_Line;        /* NULL */
     extern char *WIN32_Service_Command_Line; /* NULL */
     extern unsigned int WIN32_run_mode;     /* _WIN_SQUID_RUN_MODE_INTERACTIVE */
-#if defined(_SQUID_MSWIN_) && defined(_DEBUG)
-
-    extern int do_debug_trap;	                /* 0 */
-#endif
 #endif
 #if HAVE_SBRK
 
diff --git a/src/main.cc b/src/main.cc
index fbaa592aaf..c44c972431 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.435 2006/09/03 05:32:53 hno Exp $
+ * $Id: main.cc,v 1.436 2006/09/13 18:55:10 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -167,13 +167,6 @@ SignalDispatcher::dispatch()
     if (do_reconfigure) {
         mainReconfigure();
         do_reconfigure = 0;
-#if defined(_SQUID_MSWIN_) && defined(_DEBUG)
-
-    } else if (do_debug_trap) {
-        do_debug_trap = 0;
-        __asm int 3;
-#endif
-
     } else if (do_rotate) {
         mainRotate();
         do_rotate = 0;
diff --git a/src/tools.cc b/src/tools.cc
index b3faeb55ae..30fffb5346 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.270 2006/09/03 21:05:20 hno Exp $
+ * $Id: tools.cc,v 1.271 2006/09/13 18:55:10 serassio Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -391,11 +391,6 @@ death(int sig)
 void
 sigusr2_handle(int sig)
 {
-#if defined(_SQUID_MSWIN_) && defined(_DEBUG)
-    do_debug_trap = 1;
-#endif
-#if (defined(_SQUID_MSWIN_) && !defined(_DEBUG)) || !defined(_SQUID_MSWIN_)
-
     static int state = 0;
     /* no debug() here; bad things happen if the signal is delivered during _db_print() */
 
@@ -419,7 +414,6 @@ sigusr2_handle(int sig)
         state = 0;
     }
 
-#endif
 #if !HAVE_SIGACTION
     if (signal(sig, sigusr2_handle) == SIG_ERR)	/* reinstall */
         debug(50, 0) ("signal: sig=%d func=%p: %s\n", sig, sigusr2_handle, xstrerror());