gindent

diff --git a/include/asn1.h b/include/asn1.h
index adb774a4b7545b9d871107d114da5adb31b2291a..8d0298fa8c96fe579cb4749d5b0190bc8e5b6574 100644 (file)
--- a/include/asn1.h
+++ b/include/asn1.h
@@ -71,15 +71,15 @@ typedef u_char oid;
 /* 32 bit integer compatability hack */
 #if SIZEOF_INT == 4
 typedef int num32;
-typedef unsigned int u_num32; 
+typedef unsigned int u_num32;
 #elif SIZEOF_LONG == 4
 typedef long num32;
 typedef unsigned long u_num32;
 #else
-typedef long num32;             /* assume that long's are 32bit */
+typedef long num32;            /* assume that long's are 32bit */
 typedef unsigned long u_num32;
 #endif
-#define NUM32LEN sizeof(num32)  /* this should always be 4 */
+#define NUM32LEN sizeof(num32) /* this should always be 4 */
 
 /* 
  * internal 64 bit representation:
@@ -89,105 +89,105 @@ struct counter64 {
     u_num32 low;
 };
 
-extern u_char *asn_parse_int (u_char * data,
-       int *datalength,
-       u_char * type,
-       long *intp,
-       int intsize);
-
-extern u_char *asn_build_int (u_char * data,
-       int *datalength,
-       u_char type,
-       long *intp,
-       int intsize);
-
-extern u_char *asn_parse_unsigned_int (u_char * data,
-       int *datalength,
-       u_char * type,
-       u_long * intp,
-       int intsize);
-
-extern u_char *asn_build_unsigned_int (u_char * data,
-       int *datalength,
-       u_char type,
-       u_long * intp,
-       int intsize);
-
-extern u_char *asn_parse_string (u_char * data,
-       int *datalength,
-       u_char * type,
-       u_char * string,
-       int *len);
-
-extern u_char *asn_build_string (u_char * data,
-       int *datalength,
-       u_char type,
-       u_char * str,
-       int len);
-
-extern u_char *asn_parse_header (u_char * data,
-       int *datalength,
-       u_char * type);
-
-extern u_char *asn_build_header (u_char * data,
-       int *datalength,
-       u_char type,
-       int len);
-
-extern u_char *asn_build_sequence (u_char * data,
-       int *datalength,
-       u_char type,
-       int len);
-
-extern u_char *asn_parse_length (u_char * data,
-       u_long * eln);
-
-extern u_char *asn_build_length (u_char * data,
-       int *datalength,
-       int len);
-
-extern u_char *asn_parse_objid (
-       u_char * data,
-       int *datalength,
-       u_char * type,
-       oid * objid,
-       int *objidlength);
-
-extern u_char *asn_build_objid (u_char * data,
-       int *datalength,
-       u_char type,
-       oid * objid,
-       int objidlength);
-
-extern u_char *asn_parse_null (u_char * data,
-       int *datalength,
-       u_char * type);
-
-extern u_char *asn_build_null (u_char * data,
-       int *datalength,
-       u_char type);
-extern u_char *asn_parse_bitstring (u_char * data,
-       int *datalength,
-       u_char * type,
-       u_char * str,
-       int *len);
-
-extern u_char *asn_build_bitstring (u_char * data,
-       int *datalength,
-       u_char type,
-       u_char * str,
-       int len);
-
-extern u_char *asn_parse_unsigned_int64 (u_char * data,
-       int *datalength,
-       u_char * type,
-       struct counter64 * cp,
-       int cp_size);
-
-extern u_char *asn_build_unsigned_int64 (u_char * data,
-       int *datalength,
-       u_char type,
-       struct counter64 * cp,
-       int cp_size);
+extern u_char *asn_parse_int(u_char * data,
+    int *datalength,
+    u_char * type,
+    long *intp,
+    int intsize);
+
+extern u_char *asn_build_int(u_char * data,
+    int *datalength,
+    u_char type,
+    long *intp,
+    int intsize);
+
+extern u_char *asn_parse_unsigned_int(u_char * data,
+    int *datalength,
+    u_char * type,
+    u_long * intp,
+    int intsize);
+
+extern u_char *asn_build_unsigned_int(u_char * data,
+    int *datalength,
+    u_char type,
+    u_long * intp,
+    int intsize);
+
+extern u_char *asn_parse_string(u_char * data,
+    int *datalength,
+    u_char * type,
+    u_char * string,
+    int *len);
+
+extern u_char *asn_build_string(u_char * data,
+    int *datalength,
+    u_char type,
+    u_char * str,
+    int len);
+
+extern u_char *asn_parse_header(u_char * data,
+    int *datalength,
+    u_char * type);
+
+extern u_char *asn_build_header(u_char * data,
+    int *datalength,
+    u_char type,
+    int len);
+
+extern u_char *asn_build_sequence(u_char * data,
+    int *datalength,
+    u_char type,
+    int len);
+
+extern u_char *asn_parse_length(u_char * data,
+    u_long * eln);
+
+extern u_char *asn_build_length(u_char * data,
+    int *datalength,
+    int len);
+
+extern u_char *asn_parse_objid(
+    u_char * data,
+    int *datalength,
+    u_char * type,
+    oid * objid,
+    int *objidlength);
+
+extern u_char *asn_build_objid(u_char * data,
+    int *datalength,
+    u_char type,
+    oid * objid,
+    int objidlength);
+
+extern u_char *asn_parse_null(u_char * data,
+    int *datalength,
+    u_char * type);
+
+extern u_char *asn_build_null(u_char * data,
+    int *datalength,
+    u_char type);
+extern u_char *asn_parse_bitstring(u_char * data,
+    int *datalength,
+    u_char * type,
+    u_char * str,
+    int *len);
+
+extern u_char *asn_build_bitstring(u_char * data,
+    int *datalength,
+    u_char type,
+    u_char * str,
+    int len);
+
+extern u_char *asn_parse_unsigned_int64(u_char * data,
+    int *datalength,
+    u_char * type,
+    struct counter64 *cp,
+    int cp_size);
+
+extern u_char *asn_build_unsigned_int64(u_char * data,
+    int *datalength,
+    u_char type,
+    struct counter64 *cp,
+    int cp_size);
 
 #endif

diff --git a/include/parse.h b/include/parse.h
index 92573e124e1a21c60ca37f5ca2d60bc45ac5d8a9..4b08f9b67eb6129bfe0e5fa20da5bca7e4db7177 100644 (file)
--- a/include/parse.h
+++ b/include/parse.h
@@ -87,7 +87,7 @@ struct tree {
 #define TYPE_NSAPADDRESS    13
 #define TYPE_UINTEGER      14
 
-struct tree *read_mib (const char *fname);
+struct tree *read_mib(const char *fname);
 
 
 #endif

diff --git a/include/snmp.h b/include/snmp.h
index e50aef0a765b95179a8a9212c702202e19804245..da933f458e5811618191ba2431e148dab2890761 100644 (file)
--- a/include/snmp.h
+++ b/include/snmp.h
@@ -4,26 +4,26 @@
  *
  */
 /*
-       Copyright 1988, 1989 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of CMU not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-*/
+ * Copyright 1988, 1989 by Carnegie Mellon University
+ * 
+ * All Rights Reserved
+ * 
+ * Permission to use, copy, modify, and distribute this software and its 
+ * documentation for any purpose and without fee is hereby granted, 
+ * provided that the above copyright notice appear in all copies and that
+ * both that copyright notice and this permission notice appear in 
+ * supporting documentation, and that the name of CMU not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  
+ * 
+ * CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
 
 #ifndef SNMP_H
 #define SNMP_H

