---------------------
PatchSet 6149 
Date: 2007/11/19 22:34:28
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
- Cleanup old experiment in fancy debug.
- Wrap SNMP security bypass in a big FIXME
- Some formatting

Members: 
	src/Debug.h:1.7.8.6->1.7.8.7 
	src/snmp_core.cc:1.10.8.23->1.10.8.24 

Index: squid3/src/Debug.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Debug.h,v
retrieving revision 1.7.8.6
retrieving revision 1.7.8.7
diff -u -r1.7.8.6 -r1.7.8.7
--- squid3/src/Debug.h	24 Oct 2007 02:15:47 -0000	1.7.8.6
+++ squid3/src/Debug.h	19 Nov 2007 22:34:28 -0000	1.7.8.7
@@ -1,6 +1,5 @@
-
 /*
- * $Id: Debug.h,v 1.7.8.6 2007/10/24 02:15:47 amosjeffries Exp $
+ * $Id: Debug.h,v 1.7.8.7 2007/11/19 22:34:28 amosjeffries Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -76,23 +75,14 @@
         } \
    } while (/*CONSTCOND*/ 0)
 
-// __FUNCTION__  may be undefined.
-#ifndef __FUNCTION__
-#ifdef __func__
-#define __FUNCTION__ __func__
-#else
-#define __FUNCTION__ "?func?"
-#endif
-#endif /* __FUNCTION__ */
-
 /*
  * HERE is a macro that you can use like this:
  *
  * debugs(1,1, HERE << "some message");
  */
-#define HERE __FILE__<<"("<<__LINE__<<") "<< __PRETTY_FUNCTION__ << ":"
+#define HERE __FILE__<<"("<<__LINE__<<") "<<__PRETTY_FUNCTION__<<":"
 
-/* AYJ: some uint8_t do not like streaming control-chars (values 0-31, 127+) */
+/* some uint8_t do not like streaming control-chars (values 0-31, 127+) */
 inline std::ostream& operator <<(std::ostream &os, const uint8_t d) {
     return (os << (int)d);
 }
Index: squid3/src/snmp_core.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/snmp_core.cc,v
retrieving revision 1.10.8.23
retrieving revision 1.10.8.24
diff -u -r1.10.8.23 -r1.10.8.24
--- squid3/src/snmp_core.cc	19 Nov 2007 21:16:18 -0000	1.10.8.23
+++ squid3/src/snmp_core.cc	19 Nov 2007 22:34:28 -0000	1.10.8.24
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_core.cc,v 1.10.8.23 2007/11/19 21:16:18 rmartinez Exp $
+ * $Id: snmp_core.cc,v 1.10.8.24 2007/11/19 22:34:28 amosjeffries Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -535,16 +535,18 @@
         allow = checklist.fastCheck();
     }
 
+#if 1 /* FIXME INET6 : Kill this block before committing to HEAD. */
     /* RAFA, Amos, DO NOT COMMIT INTO AHEAD with this !!! */
     allow = 1 ;
     /* allow */
+#endif /* KILL */
     if ((snmp_coexist_V2toV1(PDU)) && (Community) && (allow)) {
         rq->community = Community;
         rq->PDU = PDU;
         debugs(49, 5, "snmpAgentParse: reqid=[" << PDU->reqid << "]");
         snmpConstructReponse(rq);
     } else {
-      debugs(49, 1, HERE << "Failed SNMP agent query from : " << rq->from );
+        debugs(49, 1, HERE << "Failed SNMP agent query from : " << rq->from);
         snmp_free_pdu(PDU);
     }
 
@@ -623,7 +625,7 @@
                     }
 
                     int * errstatTmp =  &(Answer->errstat);
-		    
+
                     VarNew = (*ParseFn) (VarPtr, (snint *) errstatTmp);
 
                     if (get_next)