--------------------- PatchSet 3208 Date: 2001/10/19 21:46:44 Author: serassio Branch: cygwin Tag: (none) Log: Manually merged changes from HEAD after cvsmerge crash Members: contrib/.cvsignore:1.3.12.1->1.3.12.2 include/parse.h:1.2.28.2->1.2.28.3 include/snmp_api_error.h:1.2.28.1->1.2.28.2 include/snmp_debug.h:1.2.28.1->1.2.28.2 include/snmp_error.h:1.2.28.1->1.2.28.2 include/snmp_pdu.h:1.2.28.2->1.2.28.3 include/snmp_session.h:1.2.28.1->1.2.28.2 lib/rfc1123.c:1.4.24.1->1.4.24.2 lib/util.c:1.4.14.4->1.4.14.5 snmplib/mib.c:1.1.1.1.72.3->1.1.1.1.72.4 Index: squid/contrib/.cvsignore =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/.cvsignore,v retrieving revision 1.3.12.1 retrieving revision 1.3.12.2 diff -u -r1.3.12.1 -r1.3.12.2 --- squid/contrib/.cvsignore 19 Oct 2001 19:05:08 -0000 1.3.12.1 +++ squid/contrib/.cvsignore 19 Oct 2001 21:46:44 -0000 1.3.12.2 @@ -1,3 +1,3 @@ -.cvsignore -Makefile.in -win +.cvsignore +Makefile.in +win Index: squid/include/parse.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/parse.h,v retrieving revision 1.2.28.2 retrieving revision 1.2.28.3 diff -u -r1.2.28.2 -r1.2.28.3 --- squid/include/parse.h 19 Oct 2001 19:05:08 -0000 1.2.28.2 +++ squid/include/parse.h 19 Oct 2001 21:46:44 -0000 1.2.28.3 @@ -1,5 +1,5 @@ /* - * $Id: parse.h,v 1.2.28.2 2001/10/19 19:05:08 serassio Exp $ + * $Id: parse.h,v 1.2.28.3 2001/10/19 21:46:44 serassio Exp $ */ #ifndef SQUID_PARSE_H @@ -50,7 +50,7 @@ u_int subid; /* This node's integer subidentifier */ int type; /* This node's object type */ struct enum_list *enums; /* (optional) list of enumerated integers (otherwise NULL) */ - void (*printer) (); /* Value printing function */ + void (*printer) (char *buf, variable_list *var, void *foo, int quiet); /* Value printing function */ }; /* non-aggregate types for tree end nodes */ Index: squid/include/snmp_api_error.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/snmp_api_error.h,v retrieving revision 1.2.28.1 retrieving revision 1.2.28.2 diff -u -r1.2.28.1 -r1.2.28.2 --- squid/include/snmp_api_error.h 19 Oct 2001 19:05:08 -0000 1.2.28.1 +++ squid/include/snmp_api_error.h 19 Oct 2001 21:46:44 -0000 1.2.28.2 @@ -26,7 +26,7 @@ * * Author: Ryan Troll * - * $Id: snmp_api_error.h,v 1.2.28.1 2001/10/19 19:05:08 serassio Exp $ + * $Id: snmp_api_error.h,v 1.2.28.2 2001/10/19 21:46:44 serassio Exp $ * ***************************************************************************/ @@ -57,10 +57,10 @@ /* extern int snmp_errno */ - char *snmp_api_error(int); + const char *snmp_api_error(int); int snmp_api_errno(void); - char *api_errstring(int); /* Backwards compatibility */ + const char *api_errstring(int); /* Backwards compatibility */ void snmp_set_api_error(int); #ifdef __cplusplus Index: squid/include/snmp_debug.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/snmp_debug.h,v retrieving revision 1.2.28.1 retrieving revision 1.2.28.2 diff -u -r1.2.28.1 -r1.2.28.2 --- squid/include/snmp_debug.h 19 Oct 2001 19:05:08 -0000 1.2.28.1 +++ squid/include/snmp_debug.h 19 Oct 2001 21:46:44 -0000 1.2.28.2 @@ -1,14 +1,10 @@ /* - * $Id: snmp_debug.h,v 1.2.28.1 2001/10/19 19:05:08 serassio Exp $ + * $Id: snmp_debug.h,v 1.2.28.2 2001/10/19 21:46:44 serassio Exp $ */ #ifndef SQUID_SNMP_DEBUG_H #define SQUID_SNMP_DEBUG_H -#if STDC_HEADERS -extern void snmplib_debug(int, char *,...); -#else -extern void snmplib_debug(va_alist); -#endif +extern void snmplib_debug(int, const char *,...); #endif /* SQUID_SNMP_DEBUG_H */ Index: squid/include/snmp_error.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/snmp_error.h,v retrieving revision 1.2.28.1 retrieving revision 1.2.28.2 diff -u -r1.2.28.1 -r1.2.28.2 --- squid/include/snmp_error.h 19 Oct 2001 19:05:08 -0000 1.2.28.1 +++ squid/include/snmp_error.h 19 Oct 2001 21:46:44 -0000 1.2.28.2 @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id: snmp_error.h,v 1.2.28.1 2001/10/19 19:05:08 serassio Exp $ + * $Id: snmp_error.h,v 1.2.28.2 2001/10/19 21:46:44 serassio Exp $ * **********************************************************************/ @@ -59,7 +59,7 @@ extern "C" { #endif - char *snmp_errstring(int); + const char *snmp_errstring(int); #ifdef __cplusplus } Index: squid/include/snmp_pdu.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/snmp_pdu.h,v retrieving revision 1.2.28.2 retrieving revision 1.2.28.3 diff -u -r1.2.28.2 -r1.2.28.3 --- squid/include/snmp_pdu.h 19 Oct 2001 19:05:08 -0000 1.2.28.2 +++ squid/include/snmp_pdu.h 19 Oct 2001 21:46:44 -0000 1.2.28.3 @@ -25,7 +25,7 @@ * * Author: Ryan Troll * - * $Id: snmp_pdu.h,v 1.2.28.2 2001/10/19 19:05:08 serassio Exp $ + * $Id: snmp_pdu.h,v 1.2.28.3 2001/10/19 21:46:44 serassio Exp $ * **********************************************************************/ @@ -64,7 +64,7 @@ u_char *snmp_pdu_encode(u_char *, int *, struct snmp_pdu *); u_char *snmp_pdu_decode(u_char *, int *, struct snmp_pdu *); -char *snmp_pdu_type(struct snmp_pdu *); +const char *snmp_pdu_type(struct snmp_pdu *); /* Add a NULL Variable to a PDU */ void snmp_add_null_var(struct snmp_pdu *, oid *, int); Index: squid/include/snmp_session.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/snmp_session.h,v retrieving revision 1.2.28.1 retrieving revision 1.2.28.2 diff -u -r1.2.28.1 -r1.2.28.2 --- squid/include/snmp_session.h 19 Oct 2001 19:05:08 -0000 1.2.28.1 +++ squid/include/snmp_session.h 19 Oct 2001 21:46:44 -0000 1.2.28.2 @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. * - * $Id: snmp_session.h,v 1.2.28.1 2001/10/19 19:05:08 serassio Exp $ + * $Id: snmp_session.h,v 1.2.28.2 2001/10/19 21:46:44 serassio Exp $ * **********************************************************************/ @@ -39,13 +39,6 @@ char *peername; /* Domain name or dotted IP address of default peer */ u_short remote_port; /* UDP port number of peer. */ u_short local_port; /* My UDP port number, 0 for default, picked randomly */ - /* This isn't used, but is here so that libraries compiled with this - * in place still work. - */ - u_char *(*authenticator) (); - int (*callback) (); /* Function to interpret incoming data */ - /* Pointer to data that the callback function may consider important */ - void *callback_magic; }; #define RECEIVED_MESSAGE 1 Index: squid/lib/rfc1123.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/rfc1123.c,v retrieving revision 1.4.24.1 retrieving revision 1.4.24.2 diff -u -r1.4.24.1 -r1.4.24.2 --- squid/lib/rfc1123.c 14 Mar 2001 22:17:32 -0000 1.4.24.1 +++ squid/lib/rfc1123.c 19 Oct 2001 21:46:44 -0000 1.4.24.2 @@ -1,6 +1,6 @@ /* - * $Id: rfc1123.c,v 1.4.24.1 2001/03/14 22:17:32 rbcollins Exp $ + * $Id: rfc1123.c,v 1.4.24.2 2001/10/19 21:46:44 serassio Exp $ * * DEBUG: * AUTHOR: Harvest Derived @@ -74,7 +74,7 @@ static int make_month(const char *s); static int make_num(const char *s); -static char *month_names[12] = +static const char *month_names[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" Index: squid/lib/util.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/util.c,v retrieving revision 1.4.14.4 retrieving revision 1.4.14.5 diff -u -r1.4.14.4 -r1.4.14.5 --- squid/lib/util.c 19 Oct 2001 19:05:09 -0000 1.4.14.4 +++ squid/lib/util.c 19 Oct 2001 21:46:44 -0000 1.4.14.5 @@ -1,6 +1,6 @@ /* - * $Id: util.c,v 1.4.14.4 2001/10/19 19:05:09 serassio Exp $ + * $Id: util.c,v 1.4.14.5 2001/10/19 21:46:44 serassio Exp $ * * DEBUG: * AUTHOR: Harvest Derived @@ -751,9 +751,9 @@ /* A default failure notifier when the main program hasn't installed any */ void -default_failure_notify(const char *msg) +default_failure_notify(const char *message) { - write(2, msg, strlen(msg)); + write(2, message, strlen(message)); write(2, "\n", 1); abort(); } Index: squid/snmplib/mib.c =================================================================== RCS file: /cvsroot/squid-sf//squid/snmplib/mib.c,v retrieving revision 1.1.1.1.72.3 retrieving revision 1.1.1.1.72.4 diff -u -r1.1.1.1.72.3 -r1.1.1.1.72.4 --- squid/snmplib/mib.c 19 Oct 2001 19:53:33 -0000 1.1.1.1.72.3 +++ squid/snmplib/mib.c 19 Oct 2001 21:46:45 -0000 1.1.1.1.72.4 @@ -83,6 +83,7 @@ #include "util.h" #include "snprintf.h" + static struct snmp_mib_tree *get_symbol(oid *objid, int objidlen, struct snmp_mib_tree *subtree, char *buf); oid RFC1066_MIB[] =