diff --git a/include/snmp_api.h b/include/snmp_api.h
index 1889da187714485c897d22e7c1f44199ae420fdd..3715bee588b529404812b7514ec0f612fda56fbe 100644 (file)
--- a/include/snmp_api.h
+++ b/include/snmp_api.h
@@ -180,7 +180,7 @@ struct variable_list {
  * the pointer passed to snmp_open()).  On any error, NULL is returned
  * and snmp_errno is set to the appropriate error code.
  */
-struct snmp_session *snmp_open (struct snmp_session * session);
+struct snmp_session *snmp_open(struct snmp_session *session);
 
 /*
  * int snmp_close(session)
@@ -190,7 +190,7 @@ struct snmp_session *snmp_open (struct snmp_session * session);
  * dequeues any pending requests, and closes any sockets allocated for
  * the session.  Returns 0 on error, 1 otherwise.
  */
-int snmp_close (struct snmp_session * session);
+int snmp_close(struct snmp_session *session);
 
 
 /*
@@ -206,8 +206,8 @@ int snmp_close (struct snmp_session * session);
  * On any error, 0 is returned.
  * The pdu is freed by snmp_send() unless a failure occured.
  */
-int snmp_send (struct snmp_session * session,
-       struct snmp_pdu * pdu);
+int snmp_send(struct snmp_session *session,
+    struct snmp_pdu *pdu);
 
 
 /*
@@ -258,10 +258,10 @@ void snmp_free_pdu(struct snmp_pdu *pdu);
  *
  * snmp_select_info returns the number of open sockets.  (i.e. The number of sessions open)
  */
-int snmp_select_info (int *numfds,
-       fd_set * fdset,
-       struct timeval * timeout,
-       int *block);
+int snmp_select_info(int *numfds,
+    fd_set * fdset,
+    struct timeval *timeout,
+    int *block);
 
 /*
  * void snmp_timeout();
@@ -274,7 +274,7 @@ int snmp_select_info (int *numfds,
  * resent.  If there are no more retries available, the callback for the session
  * is used to alert the user of the timeout.
  */
-void snmp_timeout (void);
+void snmp_timeout(void);
 
 
 /*

diff --git a/include/snmp_client.h b/include/snmp_client.h
index ac2c4eef7946c1913b89422c41af650197862abd..e8e0c70795e742340652938695b147d495afe40b 100644 (file)
--- a/include/snmp_client.h
+++ b/include/snmp_client.h
@@ -40,10 +40,10 @@ struct synch_state {
 
 extern struct synch_state snmp_synch_state;
 
-extern struct snmp_pdu *snmp_pdu_create (int cmd);
+extern struct snmp_pdu *snmp_pdu_create(int cmd);
 
-extern struct snmp_pdu *snmp_fix_pdu (struct snmp_pdu * pdu,
-       int cmd);
-extern char *snmp_errstring (int errstat);
+extern struct snmp_pdu *snmp_fix_pdu(struct snmp_pdu *pdu,
+    int cmd);
+extern char *snmp_errstring(int errstat);
 
 #endif

diff --git a/include/snmp_impl.h b/include/snmp_impl.h
index a2cf874a10f9b98cb5580f9fccae9f2c8d5d84e2..cd92bf03695c34c02b2a95a8c5a78a0b58a7edf1 100644 (file)
--- a/include/snmp_impl.h
+++ b/include/snmp_impl.h
@@ -90,32 +90,32 @@ SOFTWARE.
 /* from snmp.c */
 extern u_char sid[];           /* size SID_MAX_LEN */
 
-extern u_char *snmp_parse_var_op (u_char * data,
-       oid * var_name,
-       int *var_name_len,
-       u_char * var_val_type,
-       int *var_val_len,
-       u_char ** var_val,
-       int *listlength);
-
-extern u_char *snmp_build_var_op (u_char * data,
-       oid * var_name,
-       int *var_name_len,
-       u_char var_val_type,
-       int var_val_len,
-       u_char * var_val,
-       int *listlength);
-
-extern u_char *snmp_auth_parse (u_char * data,
-       int *length,
-       u_char * sid,
-       int *slen,
-       long *version);
-
-extern u_char *snmp_auth_build (u_char * data,
-       int *length,
-       struct snmp_session * session,
-       int is_agent,
-       int messagelen);
+extern u_char *snmp_parse_var_op(u_char * data,
+    oid * var_name,
+    int *var_name_len,
+    u_char * var_val_type,
+    int *var_val_len,
+    u_char ** var_val,
+    int *listlength);
+
+extern u_char *snmp_build_var_op(u_char * data,
+    oid * var_name,
+    int *var_name_len,
+    u_char var_val_type,
+    int var_val_len,
+    u_char * var_val,
+    int *listlength);
+
+extern u_char *snmp_auth_parse(u_char * data,
+    int *length,
+    u_char * sid,
+    int *slen,
+    long *version);
+
+extern u_char *snmp_auth_build(u_char * data,
+    int *length,
+    struct snmp_session *session,
+    int is_agent,
+    int messagelen);
 
 #endif

diff --git a/include/snmp_util.h b/include/snmp_util.h
index 399fa87d23d091a102a672db59fa6682fa05035c..3c01a9b8d50e67a3ca79c5e8c2d8b81b3d5f838a 100644 (file)
--- a/include/snmp_util.h
+++ b/include/snmp_util.h
@@ -4,15 +4,15 @@
 /*
  * call a function at regular intervals (in seconds):
  */
-extern void snmp_alarm (int ival, void (*handler) (void));
+extern void snmp_alarm(int ival, void (*handler) (void));
 
 
 /*
  * service for filedescriptors:
  */
 
-extern void fd_add (int fd, void (*func) (int fd));
-extern void fd_service (void);
+extern void fd_add(int fd, void (*func) (int fd));
+extern void fd_service(void);
 
 
 /* ---------------------------------------------------------------------- */
@@ -28,7 +28,7 @@ extern void fd_service (void);
  * ** character is always '\0'.
  */
 void
-strcpy_safe (char *str, int str_len, char *val);
+     strcpy_safe(char *str, int str_len, char *val);
 
 
 /*
@@ -36,13 +36,13 @@ strcpy_safe (char *str, int str_len, char *val);
  * ** WARNING: this scans all interfaces (slow)
  */
 u_long
-Util_local_ip_address (void);
+Util_local_ip_address(void);
 
 /*
  * ** Function to get the current time in seconds
  */
 long
-Util_time_now (void);
+     Util_time_now(void);
 
 /*
  * ** Function to determine how long the agent has been running
@@ -55,13 +55,13 @@ long
  * ** Read data from file
  */
 int
-Util_file_read (char *file, int offset, char *data, int dataSz);
+    Util_file_read(char *file, int offset, char *data, int dataSz);
 
 /*
  * ** Write data into file
  */
 int
-Util_file_write (char *file, int offset, char *data, int dataSz);
+    Util_file_write(char *file, int offset, char *data, int dataSz);
 
 
 /* ---------------------------------------------------------------------- */

diff --git a/lib/tempnam.c b/lib/tempnam.c
index 1529d4fbd69a4db01451d520077508d14915d338..0583caa231728d6d0f25403a1ec583de5bdf1db4 100644 (file)
--- a/lib/tempnam.c
+++ b/lib/tempnam.c
@@ -1,3 +1,4 @@
+
 /* A reasonably functional tmpnam. */
 
 /* Originally by Tom Hageman, tom@basil.icce.rug.nl */

diff --git a/lib/util.c b/lib/util.c
index c90b32bf44c5f6eb14d89cdadee22c2ed79599af..194990cf858e7230edb4c6f9d6c133c47d081f81 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,5 +1,6 @@
+
 /*
- * $Id: util.c,v 1.35 1997/11/15 05:43:29 wessels Exp $
+ * $Id: util.c,v 1.36 1997/12/02 00:17:27 wessels Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived

diff --git a/snmplib/asn1.c b/snmplib/asn1.c
index 15a8be7480f3f8bd5f3e8e2e6e209d2b2c9cf7f1..5b8c490c924d10842086db108252a68071834c36 100644 (file)
--- a/snmplib/asn1.c
+++ b/snmplib/asn1.c
@@ -464,7 +464,7 @@ asn_build_sequence(data, datalength, type, length)
      u_char type;              /* IN - ASN type of object */
      int length;               /* IN - length of object */
 {
-       assert (*datalength >= 0);
+    assert(*datalength >= 0);
     *datalength -= 4;
     if (*datalength < 0) {
        *datalength += 4;       /* fix up before punting */

diff --git a/snmplib/mib.c b/snmplib/mib.c
index dccedd517bb4835b2fa605b7977861213492f559..a921c870ad3b809e33c1dfa6e6ca422ae50d7eb4 100644 (file)
--- a/snmplib/mib.c
+++ b/snmplib/mib.c
@@ -593,8 +593,8 @@ void
 init_mib(const char *file)
 {
     char *prefix;
-       if (Mib!=NULL)
-               return;
+    if (Mib != NULL)
+       return;
 
     Mib = 0;
     if (file)
@@ -750,7 +750,7 @@ main(argc, argv)
     }
 }
 
-#endif /* testing */
+#endif /* testing */
 
 
 #if 0
@@ -776,7 +776,7 @@ find_rfc1213_mib(root)
 }
 #endif
 
-int 
+int
 read_objid(input, output, out_len)
      char *input;
      oid *output;
@@ -809,7 +809,7 @@ read_objid(input, output, out_len)
 }
 
 #ifdef notdef
-int 
+int
 read_objid(input, output, out_len)
      char *input;
      oid *output;

diff --git a/snmplib/parse.c b/snmplib/parse.c
index 4bdfc4736f71c96190f4eec9cf05fa0244ed90ad..66da33cef1c83ad63f158f66f4eacc554dfd1e7f 100644 (file)
--- a/snmplib/parse.c
+++ b/snmplib/parse.c
@@ -1393,7 +1393,7 @@ parse_moduleIdentity(fp, name)
     return np;
 }
 
-int 
+int
 parse_mib_header(fp, name)
      FILE *fp;
      char *name;

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 1eef7606e62ba5af80e2ae76c57e72df0aa7b47c..7a3ecf66262d80cb41d1033603bc86bd868f2411 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,6 @@
+
 /*
- * $Id: cache_cf.cc,v 1.235 1997/12/01 22:45:49 wessels Exp $
+ * $Id: cache_cf.cc,v 1.236 1997/12/02 00:17:30 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -68,11 +69,11 @@ static size_t parseBytesUnits(const char *unit);
 static void free_all(void);
 static void requirePathnameExists(const char *name, const char *path);
 /*
-extern int create_view ( char **);
-extern int create_user ( char **);
-extern int create_community (char **);
-extern void tokenize ( char *, char **, int );
-*/
+ * extern int create_view ( char **);
+ * extern int create_user ( char **);
+ * extern int create_community (char **);
+ * extern void tokenize ( char *, char **, int );
+ */
 extern struct tree *Mib;
 
 static void
@@ -362,32 +363,31 @@ dump_acl(StoreEntry * entry, const char *name, acl * acl)
 }
 
 static void
-parse_snmp_conf(snmpconf **s)
+parse_snmp_conf(snmpconf ** s)
 {
-       static char buff[256];
-       static char *tokens[10], *p;
-       if (Mib==NULL)
-       {
-               if (Config.Snmp.mibPath) 
-                       init_mib(Config.Snmp.mibPath) ;
-               else
-                       fatal("snmp_mib_path should be defined before any snmp_agent_conf\n");
-       }
-       p=strtok(NULL, null_string);
-       strcpy(buff,p);
-       tokenize(buff, tokens, 10 );
+    static char buff[256];
+    static char *tokens[10], *p;
+    if (Mib == NULL) {
+       if (Config.Snmp.mibPath)
+           init_mib(Config.Snmp.mibPath);
+       else
+           fatal("snmp_mib_path should be defined before any snmp_agent_conf\n");
+    }
+    p = strtok(NULL, null_string);
+    strcpy(buff, p);
+    tokenize(buff, tokens, 10);
 
-       if ( !strcmp("view", tokens[0]) ) {
-               if (create_view(tokens) < 0 ) 
-                       debug(49,5)("snmp: parse_snmpconf(): error\n");
-       } else if ( !strcmp("user", tokens[0])) {
-               if (create_user(tokens) < 0 )
-                       debug(49,5)("snmp: parse_snmpconf(): error\n");
-       } else if ( !strcmp("community", tokens[0] )) { 
-               if ( create_community(tokens) < 0 ) 
-                       debug(49,5)("snmp: parse_snmpconf(): error\n");
-       } else 
-               debug(49,5)("snmp: unknown directive %s\n",tokens[0]);
+    if (!strcmp("view", tokens[0])) {
+       if (create_view(tokens) < 0)
+           debug(49, 5) ("snmp: parse_snmpconf(): error\n");
+    } else if (!strcmp("user", tokens[0])) {
+       if (create_user(tokens) < 0)
+           debug(49, 5) ("snmp: parse_snmpconf(): error\n");
+    } else if (!strcmp("community", tokens[0])) {
+       if (create_community(tokens) < 0)
+           debug(49, 5) ("snmp: parse_snmpconf(): error\n");
+    } else
+       debug(49, 5) ("snmp: unknown directive %s\n", tokens[0]);
 }
 
 static void
@@ -497,15 +497,15 @@ parse_cachedir(struct _cacheSwap *swap)
        if (!strcmp(path, tmp->path)) {
            /* just reconfigure it */
            if (size == tmp->max_size)
-               debug(3,1)("Cache dir '%s' size remains unchanged at %d MB\n",
-                       path, size);
+               debug(3, 1) ("Cache dir '%s' size remains unchanged at %d MB\n",
+                   path, size);
            else
-               debug(3,1)("Cache dir '%s' size changed to %d MB\n",
-                       path, size);
+               debug(3, 1) ("Cache dir '%s' size changed to %d MB\n",
+                   path, size);
            tmp->max_size = size;
            if (tmp->read_only != readonly)
-               debug(3,1)("Cache dir '%s' now %s\n",
-                       readonly ? "Read-Only" : "Read-Write");
+               debug(3, 1) ("Cache dir '%s' now %s\n",
+                   readonly ? "Read-Only" : "Read-Write");
            tmp->read_only = readonly;
            return;
        }
@@ -914,9 +914,9 @@ parse_onoff(int *var)
 #define free_eol free_string
 
 static void
-dump_snmp_conf(StoreEntry *entry, const char *name, snmpconf *head) 
+dump_snmp_conf(StoreEntry * entry, const char *name, snmpconf * head)
 {
-       storeAppendPrintf(entry, "%s -- UNIMPLEMENTED\n", name);
+    storeAppendPrintf(entry, "%s -- UNIMPLEMENTED\n", name);
 }
 
 static void
@@ -981,14 +981,14 @@ parse_refreshpattern(refresh_t ** head)
 }
 
 static void
-free_snmp_conf(snmpconf **head)
+free_snmp_conf(snmpconf ** head)
 {
-       snmpconf *t;
-       while (( t= *head ) != NULL ) { 
-       *head=t->next;
+    snmpconf *t;
+    while ((t = *head) != NULL) {
+       *head = t->next;
        safe_free(t->line);
        safe_free(t);
-       }
+    }
 }
 
 static void

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 99c5a27841cb49a27ca94cd2fab309a860a0b755..7ddf5bc784b82ac443e4a1556b4ecd66e6fc8e14 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -1,6 +1,7 @@
 
+
 /*
- * $Id: cbdata.cc,v 1.10 1997/11/29 17:00:43 wessels Exp $
+ * $Id: cbdata.cc,v 1.11 1997/12/02 00:17:31 wessels Exp $
  *
  * DEBUG: section 45    Callback Data Registry
  * AUTHOR: Duane Wessels

diff --git a/src/client.cc b/src/client.cc
index ee78c5b4d5436ac02d8a7577193c78cd87a8a799..e4e7293f104c16419a29cb360df41c05d7ec09fa 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: client.cc,v 1.44 1997/12/01 05:34:55 wessels Exp $
+ * $Id: client.cc,v 1.45 1997/12/02 00:17:31 wessels Exp $
  *
  * DEBUG: section 0     WWW Client
  * AUTHOR: Harvest Derived
@@ -244,9 +244,9 @@ main(int argc, char *argv[])
     }
     if (keep_alive) {
        if (port != 80)
-               snprintf(buf, BUFSIZ, "Proxy-Connection: Keep-Alive\r\n");
+           snprintf(buf, BUFSIZ, "Proxy-Connection: Keep-Alive\r\n");
        else
-               snprintf(buf, BUFSIZ, "Connection: Keep-Alive\r\n");
+           snprintf(buf, BUFSIZ, "Connection: Keep-Alive\r\n");
        strcat(msg, buf);
     }
     snprintf(buf, BUFSIZ, "\r\n");

diff --git a/src/client_side.cc b/src/client_side.cc
index fa2a448a88604c08e2fd0ba4562d01672caaa587..7db95a2436acbd1405b82376d44d7a60b3fce000 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.163 1997/12/01 04:46:50 wessels Exp $
+ * $Id: client_side.cc,v 1.164 1997/12/02 00:17:32 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1781,7 +1781,7 @@ icpCheckTransferDone(clientHttpRequest * http)
         * or wait for EOF on the socket.
         */
        if (mem->reply->code == 200)
-               return 0;
+           return 0;
        /*
         * reply->hdr_sz will be set by httpParseReplyHeaders()
         * if we find the end of the headers.  If we find the end,

diff --git a/src/enums.h b/src/enums.h
index a13d1d7828fdd2109b6c9ad1daff1d955aa4e3c8..d3133e60c1c04ee226c94e20bd81335e60d838ed 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -365,7 +365,7 @@ typedef enum {
 } allow_t;
 
 enum {
-SNMP_C_VIEW,
-SNMP_C_USER,
-SNMP_C_COMMUNITY
+    SNMP_C_VIEW,
+    SNMP_C_USER,
+    SNMP_C_COMMUNITY
 };

diff --git a/src/errorpage.cc b/src/errorpage.cc
index e4a52599e486e82ec874a20d11299215f6e2f364..ccc9cc941479fdedc7ee6fb016722fdfa65d95dd 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.106 1997/11/30 03:08:37 wessels Exp $
+ * $Id: errorpage.cc,v 1.107 1997/12/02 00:17:33 wessels Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -188,7 +188,7 @@ errorStateFree(ErrorState * err)
 #define CVT_BUF_SZ 512
 
 /*
- * B - URL with FTP %2f hack                   x
+ * B - URL with FTP %2f hack                  x
  * c - Squid error code
  * d - seconds elapsed since request received
  * e - errno                                    x

diff --git a/src/fd.cc b/src/fd.cc
index c129aad52ab3eb2780fad4a48dec49dc61520832..01204b974393a7cda25e20dac7a5cf9f9628d5c2 100644 (file)
--- a/src/fd.cc
+++ b/src/fd.cc
@@ -1,5 +1,6 @@
+
 /*
- * $Id: fd.cc,v 1.15 1997/11/02 03:21:59 wessels Exp $
+ * $Id: fd.cc,v 1.16 1997/12/02 00:17:34 wessels Exp $
  *
  * DEBUG: section 51    Filedescriptor Functions
  * AUTHOR: Duane Wessels

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index a8499e28c68a4de7239396d4fd7bcb6263835596..23bcb721f0e9e62c5d99480e87f19d03c270a3f8 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.70 1997/12/01 22:45:51 wessels Exp $
+ * $Id: fqdncache.cc,v 1.71 1997/12/02 00:17:34 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -140,8 +140,8 @@ static void fqdncache_dnsHandleRead(int, void *);
 static fqdncache_entry *fqdncache_parsebuffer(const char *buf, dnsserver_t *);
 static int fqdncache_purgelru(void);
 static void fqdncache_release(fqdncache_entry *);
- fqdncache_entry *fqdncache_GetFirst(void);
- fqdncache_entry *fqdncache_GetNext(void);
+fqdncache_entry *fqdncache_GetFirst(void);
+fqdncache_entry *fqdncache_GetNext(void);
 static fqdncache_entry *fqdncache_create(const char *name);
 static void fqdncache_add_to_hash(fqdncache_entry *);
 static void fqdncache_call_pending(fqdncache_entry *);
@@ -240,13 +240,13 @@ fqdncache_get(const char *name)
     return f;
 }
 
- fqdncache_entry *
+fqdncache_entry *
 fqdncache_GetFirst(void)
 {
     return (fqdncache_entry *) hash_first(fqdn_table);
 }
 
- fqdncache_entry *
+fqdncache_entry *
 fqdncache_GetNext(void)
 {
     return (fqdncache_entry *) hash_next(fqdn_table);

diff --git a/src/ftp.cc b/src/ftp.cc
index 6d001880044d7039d1b6e73077dbbf4ccd5c364b..ffc50e60527902f1becbf29d528b7415b855c824 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,5 +1,6 @@
+
 /*
- * $Id: ftp.cc,v 1.175 1997/11/30 03:08:38 wessels Exp $
+ * $Id: ftp.cc,v 1.176 1997/12/02 00:17:35 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived

diff --git a/src/http.cc b/src/http.cc
index 09257d0ed796bbdf23471e1c62d0d16ef1b0053b..4d55c9177bde894a0e8eb667df333df18de5dd30 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.225 1997/12/01 02:17:29 wessels Exp $
+ * $Id: http.cc,v 1.226 1997/12/02 00:17:37 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -580,7 +580,7 @@ httpPconnTransferDone(HttpStateData * httpState)
     if (reply->code != 200)
        if (reply->content_length < 0)
            if (httpState->reply_hdr_state > 1)
-               return 1;
+               return 1;
     /*
      * If there is no content-length, then we probably can't be persistent
      */

diff --git a/src/ipcache.cc b/src/ipcache.cc
index e850bc3f7c417b1861b31ede037d3709e705d8e6..93d32d6e0ed3513510ec5972af79cad0e8c7941c 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.147 1997/12/01 22:45:52 wessels Exp $
+ * $Id: ipcache.cc,v 1.148 1997/12/02 00:17:38 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -130,7 +130,7 @@ static struct {
     int release_locked;
 } IpcacheStats;
 
- dlink_list lru_list;
+dlink_list lru_list;
 
 static int ipcache_testname(void);
 #if OLD_CODE

diff --git a/src/protos.h b/src/protos.h
index 0337010438343ddf992db73df308df72d9ed7ffb..c3e9a09ac1efcb11553d39fe6f9ee5458f86f8b7 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,5 +1,6 @@
 
 
+
 extern void accessLogLog(AccessLogEntry *);
 extern void accessLogRotate(void);
 extern void accessLogClose(void);

diff --git a/src/recv-announce.cc b/src/recv-announce.cc
index 3f3f024fc5093d7e8125d973d5dd7bec8837282a..238c2794d780b27e86dcc674d9200dd1fec7e076 100644 (file)
--- a/src/recv-announce.cc
+++ b/src/recv-announce.cc
@@ -1,5 +1,6 @@
+
 /*
- * $Id: recv-announce.cc,v 1.14 1997/10/25 17:22:56 wessels Exp $
+ * $Id: recv-announce.cc,v 1.15 1997/12/02 00:17:39 wessels Exp $
  *
  * DEBUG: section 0     Announcement Server
  * AUTHOR: Harvest Derived

diff --git a/src/redirect.cc b/src/redirect.cc
index 25576a1e2a10059f12e497632c3b7ef41bd12635..6837a32692891b278a136038d05c367d8742cf0c 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,5 +1,6 @@
+
 /*
- * $Id: redirect.cc,v 1.49 1997/11/12 00:09:03 wessels Exp $
+ * $Id: redirect.cc,v 1.50 1997/12/02 00:17:40 wessels Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 1d6ac9d3822baeeaa06ec0198e44a5fa7273e56e..ee9387fe4f878b542ea31fdc11400915c8f821c0 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -374,7 +374,7 @@ snmp_agent_parse(sn_data, length, out_sn_data, out_length, sourceip, ireqid)
            create_toobig(out_auth, *out_length, reqid, pi);
            break;
        }                       /* else FALLTHRU */
-#tendif
+#ntendif
     case SNMP_ERR_NOACCESS:
     case SNMP_ERR_WRONGTYPE:
     case SNMP_ERR_WRONGLENGTH:
@@ -772,7 +772,7 @@ check_auth(session, sn_data, length, pp, plen, ueret)
     return 0;
 }
 
-int 
+int
 get_community(sessionid)
      u_char *sessionid;
 {
@@ -797,7 +797,7 @@ get_community(sessionid)
     return 0;
 }
 
-static int 
+static int
 goodValue(inType, inLen, actualType, actualLen)
      u_char inType, actualType;
      int inLen, actualLen;

diff --git a/src/stat.cc b/src/stat.cc
index 51ba62ad4159c9b7d9d6fbadf73bed36b47f113a..6106a2adc8518594ee7bcedfc84f81091b9c3e4a 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.177 1997/12/01 22:45:57 wessels Exp $
+ * $Id: stat.cc,v 1.178 1997/12/02 00:17:43 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -115,7 +115,7 @@ static void proto_count(cacheinfo *, protocol_t, log_type);
 static void proto_newobject(cacheinfo *, protocol_t, int, int);
 static void proto_purgeobject(cacheinfo *, protocol_t, int);
 static void proto_touchobject(cacheinfo *, protocol_t, int);
- int memoryAccounted(void);
+int memoryAccounted(void);
 static void statAvgTick(void *notused);
 
 #ifdef XMALLOC_STATISTICS
@@ -496,7 +496,7 @@ statFiledescriptors(StoreEntry * sentry)
     storeAppendPrintf(sentry, close_bracket);
 }
 
- int
+int
 memoryAccounted(void)
 {
     return (int)

diff --git a/src/structs.h b/src/structs.h
index 09384ef1c1ba6ce88dbe12347497c5485e4fb91e..73d724541e58fe7d72ff32848c82e44389044063 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -35,9 +35,9 @@ struct _acl_deny_info_list {
 };
 
 struct _snmpconf {
-       char *line;
-       int type;
-       struct _snmpconf *next;
+    char *line;
+    int type;
+    struct _snmpconf *next;
 };
 
 struct _acl {
@@ -143,9 +143,9 @@ struct _SquidConfig {
        int do_queueing;
        int conf_authtraps;
        struct _snmpconf *snmpconf;
-       viewEntry       *views;
-       usecEntry       *users;
-       communityEntry  *communities;
+       viewEntry *views;
+       usecEntry *users;
+       communityEntry *communities;
     } Snmp;
     struct {
        char *log;

diff --git a/src/typedefs.h b/src/typedefs.h
index 5ba339f66269dbee9c3491caf0b68c37b53b8933..9c479994425ceebebf47902012bd2d2f10c41672 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -106,7 +106,7 @@ typedef void SIGHDLR(int sig);
 /* 32 bit integer compatability hack */
 #if SIZEOF_INT == 4
 /*typedef int num32;
-typedef unsigned int u_num32;*/
+ * typedef unsigned int u_num32; */
 #elif SIZEOF_LONG == 4
 typedef long num32;
 typedef unsigned long u_num32;