------------------------------------------------------------ revno: 12301 revision-id: squidadm@squid-cache.org-20120828130030-ch79kwso5hi69kex parent: kinkie@squid-cache.org-20120828124552-meazdgc59jeak9qh committer: Automatic source maintenance branch nick: trunk timestamp: Tue 2012-08-28 07:00:30 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20120828130030-\ # ch79kwso5hi69kex # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 286dbef7887daad6cd379a192ac9b290000d6cfc # timestamp: 2012-08-28 13:08:04 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20120828124552-\ # meazdgc59jeak9qh # # Begin patch === modified file 'compat/GnuRegex.c' --- compat/GnuRegex.c 2012-01-20 18:55:04 +0000 +++ compat/GnuRegex.c 2012-08-28 13:00:30 +0000 @@ -48,7 +48,6 @@ #include #endif - /* Define the syntax stuff for \<, \>, etc. */ /* This must be nonzero for the wordchar and notwordchar pattern @@ -105,7 +104,6 @@ * internal error. */ static int re_compile_fastmap(struct re_pattern_buffer * buffer); - /* Search in the string STRING (with length LENGTH) for the pattern * compiled into BUFFER. Start searching at position START, for RANGE * characters. Return the starting position of the match, -1 for no @@ -114,21 +112,18 @@ static int re_search(struct re_pattern_buffer * buffer, const char *string, int length, int start, int range, struct re_registers * regs); - /* Like `re_search', but search in the concatenation of STRING1 and * STRING2. Also, stop searching at index START + STOP. */ static int re_search_2(struct re_pattern_buffer * buffer, const char *string1, int length1, const char *string2, int length2, int start, int range, struct re_registers * regs, int stop); - /* Like `re_search_2', but return how many characters in STRING the regexp * in BUFFER matched, starting at position START. */ static int re_match_2(struct re_pattern_buffer * buffer, const char *string1, int length1, const char *string2, int length2, int start, struct re_registers * regs, int stop); - /* isalpha etc. are used for the character classes. */ #include @@ -215,7 +210,6 @@ #endif /* not REGEX_MALLOC */ - /* True if `size1' is non-NULL and PTR is pointing anywhere inside * `string1' or just past its end. This works if PTR is NULL, which is * a good thing. */ @@ -457,7 +451,6 @@ #define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) \ if (debug) print_double_string (w, s1, sz1, s2, sz2) - extern void printchar(); /* Print the fastmap in human-readable form. */ @@ -486,7 +479,6 @@ putchar('\n'); } - /* Print a compiled pattern string in human-readable form, starting at * the START pointer into it and ending just before the pointer END. */ @@ -663,7 +655,6 @@ printf("/\n"); } - void print_compiled_pattern(bufp) struct re_pattern_buffer *bufp; @@ -688,7 +679,6 @@ /* Perhaps we should print the translate table? */ } - void print_double_string(where, string1, size1, string2, size2) const char *where; @@ -772,14 +762,12 @@ /* Go backwards one character in the pattern. */ #define PATUNFETCH p-- - /* If `translate' is non-null, return translate[D], else just D. We * cast the subscript to translate because some data is declared as * `char *', to avoid warnings when a string constant is passed. But * when we use a character as a subscript we must make it unsigned. */ #define TRANSLATE(d) (translate ? translate[(unsigned char) (d)] : (d)) - /* Macros for outputting the compiled pattern into `buffer'. */ /* If the buffer isn't allocated when it comes in, use this. */ @@ -797,7 +785,6 @@ *b++ = (unsigned char) (c); \ } while (0) - /* Ensure we have two more bytes of buffer space and then append C1 and C2. */ #define BUF_PUSH_2(c1, c2) \ do { \ @@ -806,7 +793,6 @@ *b++ = (unsigned char) (c2); \ } while (0) - /* As with BUF_PUSH_2, except for three bytes. */ #define BUF_PUSH_3(c1, c2, c3) \ do { \ @@ -816,7 +802,6 @@ *b++ = (unsigned char) (c3); \ } while (0) - /* Store a jump with opcode OP at LOC to location TO. We store a * relative address offset by the three bytes the jump itself occupies. */ #define STORE_JUMP(op, loc, to) \ @@ -834,13 +819,11 @@ #define INSERT_JUMP2(op, loc, to, arg) \ insert_op2 (op, loc, (to) - (loc) - 3, arg, b) - /* This is not an arbitrary limit: the arguments which represent offsets * into the pattern are two bytes long. So if 2^16 bytes turns out to * be too small, many things would have to change. */ #define MAX_BUF_SIZE (1L << 16) - /* Extend the buffer by twice its current size via realloc and * reset the pointers that pointed into the old block to point to the * correct places in the new one. If extending the buffer results in it @@ -870,7 +853,6 @@ } \ } while (0) - /* Since we have one byte reserved for the register number argument to * {start,stop}_memory, the maximum number of groups we can report * things about is what fits in that byte. */ @@ -880,7 +862,6 @@ * ignore the excess. */ typedef unsigned regnum_t; - /* Macros for the compile stack. */ /* Since offsets can go either forwards or backwards, this type needs to @@ -895,7 +876,6 @@ regnum_t regnum; } compile_stack_elt_t; - typedef struct { compile_stack_elt_t *stack; unsigned size; @@ -919,13 +899,11 @@ /* The next available element. */ #define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail]) - /* Set the bit for character C in a list. */ #define SET_LIST_BIT(c) \ (b[((unsigned char) (c)) / BYTEWIDTH] \ |= 1 << (((unsigned char) c) % BYTEWIDTH)) - /* Get the next unsigned number in the uncompiled pattern. */ #define GET_UNSIGNED_NUMBER(num) \ { if (p != pend) \ @@ -1093,7 +1071,6 @@ } break; - case '$': { if ( /* If at end of pattern, it's an operator. */ p == pend @@ -1107,7 +1084,6 @@ } break; - case '+': case '?': if ((syntax & RE_BK_PLUS_QM) @@ -1226,13 +1202,11 @@ } break; - case '.': laststart = b; BUF_PUSH(anychar); break; - case '[': { boolean had_char_class = false; @@ -1402,42 +1376,36 @@ } break; - case '(': if (syntax & RE_NO_BK_PARENS) goto handle_open; else goto normal_char; - case ')': if (syntax & RE_NO_BK_PARENS) goto handle_close; else goto normal_char; - case '\n': if (syntax & RE_NEWLINE_ALT) goto handle_alt; else goto normal_char; - case '|': if (syntax & RE_NO_BK_VBAR) goto handle_alt; else goto normal_char; - case '{': if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES) goto handle_interval; else goto normal_char; - case '\\': if (p == pend) return REG_EESCAPE; @@ -1493,7 +1461,6 @@ pending_exact = 0; break; - case ')': if (syntax & RE_NO_BK_PARENS) goto normal_backslash; @@ -1557,7 +1524,6 @@ } break; - case '|': /* `\|'. */ if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR) goto normal_backslash; @@ -1602,7 +1568,6 @@ begalt = b; break; - case '{': /* If \{ is a literal. */ if (!(syntax & RE_INTERVALS) @@ -1756,19 +1721,16 @@ } goto normal_char; - case 'w': laststart = b; BUF_PUSH(wordchar); break; - case 'W': laststart = b; BUF_PUSH(notwordchar); break; - case '<': BUF_PUSH(wordbeg); break; @@ -1818,7 +1780,6 @@ BUF_PUSH_2(duplicate, c1); break; - case '+': case '?': if (syntax & RE_BK_PLUS_QM) @@ -1836,7 +1797,6 @@ } break; - default: /* Expects the character in `c'. */ normal_char: @@ -1871,7 +1831,6 @@ } /* switch (c) */ } /* while p != pend */ - /* Through the pattern now. */ if (fixup_alt_jump) @@ -1905,7 +1864,6 @@ STORE_NUMBER(loc + 1, arg); } - /* Like `store_op1', but for two two-byte parameters ARG1 and ARG2. */ void @@ -1916,7 +1874,6 @@ STORE_NUMBER(loc + 3, arg2); } - /* Copy the bytes from LOC to END to open up three bytes of space at LOC * for OP followed by two-byte integer parameter ARG. */ @@ -1932,7 +1889,6 @@ store_op1(op, loc, arg); } - /* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2. */ void @@ -1947,7 +1903,6 @@ store_op2(op, loc, arg1, arg2); } - /* P points to just after a ^ in PATTERN. Return true if that ^ comes * after an alternative or a begin-subexpression. We assume there is at * least one character before the ^. */ @@ -1965,7 +1920,6 @@ || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash)); } - /* The dual of at_begline_loc_p. This one is for $. We assume there is * at least one character after the $, i.e., `P < PEND'. */ @@ -1985,7 +1939,6 @@ : next_backslash && next_next && *next_next == '|'); } - /* Returns true if REGNUM is in one of COMPILE_STACK's elements and * false if it's not. */ @@ -2003,7 +1956,6 @@ return false; } - /* Read the ending character of a range (in a bracket expression) from the * uncompiled pattern *P_PTR (which ends at PEND). We assume the * starting character is in `P[-2]'. (`P[-1]' is the character `-'.) @@ -2059,7 +2011,6 @@ * re_match_2 use a failure stack. These have to be macros because of * REGEX_ALLOCATE. */ - /* Number of failure points for which to initially allocate space * when matching. If this number is exceeded, we allocate more * space, so it is not a hard limit. */ @@ -2086,7 +2037,6 @@ #define FAIL_STACK_FULL() (fail_stack.avail == fail_stack.size) #define FAIL_STACK_TOP() (fail_stack.stack[fail_stack.avail]) - /* Initialize `fail_stack'. Do `return -2' if the alloc fails. */ #define INIT_FAIL_STACK() \ @@ -2101,7 +2051,6 @@ fail_stack.avail = 0; \ } while (0) - /* Double the size of FAIL_STACK, up to approximately `re_max_failures' items. * * Return 1 if succeeds, and 0 if either ran out of memory @@ -2122,7 +2071,6 @@ : ((fail_stack).size <<= 1, \ 1))) - /* Push PATTERN_OP on FAIL_STACK. * * Return 1 if was able to do so and 0 if ran out of memory allocating @@ -2152,7 +2100,6 @@ #define DEBUG_POP(item_addr) #endif - /* Push the information about the state we will need * if we ever fail back to it. * @@ -2258,7 +2205,6 @@ /* How many items can still be added to the stack without overflowing it. */ #define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail) - /* Pops what PUSH_FAIL_STACK pushes. * * We restore into the parameters, all of which should be lvalues: @@ -2407,7 +2353,6 @@ bufp->can_be_null = 1; return 0; - /* Following are the cases which match a character. These end * with `break'. */ @@ -2415,14 +2360,12 @@ fastmap[p[1]] = 1; break; - case charset: for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--) if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) fastmap[j] = 1; break; - case charset_not: /* Chars beyond end of map must be allowed. */ for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++) @@ -2433,21 +2376,18 @@ fastmap[j] = 1; break; - case wordchar: for (j = 0; j < (1 << BYTEWIDTH); j++) if (SYNTAX(j) == Sword) fastmap[j] = 1; break; - case notwordchar: for (j = 0; j < (1 << BYTEWIDTH); j++) if (SYNTAX(j) != Sword) fastmap[j] = 1; break; - case anychar: /* `.' matches anything ... */ for (j = 0; j < (1 << BYTEWIDTH); j++) @@ -2465,7 +2405,6 @@ /* Otherwise, have to check alternative paths. */ break; - case no_op: case begline: case endline: @@ -2478,7 +2417,6 @@ case push_dummy_failure: continue; - case jump_n: case pop_failure_jump: case maybe_pop_jump: @@ -2510,7 +2448,6 @@ continue; - case on_failure_jump: case on_failure_keep_string_jump: handle_on_failure_jump: @@ -2535,7 +2472,6 @@ } continue; - case succeed_n: /* Get to the number of times to succeed. */ p += 2; @@ -2549,18 +2485,15 @@ } continue; - case set_number_at: p += 4; continue; - case start_memory: case stop_memory: p += 2; continue; - default: abort(); /* We have listed all the cases. */ } /* switch *p++ */ @@ -2597,7 +2530,6 @@ regs, size); } - /* Using the compiled pattern in BUFP->buffer, first tries to match the * virtual concatenation of STRING1 and STRING2, starting first at index * STARTPOS, then at STARTPOS + 1, and so on. @@ -2759,7 +2691,6 @@ #define MATCHED_SOMETHING(R) ((R).bits.matched_something) #define EVER_MATCHED_SOMETHING(R) ((R).bits.ever_matched_something) - /* Call this when have matched a real character; it sets `matched' flags * for the subexpressions which we are currently inside. Also records * that those subexprs have matched. */ @@ -2776,7 +2707,6 @@ } \ while (0) - /* This converts PTR, a pointer into one of the search strings `string1' * and `string2' into an offset from the beginning of that string. */ #define POINTER_TO_OFFSET(ptr) \ @@ -2786,7 +2716,6 @@ #define REG_UNSET_VALUE ((char *) -1) #define REG_UNSET(e) ((e) == REG_UNSET_VALUE) - /* Macros for dealing with the split strings in re_match_2. */ #define MATCHING_IN_FIRST_STRING (dend == end_match_1) @@ -2804,13 +2733,11 @@ dend = end_match_2; \ } - /* Test if at very beginning or at very end of the virtual concatenation * of `string1' and `string2'. If only one string, it's `string2'. */ #define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2) #define AT_STRINGS_END(d) ((d) == end2) - /* Test if D points to a character which is word-constituent. We have * two special cases to check for: if past the end of string1, look at * the first character in string2; and if before the beginning of @@ -2826,7 +2753,6 @@ (AT_STRINGS_BEG (d) || AT_STRINGS_END (d) \ || WORDCHAR_P (d - 1) != WORDCHAR_P (d)) - /* Free everything we malloc. */ #ifdef REGEX_MALLOC #define FREE_VAR(var) if (var) free (var); var = NULL @@ -2848,7 +2774,6 @@ #define FREE_VARIABLES() alloca (0) #endif /* not REGEX_MALLOC */ - /* These values must meet several constraints. They must not be valid * register values; since we have a limit of 255 registers (because * we use only one byte in the pattern for the register number), we can @@ -3207,7 +3132,6 @@ DEBUG_PRINT1("EXECUTING no_op.\n"); break; - /* Match the next n pattern characters exactly. The following * byte in the pattern defines n, and the n bytes after that * are the characters to match. */ @@ -3233,7 +3157,6 @@ SET_REGS_MATCHED(); break; - /* Match any character except possibly a newline or a null. */ case anychar: DEBUG_PRINT1("EXECUTING anychar.\n"); @@ -3249,7 +3172,6 @@ d++; break; - case charset: case charset_not: { register unsigned char c; @@ -3276,7 +3198,6 @@ break; } - /* The beginning of a group is represented by start_memory. * The arguments are the register number in the next byte, and the * number of groups inner to this one in the next. The text @@ -3321,7 +3242,6 @@ p += 2; break; - /* The stop_memory opcode represents the end of a group. Its * arguments are the same as start_memory's: the register * number, and the number of inner groups. */ @@ -3444,7 +3364,6 @@ p += 2; break; - /* \ has been turned into a `duplicate' command which is * followed by the numeric value of as the register number. */ case duplicate: { @@ -3506,7 +3425,6 @@ } break; - /* begline matches the empty string at the beginning of the string * (unless `not_bol' is set in `bufp'), and, if * `newline_anchor' is set, after newlines. */ @@ -3522,7 +3440,6 @@ /* In all other cases, we fail. */ goto fail; - /* endline is the dual of begline. */ case endline: DEBUG_PRINT1("EXECUTING endline.\n"); @@ -3538,7 +3455,6 @@ } goto fail; - /* Match at the very beginning of the data. */ case begbuf: DEBUG_PRINT1("EXECUTING begbuf.\n"); @@ -3546,7 +3462,6 @@ break; goto fail; - /* Match at the very end of the data. */ case endbuf: DEBUG_PRINT1("EXECUTING endbuf.\n"); @@ -3554,7 +3469,6 @@ break; goto fail; - /* on_failure_keep_string_jump is used to optimize `.*\n'. It * pushes NULL as the value for the string on the stack. Then * `pop_failure_point' will keep the current value for the @@ -3580,7 +3494,6 @@ PUSH_FAILURE_POINT(p + mcnt, NULL, -2); break; - /* Uses of on_failure_jump: * * Each alternative starts with an on_failure_jump that points @@ -3631,7 +3544,6 @@ PUSH_FAILURE_POINT(p + mcnt, d, -2); break; - /* A smart repeat ends with `maybe_pop_jump'. * We change it to either `pop_failure_jump' or `jump'. */ case maybe_pop_jump: @@ -3705,7 +3617,6 @@ } /* Note fall through. */ - /* The end of a simple repeat has a pop_failure_jump back to * its matching on_failure_jump, where the latter will push a * failure point. The pop_failure_jump takes off failure @@ -3732,7 +3643,6 @@ } /* Note fall through. */ - /* Unconditionally jump (without popping any failure points). */ case jump: unconditional_jump: @@ -3742,14 +3652,12 @@ DEBUG_PRINT2("(to 0x%x).\n", p); break; - /* We need this opcode so we can detect where alternatives end * in `group_match_null_string_p' et al. */ case jump_past_alt: DEBUG_PRINT1("EXECUTING jump_past_alt.\n"); goto unconditional_jump; - /* Normally, the on_failure_jump pushes a failure point, which * then gets popped at pop_failure_jump. We will end up at * pop_failure_jump, also, and with a pattern of, say, `a+', we @@ -3762,7 +3670,6 @@ PUSH_FAILURE_POINT(0, 0, -2); goto unconditional_jump; - /* At the end of an alternative, we need to push a dummy failure * point in case we are followed by a `pop_failure_jump', because * we don't want the failure point for the alternative to be @@ -3870,7 +3777,6 @@ } continue; /* Successfully executed one pattern command; keep going. */ - /* We goto here if a matching operation fails. */ fail: if (!FAIL_STACK_EMPTY()) { /* A restart point is known. Restore to that state. */ @@ -3971,7 +3877,6 @@ * So, we have to first go through the first (n-1) * alternatives and then deal with the last one separately. */ - /* Deal with the first (n-1) alternatives, which start * with an on_failure_jump (see above) that jumps to right * past a jump_past_alt. */ @@ -4017,13 +3922,11 @@ } /* if mcnt > 0 */ break; - case stop_memory: assert(p1[1] == **p); *p = p1 + 2; return true; - default: if (!common_op_match_null_string_p(&p1, end, reg_info)) return false; @@ -4033,7 +3936,6 @@ return false; } /* group_match_null_string_p */ - /* Similar to group_match_null_string_p, but doesn't deal with alternatives: * It expects P to be the first byte of a single alternative and END one * byte past the last. The alternative can contain groups. */ @@ -4065,7 +3967,6 @@ return true; } /* alt_match_null_string_p */ - /* Deals with the ops common to group_match_null_string_p and * alt_match_null_string_p. * @@ -4145,7 +4046,6 @@ return true; } /* common_op_match_null_string_p */ - /* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN * bytes; nonzero otherwise. */ @@ -4163,7 +4063,6 @@ /* Entry points for GNU code. */ - /* POSIX.2 functions */ /* regcomp takes a regular expression as a string and compiles it. @@ -4257,7 +4156,6 @@ return (int) ret; } - /* regexec searches for a given pattern, specified by PREG, in the * string STRING. * @@ -4326,7 +4224,6 @@ return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH; } - /* Returns a message corresponding to an error code, ERRCODE, returned * from either regcomp or regexec. We don't use PREG here. */ @@ -4363,7 +4260,6 @@ return msg_size; } - /* Free dynamically allocated space used by PREG. */ void === modified file 'compat/GnuRegex.h' --- compat/GnuRegex.h 2010-11-21 04:40:05 +0000 +++ compat/GnuRegex.h 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ #include #endif - #else /* USE_GNUREGEX */ #ifdef __cplusplus @@ -144,7 +143,6 @@ * If not set, then an unmatched ) is invalid. */ #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) - /* Define combinations of the above bits for the standard possibilities. * (The [[[ comments delimit what gets put into the Texinfo file, so * don't delete them!) */ @@ -216,7 +214,6 @@ #endif #define RE_DUP_MAX ((1 << 15) - 1) - /* POSIX `cflags' bits (i.e., information for `regcomp'). */ /* If this bit is set, then use extended regular expression syntax. @@ -236,7 +233,6 @@ * If not set, then returns differ between not matching and errors. */ #define REG_NOSUB (REG_NEWLINE << 1) - /* POSIX `eflags' bits (i.e., information for regexec). */ /* If this bit is set, then the beginning-of-line operator doesn't match @@ -249,7 +245,6 @@ /* Like REG_NOTBOL, except for the end-of-line. */ #define REG_NOTEOL (1 << 1) - /* If any error codes are removed, changed, or added, update the * `re_error_msg' table in regex.c. */ typedef enum { @@ -352,7 +347,6 @@ typedef struct re_pattern_buffer regex_t; - /* search.c (search_buffer) in Emacs needs this one opcode value. It is * defined both in `regex.c' and here. */ #define RE_EXACTN_VALUE 1 @@ -360,7 +354,6 @@ /* Type for byte offsets within the string. POSIX mandates this. */ typedef int regoff_t; - /* This is the structure we store register match data in. See * regex.texinfo for a full description of what registers match. */ struct re_registers { @@ -369,7 +362,6 @@ regoff_t *end; }; - /* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, * `re_match_2' returns information about at least this many registers * the first time a `regs' structure is passed. */ @@ -377,7 +369,6 @@ #define RE_NREGS 30 #endif - /* POSIX specification for registers. Aside from the different names than * `re_registers', POSIX uses an array of structures, instead of a * structure of arrays. */ === modified file 'compat/cmsg.h' --- compat/cmsg.h 2012-08-09 00:12:47 +0000 +++ compat/cmsg.h 2012-08-28 13:00:30 +0000 @@ -67,7 +67,6 @@ int msg_flags; /* Flags on received message. */ }; - struct iovec { void *iov_base; size_t iov_len; @@ -79,7 +78,6 @@ # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ + strlen ((ptr)->sun_path)) - #endif /* CMSG_SPACE */ #ifndef SCM_RIGHTS === modified file 'compat/compat.h' --- compat/compat.h 2012-01-22 11:12:00 +0000 +++ compat/compat.h 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ * squid.h at the top line of your .cc file. */ - /******************************************************/ /* Define the _SQUID_TYPE_ based on a guess of the OS */ /* NP: this MUST come first within compat.h */ @@ -35,15 +34,12 @@ #endif #endif - - /*****************************************************/ /* FDSETSIZE is messy and needs to be done before */ /* sys/types.h are defined. */ /*****************************************************/ #include "compat/fdsetsize.h" - /*****************************************************/ /* Global type re-definitions */ /* this also takes care of the basic system includes */ @@ -76,7 +72,6 @@ #include "compat/os/sunos.h" #include "compat/os/windows.h" - /*****************************************************/ /* portabilities shared between all platforms and */ /* components as found to be needed */ @@ -89,7 +84,6 @@ /* cstdio has a bunch of problems with 64-bit definitions */ #include "compat/stdio.h" - /*****************************************************/ /* component-specific portabilities */ /*****************************************************/ === modified file 'compat/compat_shared.h' --- compat/compat_shared.h 2012-08-11 07:01:15 +0000 +++ compat/compat_shared.h 2012-08-28 13:00:30 +0000 @@ -86,8 +86,6 @@ # error Unknown select loop model! #endif - - #if !HAVE_STRUCT_RUSAGE /** * If we don't have getrusage() then we create a fake structure @@ -103,7 +101,6 @@ }; #endif /* !HAVE_STRUCT_RUSAGE */ - #ifndef min #ifdef __cplusplus /** @@ -151,7 +148,6 @@ */ #define w_space " \t\n\r" - #ifndef SQUID_NONBLOCK /* REQUIRED for the below logics. If they move this needs to as well */ #if HAVE_FCNTL_H @@ -192,7 +188,6 @@ #define SA_RESETHAND SA_ONESHOT #endif - /** * com_err.h is a C header and needs explicit shielding, but not * all other system headers including this care to do so. === modified file 'compat/cppunit.h' --- compat/cppunit.h 2011-10-24 01:15:17 +0000 +++ compat/cppunit.h 2012-08-28 13:00:30 +0000 @@ -28,7 +28,6 @@ private: /* dummy typedef so that the macro can still end with ';'*/ \ typedef int CppUnitDummyTypedefForSemiColonEnding__ - #endif /* HAVE_UNIQUE_PTR */ #endif /* HAVE_CPPUNIT_EXTENSIONS_HELPERMACROS_H */ #endif /* SQUID_COMPAT_CPPUNIT_H */ === modified file 'compat/debug.h' --- compat/debug.h 2011-04-06 13:58:14 +0000 +++ compat/debug.h 2012-08-28 13:00:30 +0000 @@ -17,7 +17,6 @@ /* the macro overload style is really a gcc-ism */ #ifdef __GNUC__ - #define debug(X...) \ if (debug_enabled) { \ fprintf(stderr, "%s(%d): pid=%ld :", __FILE__, __LINE__, (long)getpid() ); \ @@ -30,5 +29,4 @@ void debug(const char *format,...); #endif - #endif /* COMPAT_DEBUG_H */ === modified file 'compat/fdsetsize.h' --- compat/fdsetsize.h 2012-01-21 17:11:05 +0000 +++ compat/fdsetsize.h 2012-08-28 13:00:30 +0000 @@ -77,7 +77,6 @@ #define FD_SETSIZE SQUID_MAXFD #endif - /* * Trap unintentional use of fd_set. Must not be used outside the * select code as it only supports FD_SETSIZE number of filedescriptors === modified file 'compat/getnameinfo.h' --- compat/getnameinfo.h 2010-11-21 04:40:05 +0000 +++ compat/getnameinfo.h 2012-08-28 13:00:30 +0000 @@ -16,6 +16,5 @@ int flags ); #define getnameinfo xgetnameinfo - #endif /* HAVE_GETNAMEINFO */ #endif /* _getnameinfo_h */ === modified file 'compat/os/aix.h' --- compat/os/aix.h 2011-07-23 08:37:52 +0000 +++ compat/os/aix.h 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ *--------------------------------------------------------------------------* ****************************************************************************/ - /* * Syslog facility on AIX requires some portability wrappers */ @@ -18,6 +17,5 @@ #define _XOPEN_SOURCE_EXTENDED 1 #endif - #endif /* _SQUID_AIX_ */ #endif /* SQUID_OS_AIX_H */ === modified file 'compat/os/freebsd.h' --- compat/os/freebsd.h 2011-07-23 08:37:52 +0000 +++ compat/os/freebsd.h 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ *--------------------------------------------------------------------------* ****************************************************************************/ - #if USE_ASYNC_IO && defined(LINUXTHREADS) #define _SQUID_LINUX_THREADS_ #endif @@ -32,6 +31,5 @@ //#define s6_addr16 __u6_addr.__u6_addr16 #define s6_addr32 __u6_addr.__u6_addr32 - #endif /* _SQUID_FREEBSD_ */ #endif /* SQUID_OS_FREEBSD_H */ === modified file 'compat/os/hpux.h' --- compat/os/hpux.h 2011-07-23 08:37:52 +0000 +++ compat/os/hpux.h 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ *--------------------------------------------------------------------------* ****************************************************************************/ - #if !defined(HAVE_GETPAGESIZE) #define HAVE_GETPAGESIZE #define getpagesize( ) sysconf(_SC_PAGE_SIZE) === modified file 'compat/os/linux.h' --- compat/os/linux.h 2011-07-23 08:37:52 +0000 +++ compat/os/linux.h 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ *--------------------------------------------------------------------------* ****************************************************************************/ - #if USE_ASYNC_IO #define _SQUID_LINUX_THREADS_ #endif @@ -22,7 +21,6 @@ #define HAVE_RES_INIT HAVE___RES_INIT #endif - /* * sys/capability.h is only needed in Linux apparently. * === modified file 'compat/os/next.h' --- compat/os/next.h 2012-08-09 10:32:57 +0000 +++ compat/os/next.h 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ *--------------------------------------------------------------------------* ****************************************************************************/ - /* * Don't allow inclusion of malloc.h */ === modified file 'compat/os/opensolaris_10_netdb.h' --- compat/os/opensolaris_10_netdb.h 2010-10-19 00:12:13 +0000 +++ compat/os/opensolaris_10_netdb.h 2012-08-28 13:00:30 +0000 @@ -104,7 +104,6 @@ #define h_addr h_addr_list[0] /* address, for backward compatiblity */ }; - /* * addrinfo introduced with IPv6 for Protocol-Independent Hostname * and Service Name Translation. @@ -125,7 +124,6 @@ struct addrinfo *ai_next; /* next structure in linked list */ }; - /* addrinfo flags */ #define AI_PASSIVE 0x0008 /* intended for bind() + listen() */ #define AI_CANONNAME 0x0010 /* return canonical version of host */ @@ -137,7 +135,6 @@ #define AI_ALL 0x0002 /* IPv6 and IPv4 mapped addresses */ #define AI_ADDRCONFIG 0x0004 /* AAAA or A records only if IPv6/IPv4 cnfg'd */ - /* * These were defined in RFC 2553 but not SUSv3 * or RFC 3493 which obsoleted 2553. @@ -185,7 +182,6 @@ */ #define SCOPE_DELIMITER '%' - /* * Algorithm entry for /etc/inet/ipsecalgs which defines IPsec protocols * and algorithms. === modified file 'compat/os/os2.h' --- compat/os/os2.h 2011-07-23 08:37:52 +0000 +++ compat/os/os2.h 2012-08-28 13:00:30 +0000 @@ -15,6 +15,5 @@ * need to be overridden. */ - #endif /* _SQUID_OS2_ */ #endif /* SQUID_OS_OS2_H */ === modified file 'compat/os/qnx.h' --- compat/os/qnx.h 2011-07-23 08:37:52 +0000 +++ compat/os/qnx.h 2012-08-28 13:00:30 +0000 @@ -14,6 +14,5 @@ */ #include - #endif /* _SQUID_QNX_ */ #endif /* SQUID_OS_QNX_H */ === modified file 'compat/os/solaris.h' --- compat/os/solaris.h 2012-03-16 00:40:32 +0000 +++ compat/os/solaris.h 2012-08-28 13:00:30 +0000 @@ -1,7 +1,6 @@ #ifndef SQUID_OS_SOLARIS_H #define SQUID_OS_SOLARIS_H - #if _SQUID_SOLARIS_ /* === modified file 'compat/os/sunos.h' --- compat/os/sunos.h 2011-07-23 08:37:52 +0000 +++ compat/os/sunos.h 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ *--------------------------------------------------------------------------* ****************************************************************************/ - /* O_NONBLOCK requires to be included first */ #if HAVE_FCNTL_H #include @@ -20,7 +19,5 @@ */ #define SQUID_NONBLOCK O_NDELAY - - #endif /* _SQUID_SUNOS_ */ #endif /* SQUID_OS_SUNOS_H */ === modified file 'compat/osdetect.h' --- compat/osdetect.h 2011-01-28 08:16:17 +0000 +++ compat/osdetect.h 2012-08-28 13:00:30 +0000 @@ -1,7 +1,6 @@ #ifndef SQUID_COMPAT_OSDETECT_H #define SQUID_COMPAT_OSDETECT_H - /**************************************************************************** *--------------------------------------------------------------------------* * DO *NOT* MAKE ANY CHANGES below here unless you know what you're doing...* @@ -94,6 +93,4 @@ #endif /* OS automatic detection */ - - #endif /* SQUID_COMPAT_OSDETECT_H */ === modified file 'compat/shm.cc' --- compat/shm.cc 2012-01-20 18:55:04 +0000 +++ compat/shm.cc 2012-08-28 13:00:30 +0000 @@ -5,7 +5,6 @@ #include #endif - /* * Some systems have filesystem-based resources and interpret segment names * as file paths. The so-called 'portable' "/name" format does not work well === modified file 'compat/shm.h' --- compat/shm.h 2011-10-26 16:33:46 +0000 +++ compat/shm.h 2012-08-28 13:00:30 +0000 @@ -42,7 +42,6 @@ #endif /* HAVE_SHM */ - /// Determines whether segment names are iterpreted as full file paths. bool shm_portable_segment_name_is_path(); === modified file 'compat/strtoll.c' --- compat/strtoll.c 2012-01-20 18:55:04 +0000 +++ compat/strtoll.c 2012-08-28 13:00:30 +0000 @@ -43,7 +43,6 @@ #include #endif - #ifndef INT64_MIN /* Native 64 bit system without strtoll() */ #if defined(LONG_MIN) && (SIZEOF_LONG == 8) @@ -64,7 +63,6 @@ #endif #endif - /* * Convert a string to a int64 integer. * === modified file 'compat/tempnam.c' --- compat/tempnam.c 2012-01-20 18:55:04 +0000 +++ compat/tempnam.c 2012-08-28 13:00:30 +0000 @@ -46,7 +46,6 @@ #endif #endif - static char * _tmpnam(void) { === modified file 'compat/types.h' --- compat/types.h 2012-05-28 02:40:52 +0000 +++ compat/types.h 2012-08-28 13:00:30 +0000 @@ -81,12 +81,10 @@ #include #endif - /******************************************************/ /* Typedefs for missing entries on a system */ /******************************************************/ - /* * ISO C99 Standard printf() macros for 64 bit integers * On some 64 bit platform, HP Tru64 is one, for printf must be used === modified file 'compat/xstring.h' --- compat/xstring.h 2011-10-30 02:42:27 +0000 +++ compat/xstring.h 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ #endif #define strndup(X) xstrndup((X)) - #ifdef __cplusplus } #endif === modified file 'helpers/basic_auth/MSNT/byteorder.h' --- helpers/basic_auth/MSNT/byteorder.h 2008-10-10 08:02:53 +0000 +++ helpers/basic_auth/MSNT/byteorder.h 2012-08-28 13:00:30 +0000 @@ -74,7 +74,6 @@ #define SIVALS(buf,pos,val) IVALS(buf,pos)=((int32)(val)) #endif - /* now the reverse routines - these are used in nmb packets (mostly) */ #define SREV(x) ((((x)&0xFF)<<8) | (((x)>>8)&0xFF)) #define IREV(x) ((SREV(x)<<16) | (SREV((x)>>16))) === modified file 'helpers/basic_auth/MSNT/denyusers.cc' --- helpers/basic_auth/MSNT/denyusers.cc 2012-01-20 18:55:04 +0000 +++ helpers/basic_auth/MSNT/denyusers.cc 2012-08-28 13:00:30 +0000 @@ -44,7 +44,6 @@ Check_forfilechange(&DenyUsers); } - /* * Check to see if the username provided by Squid appears in the denied * user list. Returns 0 if the user was not found, and 1 if they were. === modified file 'helpers/basic_auth/MSNT/usersfile.h' --- helpers/basic_auth/MSNT/usersfile.h 2002-06-20 04:54:14 +0000 +++ helpers/basic_auth/MSNT/usersfile.h 2012-08-28 13:00:30 +0000 @@ -1,5 +1,4 @@ - typedef struct { char *path; char **names; @@ -8,8 +7,6 @@ time_t LMT; } usersfile; - - int Read_usersfile(const char *path, usersfile * uf); int Check_userlist(usersfile * uf, char *User); void Check_forfilechange(usersfile * uf); === modified file 'helpers/basic_auth/RADIUS/basic_radius_auth.cc' --- helpers/basic_auth/RADIUS/basic_radius_auth.cc 2012-07-23 15:15:27 +0000 +++ helpers/basic_auth/RADIUS/basic_radius_auth.cc 2012-08-28 13:00:30 +0000 @@ -202,7 +202,6 @@ return 0; } - /* * Generate a random vector. */ === modified file 'helpers/basic_auth/RADIUS/radius.h' --- helpers/basic_auth/RADIUS/radius.h 2011-08-26 16:50:49 +0000 +++ helpers/basic_auth/RADIUS/radius.h 2012-08-28 13:00:30 +0000 @@ -33,7 +33,6 @@ #define AUTH_PASS_LEN 16 #define AUTH_STRING_LEN 128 /* maximum of 254 */ - typedef struct pw_auth_hdr { u_char code; u_char id; @@ -55,7 +54,6 @@ #define PW_TYPE_IPADDR 2 #define PW_TYPE_DATE 3 - #define PW_AUTHENTICATION_REQUEST 1 #define PW_AUTHENTICATION_ACK 2 #define PW_AUTHENTICATION_REJECT 3 === modified file 'helpers/basic_auth/SMB/basic_smb_auth.cc' --- helpers/basic_auth/SMB/basic_smb_auth.cc 2012-07-23 15:15:27 +0000 +++ helpers/basic_auth/SMB/basic_smb_auth.cc 2012-08-28 13:00:30 +0000 @@ -52,7 +52,6 @@ #include #endif - #define NMB_UNICAST 1 #define NMB_BROADCAST 2 === modified file 'helpers/digest_auth/LDAP/digest_pw_auth.cc' --- helpers/digest_auth/LDAP/digest_pw_auth.cc 2012-01-20 18:55:04 +0000 +++ helpers/digest_auth/LDAP/digest_pw_auth.cc 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ #define PROGRAM_NAME "digest_ldap_auth" - static void GetHHA1(RequestData * requestData) { === modified file 'helpers/digest_auth/LDAP/ldap_backend.cc' --- helpers/digest_auth/LDAP/ldap_backend.cc 2012-07-23 15:15:27 +0000 +++ helpers/digest_auth/LDAP/ldap_backend.cc 2012-08-28 13:00:30 +0000 @@ -295,8 +295,6 @@ return NULL; } - - static void ldapconnect(void) { === modified file 'helpers/digest_auth/eDirectory/edir_ldapext.cc' --- helpers/digest_auth/eDirectory/edir_ldapext.cc 2012-07-02 12:14:07 +0000 +++ helpers/digest_auth/eDirectory/edir_ldapext.cc 2012-08-28 13:00:30 +0000 @@ -85,7 +85,6 @@ const char * utf8Pwd2Ptr = NULL; int utf8Pwd2Size = 0; - /* Convert objectDN and tag strings from Unicode to UTF-8 */ utf8ObjSize = strlen(objectDN)+1; utf8ObjPtr = objectDN; @@ -393,7 +392,6 @@ return err; } - /********************************************************************** Attempts to get the Universal Password **********************************************************************/ === modified file 'helpers/digest_auth/eDirectory/ldap_backend.cc' --- helpers/digest_auth/eDirectory/ldap_backend.cc 2012-07-23 15:15:27 +0000 +++ helpers/digest_auth/eDirectory/ldap_backend.cc 2012-08-28 13:00:30 +0000 @@ -323,8 +323,6 @@ return NULL; } - - static void ldapconnect(void) { === modified file 'helpers/external_acl/AD_group/ext_ad_group_acl.cc' --- helpers/external_acl/AD_group/ext_ad_group_acl.cc 2012-07-02 15:31:03 +0000 +++ helpers/external_acl/AD_group/ext_ad_group_acl.cc 2012-08-28 13:00:30 +0000 @@ -112,7 +112,6 @@ wchar_t *My_NameTranslate(wchar_t *, int, int); char *Get_WIN32_ErrorMessage(HRESULT); - void CloseCOM(void) { @@ -120,7 +119,6 @@ CoUninitialize(); } - HRESULT GetLPBYTEtoOctetString(VARIANT * pVar, LPBYTE * ppByte) { @@ -151,7 +149,6 @@ return hr; } - wchar_t * Get_primaryGroup(IADs * pUser) { @@ -210,7 +207,6 @@ return result; } - char * Get_WIN32_ErrorMessage(HRESULT hr) { @@ -225,7 +221,6 @@ return WIN32_ErrorMessage; } - wchar_t * My_NameTranslate(wchar_t * name, int in_format, int out_format) { @@ -281,7 +276,6 @@ return wc; } - wchar_t * GetLDAPPath(wchar_t * Base_DN, int query_mode) { @@ -298,7 +292,6 @@ return wc; } - char * GetDomainName(void) { @@ -349,7 +342,6 @@ return DomainName; } - int add_User_Group(wchar_t * Group) { @@ -375,7 +367,6 @@ return 1; } - /* returns 0 on match, -1 if no match */ static int wccmparray(const wchar_t * str, const wchar_t ** array) @@ -389,7 +380,6 @@ return -1; } - /* returns 0 on match, -1 if no match */ static int wcstrcmparray(const wchar_t * str, const char **array) @@ -407,7 +397,6 @@ return -1; } - HRESULT Recursive_Memberof(IADs * pObj) { @@ -487,7 +476,6 @@ return hr; } - static wchar_t ** build_groups_DN_array(const char **array, char *userdomain) { @@ -530,7 +518,6 @@ return wc_array; } - /* returns 1 on success, 0 on failure */ int Valid_Local_Groups(char *UserName, const char **Groups) @@ -609,7 +596,6 @@ return result; } - /* returns 1 on success, 0 on failure */ int Valid_Global_Groups(char *UserName, const char **Groups) @@ -780,7 +766,6 @@ return; } - int main(int argc, char *argv[]) { @@ -824,7 +809,6 @@ atexit(CloseCOM); - /* Main Loop */ while (fgets(buf, HELPER_INPUT_BUFFER, stdin)) { if (NULL == strchr(buf, '\n')) { === modified file 'helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc' --- helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc 2012-07-23 15:15:27 +0000 +++ helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc 2012-08-28 13:00:30 +0000 @@ -813,7 +813,6 @@ } } - int readSecret(const char *filename) { === modified file 'helpers/external_acl/LM_group/ext_lm_group_acl.cc' --- helpers/external_acl/LM_group/ext_lm_group_acl.cc 2012-07-10 15:44:23 +0000 +++ helpers/external_acl/LM_group/ext_lm_group_acl.cc 2012-08-28 13:00:30 +0000 @@ -71,7 +71,6 @@ #include "helpers/defines.h" #include "include/util.h" - #if _SQUID_CYGWIN_ #include int _wcsicmp(const wchar_t *, const wchar_t *); @@ -95,7 +94,6 @@ #include #include - int use_global = 0; int use_PDC_only = 0; char *program_name; @@ -105,7 +103,6 @@ char *DefaultDomain = NULL; const char NTV_VALID_DOMAIN_SEPARATOR[] = "\\/"; - char * AllocStrFromLSAStr(LSA_UNICODE_STRING LsaStr) { @@ -128,7 +125,6 @@ return target; } - char * GetDomainName(void) { @@ -309,7 +305,6 @@ return result; } - /* returns 1 on success, 0 on failure */ int Valid_Global_Groups(char *UserName, const char **Groups) @@ -364,7 +359,6 @@ MultiByteToWideChar(CP_ACP, 0, machinedomain, strlen(machinedomain) + 1, wszLocalDomain, sizeof(wszLocalDomain) / sizeof(wszLocalDomain[0])); - /* Call the NetServerGetInfo function for local computer, specifying level 101. */ dwLevel = 101; nStatus = NetServerGetInfo(NULL, dwLevel, (LPBYTE *) & pSrvBuf); @@ -510,7 +504,6 @@ return; } - int main(int argc, char *argv[]) { === modified file 'helpers/external_acl/file_userip/ext_file_userip_acl.cc' --- helpers/external_acl/file_userip/ext_file_userip_acl.cc 2012-07-02 12:14:07 +0000 +++ helpers/external_acl/file_userip/ext_file_userip_acl.cc 2012-08-28 13:00:30 +0000 @@ -45,7 +45,6 @@ #include #endif - struct ip_user_dict { unsigned long address; // IP address (assumes IPv4) unsigned long netmask; // IP netmask === modified file 'helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc' --- helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc 2012-07-02 12:14:07 +0000 +++ helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc 2012-08-28 13:00:30 +0000 @@ -427,7 +427,6 @@ } } - } void === modified file 'helpers/external_acl/kerberos_ldap_group/support.h' --- helpers/external_acl/kerberos_ldap_group/support.h 2011-07-12 05:54:58 +0000 +++ helpers/external_acl/kerberos_ldap_group/support.h 2012-08-28 13:00:30 +0000 @@ -108,7 +108,6 @@ /* the macro overload style is really a gcc-ism */ #ifdef __GNUC__ - #define log(X...) \ if (log_enabled) { \ fprintf(stderr, "%s(%d): pid=%ld :", __FILE__, __LINE__, (long)getpid() ); \ @@ -131,7 +130,6 @@ void warn(char *format,...); #endif - struct hstruct { char *host; int port; @@ -144,7 +142,6 @@ char *pw; }; - void init_args(struct main_args *margs); void clean_args(struct main_args *margs); const char *LogTime(void); === modified file 'helpers/external_acl/kerberos_ldap_group/support_group.cc' --- helpers/external_acl/kerberos_ldap_group/support_group.cc 2012-07-10 15:44:23 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_group.cc 2012-08-28 13:00:30 +0000 @@ -152,7 +152,6 @@ return NULL; } - if (n == a - 1) { debug((char *) "%s| %s: WARNING: Invalid Hex UTF-8 string %s\n", LogTime(), PROGRAM, up); if (ul) @@ -296,7 +295,6 @@ return ul; } - int create_gd(struct main_args *margs) { === modified file 'helpers/external_acl/kerberos_ldap_group/support_ldap.cc' --- helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2012-07-23 15:15:27 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2012-08-28 13:00:30 +0000 @@ -826,7 +826,6 @@ char *p; char *ldap_filter_esc = NULL; - searchtime.tv_sec = SEARCH_TIMEOUT; searchtime.tv_usec = 0; /* === modified file 'helpers/external_acl/kerberos_ldap_group/support_member.cc' --- helpers/external_acl/kerberos_ldap_group/support_member.cc 2012-07-02 12:14:07 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_member.cc 2012-08-28 13:00:30 +0000 @@ -48,7 +48,6 @@ struct gdstruct *gr; int found = 0; - /* Check users domain */ gr = margs->groups; === modified file 'helpers/external_acl/kerberos_ldap_group/support_resolv.cc' --- helpers/external_acl/kerberos_ldap_group/support_resolv.cc 2012-07-10 15:44:23 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_resolv.cc 2012-08-28 13:00:30 +0000 @@ -158,7 +158,6 @@ hp[i].host = NULL; } - if (hp) xfree(hp); hp = NULL; === modified file 'helpers/external_acl/kerberos_ldap_group/support_sasl.cc' --- helpers/external_acl/kerberos_ldap_group/support_sasl.cc 2012-07-02 12:14:07 +0000 +++ helpers/external_acl/kerberos_ldap_group/support_sasl.cc 2012-08-28 13:00:30 +0000 @@ -72,12 +72,10 @@ void lutil_sasl_freedefs( void *defaults); - /* * SASL definitions for openldap support */ - typedef struct lutil_sasl_defaults_s { char *mech; char *realm; === modified file 'helpers/external_acl/time_quota/ext_time_quota_acl.cc' --- helpers/external_acl/time_quota/ext_time_quota_acl.cc 2012-01-20 18:55:04 +0000 +++ helpers/external_acl/time_quota/ext_time_quota_acl.cc 2012-08-28 13:00:30 +0000 @@ -242,7 +242,6 @@ *secs = (long)(periodLength * value); } - /** This function parses the time quota file and stores it * in memory. */ === modified file 'helpers/external_acl/unix_group/check_group.cc' --- helpers/external_acl/unix_group/check_group.cc 2012-07-23 15:15:27 +0000 +++ helpers/external_acl/unix_group/check_group.cc 2012-08-28 13:00:30 +0000 @@ -143,7 +143,6 @@ "-s Strip NT domain from usernames\n"); } - int main(int argc, char *argv[]) { === modified file 'helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc' --- helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc 2012-07-02 12:14:07 +0000 +++ helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc 2012-08-28 13:00:30 +0000 @@ -206,8 +206,6 @@ return (0); } - - int main(int argc, char *const argv[]) { @@ -422,7 +420,6 @@ GSS_C_NO_CHANNEL_BINDINGS, &client_name, NULL, &output_token, &ret_flags, NULL, NULL); - if (output_token.length) { spnegoToken = (const unsigned char *) output_token.value; spnegoTokenLength = output_token.length; === modified file 'helpers/negotiate_auth/wrapper/negotiate_wrapper.cc' --- helpers/negotiate_auth/wrapper/negotiate_wrapper.cc 2012-07-02 12:14:07 +0000 +++ helpers/negotiate_auth/wrapper/negotiate_wrapper.cc 2012-08-28 13:00:30 +0000 @@ -197,7 +197,6 @@ return 1; } - if (( fpid = vfork()) < 0 ) { fprintf(stderr, "%s| %s: Failed first fork\n", LogTime(), PROGRAM); return 1; @@ -278,7 +277,6 @@ setbuf(FDNIN, NULL); setbuf(FDNOUT, NULL); - while (1) { if (fgets(buf, sizeof(buf) - 1, stdin) == NULL) { if (ferror(stdin)) { === modified file 'helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc' --- helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc 2012-07-02 12:14:07 +0000 +++ helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc 2012-08-28 13:00:30 +0000 @@ -163,7 +163,6 @@ return result; } - char * AllocStrFromLSAStr(LSA_UNICODE_STRING LsaStr) { size_t len; @@ -185,7 +184,6 @@ return target; } - char * GetDomainName(void) { @@ -368,7 +366,6 @@ my_program_name); } - void process_options(int argc, char *argv[]) { === modified file 'helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc' --- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc 2012-08-14 12:04:16 +0000 +++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc 2012-08-28 13:00:30 +0000 @@ -56,7 +56,6 @@ #include #endif - /************* CONFIGURATION ***************/ #define DEAD_DC_RETRY_INTERVAL 30 @@ -94,7 +93,6 @@ const char * obtain_challenge(void); void manage_request(void); - #define ENCODED_PASS_LEN 24 #define MAX_USERNAME_LEN 255 #define MAX_DOMAIN_LEN 255 @@ -117,7 +115,6 @@ dc *current_dc; char smb_error_buffer[1000]; - /* Disconnects from the DC. A reconnection will be done upon the next request */ void @@ -159,7 +156,6 @@ smberr = SMB_Get_Last_Error(); SMB_Get_Error_Msg(smberr, errstr, 1000); - if (handle == NULL) { /* couldn't connect */ debug("Couldn't connect to SMB Server. Error:%s\n", errstr); return 1; @@ -257,7 +253,6 @@ memcpy(user, tmp.str, tmp.l); *(user + tmp.l) = '\0'; - /* Authenticating against the NT response doesn't seem to work... */ tmp = ntlm_fetch_string(&(auth->hdr), auth_length, &auth->lmresponse, auth->flags); if (tmp.str == NULL || tmp.l == 0) { @@ -298,7 +293,6 @@ /* TODO: check against empty password!!!!! */ - debug("checking domain: '%s', user: '%s', pass='%s'\n", domain, user, pass); rv = SMB_Logon_Server(handle, user, pass, domain, 1); @@ -468,7 +462,6 @@ return NULL; } - void manage_request() { @@ -631,7 +624,6 @@ return; /********* END ********/ - } int === modified file 'include/CbDataList.h' --- include/CbDataList.h 2012-06-20 21:26:13 +0000 +++ include/CbDataList.h 2012-08-28 13:00:30 +0000 @@ -154,7 +154,6 @@ return last; } - template bool CbDataList::find (C const &toFind) const === modified file 'include/MemPool.h' --- include/MemPool.h 2011-08-26 16:50:49 +0000 +++ include/MemPool.h 2012-08-28 13:00:30 +0000 @@ -99,7 +99,6 @@ MemMeter inuse; MemMeter idle; - /** history Allocations */ mgb_t gb_allocated; mgb_t gb_oallocated; @@ -439,5 +438,4 @@ { } - #endif /* _MEM_POOL_H_ */ === modified file 'include/MemPoolMalloc.h' --- include/MemPoolMalloc.h 2010-05-29 00:59:35 +0000 +++ include/MemPoolMalloc.h 2012-08-28 13:00:30 +0000 @@ -45,5 +45,4 @@ Stack freelist; }; - #endif /* _MEM_POOL_MALLOC_H_ */ === modified file 'include/SquidNew.h' --- include/SquidNew.h 2010-11-21 04:40:05 +0000 +++ include/SquidNew.h 2012-08-28 13:00:30 +0000 @@ -59,7 +59,6 @@ xfree(address); } - #endif /* __SUNPRO_CC */ #endif /* SQUID_NEW_H */ === modified file 'include/base64.h' --- include/base64.h 2011-05-02 01:14:30 +0000 +++ include/base64.h 2012-08-28 13:00:30 +0000 @@ -19,7 +19,6 @@ /// \return number of bytes filled in result. extern int base64_decode(char *result, unsigned int result_max_size, const char *encoded); - // Encoding functions /// Calculate the buffer size required to hold the encoded form of @@ -46,7 +45,6 @@ // Ensures a nul-terminated result. Will always return non-NULL. extern const char *old_base64_encode(const char *decoded); - #ifdef __cplusplus } #endif === modified file 'include/cache_snmp.h' --- include/cache_snmp.h 2010-07-07 13:05:17 +0000 +++ include/cache_snmp.h 2012-08-28 13:00:30 +0000 @@ -85,7 +85,6 @@ #define LEN_CONF LEN_SQ_CONF + 1 #define LEN_CONF_INST LEN_SQ_CONF + 2 - /** * cacheStorageConfig group { cacheConfig 5 } */ @@ -112,7 +111,6 @@ PERF_END }; - /* cacheSysPerf */ enum { PERF_SYS_START = 0, === modified file 'include/heap.h' --- include/heap.h 2010-11-21 04:40:05 +0000 +++ include/heap.h 2012-08-28 13:00:30 +0000 @@ -54,7 +54,6 @@ typedef double heap_key; typedef heap_key heap_key_func(heap_t, heap_key); - /* * Heap node. Has a key value generated by a key_func, id (array index) so * it can be quickly found in its heap, and a pointer to a data object that @@ -66,7 +65,6 @@ heap_t data; } heap_node; - /* * Heap object. Holds an array of heap_node objects along with a heap size * (array length), the index of the last heap element, and a key generation @@ -128,7 +126,6 @@ #define heap_gen_key(hp,md) ((hp)->gen_key((md),(hp)->age)) #endif /* MACRO_DEBUG */ - /* * Extract the minimum (root) element and maintain the heap property. * Returns the data pointed to by the root node, which the caller must === modified file 'include/radix.h' --- include/radix.h 2010-12-14 14:01:14 +0000 +++ include/radix.h 2012-08-28 13:00:30 +0000 @@ -138,7 +138,6 @@ struct squid_radix_node rnh_nodes[3]; /* empty tree for common case */ }; - SQUIDCEXTERN void squid_rn_init (void); SQUIDCEXTERN int squid_rn_inithead(struct squid_radix_node_head **, int); === modified file 'include/rfc1035.h' --- include/rfc1035.h 2010-11-21 04:40:05 +0000 +++ include/rfc1035.h 2012-08-28 13:00:30 +0000 @@ -118,7 +118,6 @@ #define RFC1035_TYPE_PTR 12 #define RFC1035_CLASS_IN 1 - /* Child Library RFC3596 Depends on some otherwise internal functions */ SQUIDCEXTERN int rfc1035HeaderPack(char *buf, size_t sz, === modified file 'include/rfc1738.h' --- include/rfc1738.h 2011-03-05 00:32:41 +0000 +++ include/rfc1738.h 2012-08-28 13:00:30 +0000 @@ -50,7 +50,6 @@ * Suitable for safely encoding an absolute URL which may be encoded but is not trusted. */ #define rfc1738_escape_unescaped(x) rfc1738_do_escape(x, RFC1738_ESCAPE_UNSAFE|RFC1738_ESCAPE_CTRLS|RFC1738_ESCAPE_NOPERCENT) - /** * Unescape a URL string according to RFC 1738 specification. * String is unescaped in-place === modified file 'include/rfc2617.h' --- include/rfc2617.h 2010-11-21 04:40:05 +0000 +++ include/rfc2617.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ * to prevent squid knowing the users password (idea suggested in RFC 2617). */ - /* * $Id$ * === modified file 'include/rfc2671.h' --- include/rfc2671.h 2010-11-21 04:40:05 +0000 +++ include/rfc2671.h 2012-08-28 13:00:30 +0000 @@ -43,5 +43,4 @@ SQUIDCEXTERN int rfc2671RROptPack(char *buf, size_t sz, ssize_t edns_sz); - #endif /* SQUID_RFC3596_H */ === modified file 'include/snmp_api.h' --- include/snmp_api.h 2010-11-21 04:40:05 +0000 +++ include/snmp_api.h 2012-08-28 13:00:30 +0000 @@ -27,8 +27,6 @@ * snmp_api.h - API for access to snmp. */ - - /* * Set fields in session and pdu to the following to get a default or unconfigured value. */ @@ -80,7 +78,6 @@ */ int snmp_close(struct snmp_session *); - /* * int snmp_send(session, pdu) * struct snmp_session *session; @@ -108,7 +105,6 @@ */ void snmp_read(fd_set *); - /* * int snmp_select_info(numfds, fdset, timeout, block) * int *numfds; @@ -150,7 +146,6 @@ */ void snmp_timeout(void); - /* * This routine must be supplied by the application: * @@ -166,10 +161,6 @@ * Operations are defined below: */ - - - - void snmp_api_stats(void *); #endif #ifdef __cplusplus === modified file 'include/snmp_util.h' --- include/snmp_util.h 2010-11-21 04:40:05 +0000 +++ include/snmp_util.h 2012-08-28 13:00:30 +0000 @@ -11,13 +11,11 @@ /* call a function at regular intervals (in seconds): */ 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); - /* ---------------------------------------------------------------------- */ /* @@ -26,7 +24,6 @@ * Copyright (c) 1997 FT/CNET/DES/GRL Olivier Montanuy */ - /* Function to safely copy a string, and ensure the last * character is always '\0'. */ void strcpy_safe(char *str, int str_len, char *val); === modified file 'include/snmp_vars.h' --- include/snmp_vars.h 2009-08-23 09:30:49 +0000 +++ include/snmp_vars.h 2012-08-28 13:00:30 +0000 @@ -74,7 +74,6 @@ #define SMI_OPAQUE (ASN_APPLICATION | 4) /* OCTET STRING */ #define SMI_COUNTER64 (ASN_APPLICATION | 6) /* INTEGER */ - /* constants for enums for the MIB nodes * cachePeerAddressType (InetAddressType / ASN_INTEGER) * cacheClientAddressType (InetAddressType / ASN_INTEGER) @@ -93,7 +92,6 @@ #endif /* INETADDRESSTYPE_ENUMS */ - /* * RFC 1905: Protocol Operations for SNMPv2 * === modified file 'include/splay.h' --- include/splay.h 2010-12-14 14:01:14 +0000 +++ include/splay.h 2012-08-28 13:00:30 +0000 @@ -79,7 +79,6 @@ size_t elements; }; - SQUIDCEXTERN int splayLastResult; SQUIDCEXTERN splayNode *splay_insert(void *, splayNode *, splayNode::SPLAYCMP *); === modified file 'lib/Array.cc' --- lib/Array.cc 2012-08-15 15:17:32 +0000 +++ lib/Array.cc 2012-08-28 13:00:30 +0000 @@ -39,7 +39,6 @@ * we do not need such an interface yet. */ - #include "squid.h" #include "Array.h" === modified file 'lib/MemPoolMalloc.cc' --- lib/MemPoolMalloc.cc 2012-07-02 12:28:10 +0000 +++ lib/MemPoolMalloc.cc 2012-08-28 13:00:30 +0000 @@ -33,7 +33,6 @@ * */ - #include "squid.h" #if HAVE_ASSERT_H #include === modified file 'lib/base64.c' --- lib/base64.c 2012-01-20 18:55:04 +0000 +++ lib/base64.c 2012-08-28 13:00:30 +0000 @@ -16,7 +16,6 @@ #include #endif - static void base64_init(void); static int base64_initialized = 0; @@ -25,7 +24,6 @@ int base64_value[BASE64_VALUE_SZ]; const char base64_code[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - static void base64_init(void) { === modified file 'lib/dirent.c' --- lib/dirent.c 2012-01-20 18:55:04 +0000 +++ lib/dirent.c 2012-08-28 13:00:30 +0000 @@ -66,7 +66,6 @@ #define SUFFIX ("*") #define SLASH ("\\") - /* * opendir * @@ -149,7 +148,6 @@ return nd; } - /* * readdir * @@ -211,7 +209,6 @@ return (struct dirent *) 0; } - /* * closedir * === modified file 'lib/encrypt.c' --- lib/encrypt.c 2012-01-20 18:55:04 +0000 +++ lib/encrypt.c 2012-08-28 13:00:30 +0000 @@ -30,7 +30,6 @@ static char schluessel[16][KS]; - static char PC1[] = { 56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17, 9, 1, @@ -42,7 +41,6 @@ 27, 19, 11, 3 }; - static char PC2[] = { 13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9, 22, 18, 11, 3, @@ -52,7 +50,6 @@ 33, 52, 45, 41, 49, 35, 28, 31 }; - static char IP[] = { 57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3, @@ -64,7 +61,6 @@ 62, 54, 46, 38, 30, 22, 14, 6 }; - static char EP[] = { 7, 39, 15, 47, 23, 55, 31, 63, 6, 38, 14, 46, 22, 54, 30, 62, @@ -76,7 +72,6 @@ 0, 32, 8, 40, 16, 48, 24, 56 }; - static char E0[] = { 31, 0, 1, 2, 3, 4, 3, 4, 5, 6, 7, 8, 7, 8, 9, 10, @@ -86,10 +81,8 @@ 27, 28, 27, 28, 29, 30, 31, 0 }; - static char E[KS]; - static char PERM[] = { 15, 6, 19, 20, 28, 11, 27, 16, 0, 14, 22, 25, 4, 17, 30, 9, @@ -97,7 +90,6 @@ 18, 12, 29, 5, 21, 10, 3, 24 }; - static char S_BOX[][64] = { { 14, 0, 4, 15, 13, 7, 1, 4, 2, 14, 15, 2, 11, 13, 8, 1, === modified file 'lib/getfullhostname.c' --- lib/getfullhostname.c 2012-01-20 18:55:04 +0000 +++ lib/getfullhostname.c 2012-08-28 13:00:30 +0000 @@ -34,7 +34,6 @@ #include "squid.h" #include "getfullhostname.h" - #if HAVE_UNISTD_H /* for gethostname() function */ #include === modified file 'lib/hash.cc' --- lib/hash.cc 2012-07-26 17:36:58 +0000 +++ lib/hash.cc 2012-08-28 13:00:30 +0000 @@ -355,7 +355,6 @@ return (const char *) hl->key; } - #if USE_HASH_DRIVER /** * hash-driver - Run with a big file as stdin to insert each line into the @@ -408,7 +407,6 @@ } printf("done walking hash table...\n"); - printf("driver finished.\n"); exit(0); } === modified file 'lib/heap.c' --- lib/heap.c 2012-01-20 18:55:04 +0000 +++ lib/heap.c 2012-08-28 13:00:30 +0000 @@ -112,7 +112,6 @@ return hp; } - /* * Free memory used by a heap. Does not free the metadata pointed to by the * heap nodes, only the heap's internal memory. @@ -159,7 +158,6 @@ return elm; } - /* * Delete ELM while maintaining the heap property. ELM may be modified. * Assumes that ELM is not NULL and frees it. Returns the data pointed to @@ -207,7 +205,6 @@ } #endif /* heap_gen_key */ - /* * Returns the data of the node with the largest KEY value and removes that * node from the heap. Returns NULL if the heap was empty. @@ -230,7 +227,6 @@ return data; } - /* * Remove the last node in HP. Frees the heap internal structure and * returns the data pointes to by the last node. @@ -246,7 +242,6 @@ return data; } - /* * The semantics of this routine is the same as the followings: * heap_delete(hp, elm); @@ -270,7 +265,6 @@ return old; } - /* * A pointer to the root node's DATA. */ @@ -281,7 +275,6 @@ return hp->nodes[0]->data; } - /* * The KEY of the root node. */ @@ -292,7 +285,6 @@ return hp->nodes[0]->key; } - /* * Same as heap_peep except that this return the KEY of the node. * Only meant for iteration. @@ -304,7 +296,6 @@ return hp->nodes[n]->key; } - /* * A pointer to Nth node's DATA. The caller can iterate through HP by * calling this routine. eg. Caller can execute the following code: @@ -320,7 +311,6 @@ return data; } - #ifndef heap_nodes /* * Current number of nodes in HP. @@ -332,7 +322,6 @@ } #endif /* heap_nodes */ - #ifndef heap_empty /* * Determine if the heap is empty. Returns 1 if HP has no elements and 0 @@ -381,7 +370,6 @@ } } - /* * Maintain the heap property above ELM. Caller has locked the heap. */ @@ -397,7 +385,6 @@ } } - /* * Swap the position of ELM1 and ELM2 in heap structure. Their IDs are also * swapped. @@ -412,8 +399,6 @@ hp->nodes[elm2->id] = elm2; } - - #ifdef NOTDEF /* * Copy KEY and DATA fields of SRC to DEST. ID field is NOT copied. @@ -427,7 +412,6 @@ #endif /* NOTDEF */ - /* * True if HP needs to be grown in size. */ @@ -439,7 +423,6 @@ return 0; } - /* * Grow HP. */ @@ -463,7 +446,6 @@ hp->size = newSize; } - /* * True if a node with ID exists in HP. */ === modified file 'lib/iso3307.c' --- lib/iso3307.c 2012-01-20 18:55:04 +0000 +++ lib/iso3307.c 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include #endif - #define ASCII_DIGIT(c) ((c)-48) time_t === modified file 'lib/ntlmauth/ntlmauth.cc' --- lib/ntlmauth/ntlmauth.cc 2012-07-23 15:15:27 +0000 +++ lib/ntlmauth/ntlmauth.cc 2012-08-28 13:00:30 +0000 @@ -186,14 +186,12 @@ (*payload_length) += toadd_length; } - /* ************************************************************************* */ /* Negotiate Packet functions */ /* ************************************************************************* */ // ? - /* ************************************************************************* */ /* Challenge Packet functions */ /* ************************************************************************* */ === modified file 'lib/ntlmauth/ntlmauth.h' --- lib/ntlmauth/ntlmauth.h 2012-03-23 07:14:21 +0000 +++ lib/ntlmauth/ntlmauth.h 2012-08-28 13:00:30 +0000 @@ -108,7 +108,6 @@ /** Debug dump the given flags field to stderr */ void ntlm_dump_ntlmssp_flags(const uint32_t flags); - /* ************************************************************************* */ /* Packet and Payload structures and handling functions */ /* ************************************************************************* */ @@ -144,7 +143,6 @@ const char *toadd, const int toadd_length); - /* ************************************************************************* */ /* Negotiate Packet structures and functions */ /* ************************************************************************* */ @@ -173,7 +171,6 @@ char payload[256]; /**< String data */ } ntlm_negotiate; - /* ************************************************************************* */ /* Challenge Packet structures and functions */ /* ************************************************************************* */ @@ -210,7 +207,6 @@ const int challenge_nonce_len, const uint32_t flags); - /* ************************************************************************* */ /* Authenticate Packet structures and functions */ /* ************************************************************************* */ @@ -234,7 +230,6 @@ char *domain, const int32_t size); - #if __cplusplus } #endif === modified file 'lib/profiler/Profiler.cc' --- lib/profiler/Profiler.cc 2012-07-02 12:28:10 +0000 +++ lib/profiler/Profiler.cc 2012-08-28 13:00:30 +0000 @@ -118,7 +118,6 @@ #if USE_XPROF_STATS - #if HAVE_ASSERT_H #include #endif @@ -136,7 +135,6 @@ /* Private stuff */ - /* new stuff */ #define MAXSTACKDEPTH 512 === modified file 'lib/radix.c' --- lib/radix.c 2012-01-20 18:55:04 +0000 +++ lib/radix.c 2012-08-28 13:00:30 +0000 @@ -32,7 +32,6 @@ * */ - /* * Copyright (c) 1988, 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -123,7 +122,6 @@ #define rm_mask rm_rmu.rmu_mask #define rm_leaf rm_rmu.rmu_leaf /* extra field would make 32 bytes */ - /* Helper macros */ #define squid_Bcmp(a, b, l) (l == 0 ? 0 : memcmp((caddr_t)(a), (caddr_t)(b), (u_long)l)) #define squid_R_Malloc(p, t, n) (p = (t) xmalloc((unsigned int)(n))) === modified file 'lib/rfc1035.c' --- lib/rfc1035.c 2012-01-20 18:55:04 +0000 +++ lib/rfc1035.c 2012-08-28 13:00:30 +0000 @@ -78,8 +78,6 @@ #define RFC1035_UNPACK_DEBUG (void)0 #endif - - /* * rfc1035HeaderPack() * === modified file 'lib/rfc1123.c' --- lib/rfc1123.c 2012-01-20 18:55:04 +0000 +++ lib/rfc1123.c 2012-08-28 13:00:30 +0000 @@ -63,7 +63,6 @@ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - static int make_num(const char *s) { === modified file 'lib/rfc2617.c' --- lib/rfc2617.c 2012-01-20 18:55:04 +0000 +++ lib/rfc2617.c 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ * to prevent squid knowing the users password (idea suggested in RFC 2617). */ - /* * $Id$ * @@ -104,7 +103,6 @@ } } - /* calculate H(A1) as per spec */ void DigestCalcHA1( === modified file 'lib/rfc3596.c' --- lib/rfc3596.c 2012-01-20 18:55:04 +0000 +++ lib/rfc3596.c 2012-08-28 13:00:30 +0000 @@ -152,7 +152,6 @@ return rfc3596BuildHostQuery(hostname, buf, sz, qid, query, RFC1035_TYPE_AAAA, edns_sz); } - /** * Builds a message buffer with a QUESTION to lookup PTR records * for an address. Caller must allocate 'buf' which should @@ -196,7 +195,6 @@ return rfc3596BuildHostQuery(rev, buf, sz, qid, query, RFC1035_TYPE_PTR, edns_sz); } - #if DRIVER /* driver needs the rfc1035 code _without_ the main() */ @@ -253,7 +251,6 @@ return 1; } - memset(&S, '\0', sizeof(S)); if (prefer == 6) { === modified file 'lib/rfcnb/byteorder.h' --- lib/rfcnb/byteorder.h 2010-12-14 14:01:14 +0000 +++ lib/rfcnb/byteorder.h 2012-08-28 13:00:30 +0000 @@ -40,7 +40,6 @@ #define PVAL(buf,pos) ((unsigned)CVAL(buf,pos)) #define SCVAL(buf,pos,val) (CVAL(buf,pos) = (val)) - #if CAREFUL_ALIGNMENT #define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)<<8) #define IVAL(buf,pos) (SVAL(buf,pos)|SVAL(buf,(pos)+2)<<16) @@ -69,7 +68,6 @@ #define SIVALS(buf,pos,val) IVALS(buf,pos)=((int32)(val)) #endif - /* now the reverse routines - these are used in nmb packets (mostly) */ #define SREV(x) ((((x)&0xFF)<<8) | (((x)>>8)&0xFF)) #define IREV(x) ((SREV(x)<<16) | (SREV((x)>>16))) === modified file 'lib/rfcnb/rfcnb-io.c' --- lib/rfcnb/rfcnb-io.c 2012-01-20 18:55:04 +0000 +++ lib/rfcnb/rfcnb-io.c 2012-08-28 13:00:30 +0000 @@ -169,7 +169,6 @@ } - /* Send an RFCNB packet to the connection. * * We just send each of the blocks linked together ... @@ -191,7 +190,6 @@ /* Try to send the data ... We only send as many bytes as len claims */ /* We should try to stuff it into an IOVEC and send as one write */ - pkt_ptr = pkt; len_sent = tot_sent = 0; /* Nothing sent so far */ i = 0; @@ -267,7 +265,6 @@ * */ - int RFCNB_Get_Pkt(struct RFCNB_Con *con, struct RFCNB_Pkt *pkt, int len) { === modified file 'lib/rfcnb/rfcnb-priv.h' --- lib/rfcnb/rfcnb-priv.h 2010-12-14 14:01:14 +0000 +++ lib/rfcnb/rfcnb-priv.h 2012-08-28 13:00:30 +0000 @@ -127,7 +127,6 @@ char calling_name[33]; } RFCNB_Sess_Pkt; - typedef struct RFCNB_Nack_Pkt { struct RFCNB_Hdr hdr; unsigned char error; === modified file 'lib/smblib/file.c' --- lib/smblib/file.c 2012-01-20 18:55:04 +0000 +++ lib/smblib/file.c 2012-08-28 13:00:30 +0000 @@ -468,7 +468,6 @@ } - /* Write numbytes from data to the file pointed to by the File_Handle at */ /* the offset in the File_Handle. */ @@ -1195,7 +1194,6 @@ } - /* Now plug in the bits we need */ memset(SMB_Hdr(pkt), 0, SMB_search_len); @@ -1224,8 +1222,6 @@ strcpy(p+1, dir_name); p = p + strlen(dir_name) + 2; /* Skip the null */ - - *p = SMBvariableblockID; p = p + 1; === modified file 'lib/smblib/smb-errors.c' --- lib/smblib/smb-errors.c 2012-01-20 18:55:04 +0000 +++ lib/smblib/smb-errors.c 2012-08-28 13:00:30 +0000 @@ -31,7 +31,6 @@ /* ensure we don't overwrite strings when not passed enough space. Also */ /* added code to say unknown error codes if we see any */ - #include typedef struct { === modified file 'lib/smblib/smbdes.c' --- lib/smblib/smbdes.c 2012-01-20 18:55:04 +0000 +++ lib/smblib/smbdes.c 2012-08-28 13:00:30 +0000 @@ -24,7 +24,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - /* NOTES: * * This code makes no attempt to be fast! In fact, it is a very @@ -99,7 +98,6 @@ 22, 11, 4, 25 }; - static int perm6[64] = {40, 8, 48, 16, 56, 24, 64, 32, 39, 7, 47, 15, 55, 23, 63, 31, 38, 6, 46, 14, 54, 22, 62, 30, @@ -110,7 +108,6 @@ 33, 1, 41, 9, 49, 17, 57, 25 }; - static int sc[16] = {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1}; static int sbox[8][4][16] = { @@ -297,7 +294,6 @@ } } - static void smbhash(unsigned char *out, unsigned char *in, unsigned char *key) { === modified file 'lib/smblib/smblib-api.c' --- lib/smblib/smblib-api.c 2012-01-20 18:55:04 +0000 +++ lib/smblib/smblib-api.c 2012-08-28 13:00:30 +0000 @@ -66,7 +66,6 @@ pad_api_name = TRUE; } - pkt_len = pkt_len + param_len; /* Now allocate space for the packet, build it and send it */ @@ -198,7 +197,6 @@ #define SMB_LMAPI_SUI_DESC "zWsTPWW" #define SMB_LMAPI_SUI_DATA_DESC "B16" - /* Set user info ... specifically, password */ int SMBapi_NetSetUserInfo(SMB_Tree_Handle tree, char *user, @@ -382,5 +380,4 @@ { - } === modified file 'lib/smblib/smblib-priv.h' --- lib/smblib/smblib-priv.h 2010-10-16 23:19:46 +0000 +++ lib/smblib/smblib-priv.h 2012-08-28 13:00:30 +0000 @@ -497,7 +497,6 @@ /* The following two arrays need to be in step! */ /* We must make it possible for callers to specify these ... */ - extern int SMB_Types[]; typedef struct SMB_Status { === modified file 'lib/smblib/smblib-util.c' --- lib/smblib/smblib-util.c 2012-01-20 18:55:04 +0000 +++ lib/smblib/smblib-util.c 2012-08-28 13:00:30 +0000 @@ -74,7 +74,6 @@ /* Print the other bits in the header */ - /* etc */ } @@ -223,7 +222,6 @@ } - /* Negotiate the protocol we will use from the list passed in Prots */ /* we return the index of the accepted protocol in NegProt, -1 indicates */ /* none acceptible, and our return value is 0 if ok, <0 if problems */ @@ -303,7 +301,6 @@ if (RFCNB_Send(Con_Handle -> Trans_Connect, pkt, pkt_len) < 0) { - #ifdef DEBUG fprintf(stderr, "Error sending negotiate protocol\n"); #endif === modified file 'lib/smblib/smblib.c' --- lib/smblib/smblib.c 2012-01-20 18:55:04 +0000 +++ lib/smblib/smblib.c 2012-08-28 13:00:30 +0000 @@ -55,7 +55,6 @@ NULL }; - /* Initialize the SMBlib package */ int SMB_Init() @@ -108,7 +107,6 @@ if ((con = (struct SMB_Connect_Def *)malloc(sizeof(struct SMB_Connect_Def))) == NULL) { - SMBlib_errno = SMBlibE_NoSpace; return NULL; } @@ -187,7 +185,6 @@ NULL }; - SMB_Handle_Type SMB_Connect(SMB_Handle_Type Con_Handle, SMB_Tree_Handle *tree, char *service, @@ -547,7 +544,6 @@ } - /* Disconnect from the server, and disconnect all tree connects */ int SMB_Discon(SMB_Handle_Type Con_Handle, BOOL KeepHandle) === modified file 'lib/sspwin32.c' --- lib/sspwin32.c 2012-01-20 18:55:04 +0000 +++ lib/sspwin32.c 2012-08-28 13:00:30 +0000 @@ -108,7 +108,6 @@ hModule = NULL; } - HMODULE LoadSecurityDll(int mode, char * SSP_Package) { TCHAR lpszDLL[MAX_PATH]; @@ -235,7 +234,6 @@ return hModule; } - BOOL GenClientContext(PAUTH_SEQ pAS, PSEC_WINNT_AUTH_IDENTITY pAuthIdentity, PVOID pIn, DWORD cbIn, PVOID pOut, PDWORD pcbOut, PBOOL pfDone) { @@ -304,7 +302,6 @@ return TRUE; } - BOOL GenServerContext(PAUTH_SEQ pAS, PVOID pIn, DWORD cbIn, PVOID pOut, PDWORD pcbOut, PBOOL pfDone, char * credentials) { @@ -410,7 +407,6 @@ return TRUE; } - BOOL WINAPI SSP_LogonUser(PTSTR szUser, PTSTR szPassword, PTSTR szDomain) { AUTH_SEQ asServer = {0}; @@ -486,7 +482,6 @@ return fResult; } - const char * WINAPI SSP_MakeChallenge(PVOID PNegotiateBuf, int NegotiateLen) { BOOL fDone = FALSE; @@ -527,7 +522,6 @@ return encoded; } - BOOL WINAPI SSP_ValidateNTLMCredentials(PVOID PAutenticateBuf, int AutenticateLen, char * credentials) { BOOL fDone = FALSE; @@ -553,7 +547,6 @@ return fResult; } - const char * WINAPI SSP_MakeNegotiateBlob(PVOID PNegotiateBuf, int NegotiateLen, PBOOL fDone, int * Status, char * credentials) { DWORD cbOut = 0; @@ -587,7 +580,6 @@ return encoded; } - const char * WINAPI SSP_ValidateNegotiateCredentials(PVOID PAutenticateBuf, int AutenticateLen, PBOOL fDone, int * Status, char * credentials) { DWORD cbOut = 0; === modified file 'lib/tests/testArray.h' --- lib/tests/testArray.h 2008-10-10 08:02:53 +0000 +++ lib/tests/testArray.h 2012-08-28 13:00:30 +0000 @@ -22,6 +22,5 @@ void all(); }; - #endif === modified file 'lib/tests/testMain.cc' --- lib/tests/testMain.cc 2012-01-20 18:55:04 +0000 +++ lib/tests/testMain.cc 2012-08-28 13:00:30 +0000 @@ -7,7 +7,6 @@ #include #include - int main( int argc, char* argv[] ) { @@ -34,4 +33,3 @@ return result.wasSuccessful() ? 0 : 1; } - === modified file 'lib/tests/testRFC1035.cc' --- lib/tests/testRFC1035.cc 2012-01-20 18:55:04 +0000 +++ lib/tests/testRFC1035.cc 2012-08-28 13:00:30 +0000 @@ -77,7 +77,6 @@ int res = 0; unsigned int off = 0; - /* Test the HeaderUnpack function results */ msg = new rfc1035_message; res = rfc1035HeaderUnpack(buf, len, &off, msg); === modified file 'lib/tests/testRFC1738.cc' --- lib/tests/testRFC1738.cc 2012-01-20 18:55:04 +0000 +++ lib/tests/testRFC1738.cc 2012-08-28 13:00:30 +0000 @@ -61,7 +61,6 @@ CPPUNIT_ASSERT(memcmp(unescaped_str, "Bad String %1",14)==0); xfree(unescaped_str); - /* A partly corrupt string */ unescaped_str = xstrdup("Bad String %1A%3"); rfc1738_unescape(unescaped_str); @@ -97,7 +96,6 @@ result = rfc1738_do_escape("################ ################ ################ ################ ################ ################ ################ ################", RFC1738_ESCAPE_UNSAFE); CPPUNIT_ASSERT(memcmp(result, "%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%20%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23%23",406)==0); - /* TEST: escaping only reserved characters */ /* regular URL (full encoding requested) */ @@ -108,7 +106,6 @@ result = rfc1738_do_escape("/data/source/path", RFC1738_ESCAPE_RESERVED); CPPUNIT_ASSERT(memcmp(result, "%2Fdata%2Fsource%2Fpath",24)==0); - /* TEST: safety-escaping a string already partially escaped */ /* escaping of dangerous characters in a partially escaped string */ === modified file 'snmplib/asn1.c' --- snmplib/asn1.c 2012-01-20 18:55:04 +0000 +++ snmplib/asn1.c 2012-08-28 13:00:30 +0000 @@ -83,7 +83,6 @@ #include "asn1.h" #include "snmp_api_error.h" - u_char * asn_build_header(u_char * data, /* IN - ptr to start of object */ int *datalength, /* IN/OUT - # of valid bytes */ @@ -95,7 +94,6 @@ return (asn_build_header_with_truth(data, datalength, type, length, 0)); } - /* * asn_parse_int - pulls an int out of an ASN int type. * On entry, datalength is input as the number of valid bytes following @@ -453,7 +451,6 @@ return (data + strlength); } - /* * asn_parse_header - interprets the ID and length of the current object. * On entry, datalength is input as the number of valid bytes following @@ -599,7 +596,6 @@ return (data + 1); } - u_char * asn_build_length(u_char * data, int *datalength, int length, int truth) === modified file 'snmplib/mib.c' --- snmplib/mib.c 2012-01-20 18:55:04 +0000 +++ snmplib/mib.c 2012-08-28 13:00:30 +0000 @@ -99,7 +99,6 @@ Mib = read_mib(file); } - static struct snmp_mib_tree * find_rfc1066_mib(struct snmp_mib_tree *root) { oid *op = RFC1066_MIB; === modified file 'snmplib/parse.c' --- snmplib/parse.c 2012-08-24 09:57:00 +0000 +++ snmplib/parse.c 2012-08-28 13:00:30 +0000 @@ -85,7 +85,6 @@ #include #endif - /* * This is one element of an object identifier with either an integer subidentifier, * or a textual string label, or both. @@ -163,7 +162,6 @@ struct tok *next; /* pointer to next in hash table */ }; - struct tok tokens[] = { {"obsolete", sizeof("obsolete") - 1, OBSOLETE}, {"Opaque", sizeof("Opaque") - 1, SNMP_OPAQUE}, @@ -260,7 +258,6 @@ } } - static void print_error(const char *string, const char *token, int type) { @@ -472,7 +469,6 @@ return tp; } - /* * Parses a token from the file. The type of the token parsed is returned, * and the text is placed in the string pointed to by token. @@ -613,7 +609,6 @@ } return count; - } static void @@ -971,7 +966,6 @@ return np; } - /* * Parses a mib file and returns a linked list of nodes found in the file. * Returns NULL on error. === modified file 'snmplib/snmp_api.c' --- snmplib/snmp_api.c 2012-01-20 18:55:04 +0000 +++ snmplib/snmp_api.c 2012-08-28 13:00:30 +0000 @@ -1,5 +1,4 @@ - /********************************************************************** * * Copyright 1997 by Carnegie Mellon University === modified file 'snmplib/snmp_api_error.c' --- snmplib/snmp_api_error.c 2012-01-21 17:06:38 +0000 +++ snmplib/snmp_api_error.c 2012-08-28 13:00:30 +0000 @@ -35,7 +35,6 @@ #include #include "snmp_api_error.h" - /*************************************************************************** * ***************************************************************************/ @@ -62,7 +61,6 @@ "Packet Error", "No Response From Host", - "Unknown Error" }; === modified file 'snmplib/snmp_error.c' --- snmplib/snmp_error.c 2012-01-20 18:55:04 +0000 +++ snmplib/snmp_error.c 2012-08-28 13:00:30 +0000 @@ -32,7 +32,6 @@ #include "snmp_error.h" - static const char *error_string[25] = { /* 0x00 - 0x05 */ "No Error", === modified file 'snmplib/snmp_msg.c' --- snmplib/snmp_msg.c 2012-01-20 18:55:04 +0000 +++ snmplib/snmp_msg.c 2012-08-28 13:00:30 +0000 @@ -88,7 +88,6 @@ #include "snmp_pdu.h" #include "snmp_msg.h" - /* * RFC 1901: Introduction to Community-based SNMPv2 * === modified file 'snmplib/snmp_pdu.c' --- snmplib/snmp_pdu.c 2012-01-20 18:55:04 +0000 +++ snmplib/snmp_pdu.c 2012-08-28 13:00:30 +0000 @@ -263,7 +263,6 @@ return (newpdu); } - /**********************************************************************/ void === modified file 'snmplib/snmp_vars.c' --- snmplib/snmp_vars.c 2012-01-20 18:55:04 +0000 +++ snmplib/snmp_vars.c 2012-08-28 13:00:30 +0000 @@ -93,7 +93,6 @@ #include "util.h" - /* #define DEBUG_VARS 1 */ /* #define DEBUG_VARS_MALLOC 1 */ /* #define DEBUG_VARS_DECODE 1 */ @@ -362,9 +361,6 @@ return (bufp); } - - - /* Parse all Vars from the buffer */ u_char * snmp_var_DecodeVarBind(u_char * Buffer, int *BufLen, === modified file 'src/AccessLogEntry.cc' --- src/AccessLogEntry.cc 2012-08-14 11:53:07 +0000 +++ src/AccessLogEntry.cc 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ } #endif /* USE_SSL */ - void AccessLogEntry::getLogClientIp(char *buf, size_t bufsz) const { === modified file 'src/AccessLogEntry.h' --- src/AccessLogEntry.h 2012-07-19 00:12:22 +0000 +++ src/AccessLogEntry.h 2012-08-28 13:00:30 +0000 @@ -228,7 +228,6 @@ HttpRequest *request; //< virgin HTTP request HttpRequest *adapted_request; //< HTTP request after adaptation and redirection - #if ICAP_CLIENT /** \brief This subclass holds log info for ICAP part of request * \todo Inner class declarations should be moved outside === modified file 'src/AclRegs.cc' --- src/AclRegs.cc 2012-08-14 11:53:07 +0000 +++ src/AclRegs.cc 2012-08-28 13:00:30 +0000 @@ -74,7 +74,6 @@ #include "ident/AclIdent.h" #endif - ACL::Prototype ACLBrowser::RegistryProtoype(&ACLBrowser::RegistryEntry_, "browser"); ACLStrategised ACLBrowser::RegistryEntry_(new ACLRegexData, ACLRequestHeaderStrategy::Instance(), "browser"); ACL::Prototype ACLDestinationDomain::LiteralRegistryProtoype(&ACLDestinationDomain::LiteralRegistryEntry_, "dstdomain"); === modified file 'src/BodyPipe.cc' --- src/BodyPipe.cc 2012-08-14 11:53:07 +0000 +++ src/BodyPipe.cc 2012-08-28 13:00:30 +0000 @@ -98,7 +98,6 @@ return true; } - /* BodyProducer */ // inform the pipe that we are done and clear the Pointer @@ -111,8 +110,6 @@ pipe = NULL; } - - /* BodyConsumer */ // inform the pipe that we are done and clear the Pointer @@ -124,7 +121,6 @@ pipe = NULL; } - /* BodyPipe */ BodyPipe::BodyPipe(Producer *aProducer): theBodySize(-1), @@ -406,7 +402,6 @@ clearProducer(true); // reached end-of-body } - void BodyPipe::scheduleBodyDataNotification() { @@ -475,7 +470,6 @@ return outputBuffer.content(); } - /* BodyPipeCheckout */ BodyPipeCheckout::BodyPipeCheckout(BodyPipe &aPipe): pipe(aPipe), @@ -503,7 +497,6 @@ checkedIn = true; } - BodyPipeCheckout::BodyPipeCheckout(const BodyPipeCheckout &c): pipe(c.pipe), buf(c.buf), offset(c.offset), checkedOutSize(c.checkedOutSize), checkedIn(c.checkedIn) === modified file 'src/CommCalls.cc' --- src/CommCalls.cc 2012-08-14 11:53:07 +0000 +++ src/CommCalls.cc 2012-08-28 13:00:30 +0000 @@ -37,7 +37,6 @@ os << ", data=" << data; } - /* CommAcceptCbParams */ CommAcceptCbParams::CommAcceptCbParams(void *aData): @@ -83,7 +82,6 @@ return true; // now we are in sync and can handle the call } - void CommIoCbParams::print(std::ostream &os) const { @@ -94,7 +92,6 @@ } } - /* CommCloseCbParams */ CommCloseCbParams::CommCloseCbParams(void *aData): @@ -145,7 +142,6 @@ os << ')'; } - /* CommConnectCbPtrFun */ CommConnectCbPtrFun::CommConnectCbPtrFun(CNCB *aHandler, @@ -169,7 +165,6 @@ os << ')'; } - /* CommIoCbPtrFun */ CommIoCbPtrFun::CommIoCbPtrFun(IOCB *aHandler, const CommIoCbParams &aParams): @@ -192,7 +187,6 @@ os << ')'; } - /* CommCloseCbPtrFun */ CommCloseCbPtrFun::CommCloseCbPtrFun(CLCB *aHandler, === modified file 'src/CommCalls.h' --- src/CommCalls.h 2011-12-04 05:43:42 +0000 +++ src/CommCalls.h 2012-08-28 13:00:30 +0000 @@ -50,7 +50,6 @@ * known to comm and there are many kinds of parameters. */ - /* Comm*CbParams classes below handle callback parameters */ // Maintains parameters common to all comm callbacks @@ -166,7 +165,6 @@ return dp->params; } - // All job dialers with comm parameters are merged into one since they // all have exactly one callback argument and differ in Params type only template @@ -198,7 +196,6 @@ virtual void doDial() { ((&(*this->job))->*method)(this->params); } }; - // accept (IOACB) dialer class CommAcceptCbPtrFun: public CallDialer, public CommDialerParamsT @@ -234,7 +231,6 @@ CNCB *handler; }; - // read/write (IOCB) dialer class CommIoCbPtrFun: public CallDialer, public CommDialerParamsT @@ -251,7 +247,6 @@ IOCB *handler; }; - // close (CLCB) dialer class CommCloseCbPtrFun: public CallDialer, public CommDialerParamsT @@ -354,7 +349,6 @@ { } - template bool CommCbFunPtrCallT::canFire() === modified file 'src/CommRead.h' --- src/CommRead.h 2012-08-14 11:53:07 +0000 +++ src/CommRead.h 2012-08-28 13:00:30 +0000 @@ -86,5 +86,4 @@ CbDataListContainer deferredReads; }; - #endif /* COMMREAD_H */ === modified file 'src/ConfigOption.h' --- src/ConfigOption.h 2010-12-14 14:01:14 +0000 +++ src/ConfigOption.h 2012-08-28 13:00:30 +0000 @@ -37,7 +37,6 @@ /* for Vector<> */ #include "Array.h" - /* cache option parsers */ class ConfigOption === modified file 'src/CpuAffinity.cc' --- src/CpuAffinity.cc 2012-08-14 11:53:07 +0000 +++ src/CpuAffinity.cc 2012-08-28 13:00:30 +0000 @@ -18,7 +18,6 @@ static CpuAffinitySet *TheCpuAffinitySet = NULL; - void CpuAffinityInit() { === modified file 'src/CpuAffinity.h' --- src/CpuAffinity.h 2010-11-21 04:40:05 +0000 +++ src/CpuAffinity.h 2012-08-28 13:00:30 +0000 @@ -15,5 +15,4 @@ /// check CPU affinity configuration and print warnings if needed SQUIDCEXTERN void CpuAffinityCheck(); - #endif // SQUID_CPU_AFFINITY_H === modified file 'src/CpuAffinityMap.cc' --- src/CpuAffinityMap.cc 2012-01-20 18:55:04 +0000 +++ src/CpuAffinityMap.cc 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "CpuAffinitySet.h" #include "Debug.h" - bool CpuAffinityMap::add(const Vector &aProcesses, const Vector &aCores) { === modified file 'src/CpuAffinityMap.h' --- src/CpuAffinityMap.h 2010-09-23 17:58:15 +0000 +++ src/CpuAffinityMap.h 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ class CpuAffinitySet; - /// stores cpu_affinity_map configuration class CpuAffinityMap { === modified file 'src/CpuAffinitySet.cc' --- src/CpuAffinitySet.cc 2012-05-14 00:23:32 +0000 +++ src/CpuAffinitySet.cc 2012-08-28 13:00:30 +0000 @@ -18,7 +18,6 @@ #include #endif - CpuAffinitySet::CpuAffinitySet() { CPU_ZERO(&theCpuSet); === modified file 'src/DiskIO/AIO/aio_win32.cc' --- src/DiskIO/AIO/aio_win32.cc 2012-08-15 15:17:32 +0000 +++ src/DiskIO/AIO/aio_win32.cc 2012-08-28 13:00:30 +0000 @@ -54,7 +54,6 @@ xfree(lpOverlapped); } - int aio_read(struct aiocb *aiocbp) { LPOVERLAPPED Overlapped; @@ -114,7 +113,6 @@ return 0; } - int aio_read64(struct aiocb64 *aiocbp) { LPOVERLAPPED Overlapped; @@ -166,7 +164,6 @@ return 0; } - int aio_write(struct aiocb *aiocbp) { LPOVERLAPPED Overlapped; @@ -226,7 +223,6 @@ return 0; } - int aio_write64(struct aiocb64 *aiocbp) { LPOVERLAPPED Overlapped; @@ -278,19 +274,16 @@ return 0; } - int aio_error(const struct aiocb * aiocbp) { return aiocbp->aio_sigevent.sigev_notify; } - int aio_error64(const struct aiocb64 * aiocbp) { return aiocbp->aio_sigevent.sigev_notify; } - int aio_open(const char *path, int mode) { HANDLE hndl; @@ -335,7 +328,6 @@ return fd; } - void aio_close(int fd) { CloseHandle((HANDLE)_get_osfhandle(fd)); @@ -343,13 +335,11 @@ ++ statCounter.syscalls.disk.closes; } - ssize_t aio_return(struct aiocb * aiocbp) { return aiocbp->aio_sigevent.sigev_signo; } - ssize_t aio_return64(struct aiocb64 * aiocbp) { === modified file 'src/DiskIO/Blocking/BlockingDiskIOModule.cc' --- src/DiskIO/Blocking/BlockingDiskIOModule.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/Blocking/BlockingDiskIOModule.cc 2012-08-28 13:00:30 +0000 @@ -54,7 +54,6 @@ BlockingDiskIOModule::shutdown() {} - DiskIOStrategy* BlockingDiskIOModule::createStrategy() { === modified file 'src/DiskIO/Blocking/BlockingFile.cc' --- src/DiskIO/Blocking/BlockingFile.cc 2012-08-15 15:17:32 +0000 +++ src/DiskIO/Blocking/BlockingFile.cc 2012-08-28 13:00:30 +0000 @@ -105,7 +105,6 @@ open(flags, mode, callback); } - void BlockingFile::doClose() { if (fd > -1) { === modified file 'src/DiskIO/DiskDaemon/DiskdAction.cc' --- src/DiskIO/DiskDaemon/DiskdAction.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskDaemon/DiskdAction.cc 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ #include "Store.h" #include "protos.h" - DiskdActionData::DiskdActionData() { xmemset(this, 0, sizeof(*this)); @@ -54,7 +53,6 @@ return *this; } - DiskdAction::Pointer DiskdAction::Create(const Mgr::CommandPointer &aCmd) { === modified file 'src/DiskIO/DiskDaemon/DiskdAction.h' --- src/DiskIO/DiskDaemon/DiskdAction.h 2010-10-28 18:52:59 +0000 +++ src/DiskIO/DiskDaemon/DiskdAction.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "mgr/forward.h" #include "mgr/Action.h" - /// store disk daemon stats class DiskdActionData { === modified file 'src/DiskIO/DiskDaemon/DiskdIOStrategy.cc' --- src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 2012-08-15 15:17:32 +0000 +++ src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 2012-08-28 13:00:30 +0000 @@ -318,7 +318,6 @@ return; } - /* set errno passed from diskd. makes debugging more meaningful */ if (M->status < 0) errno = -M->status; @@ -537,7 +536,6 @@ } } - /* * Handle callbacks. If we have more than magic2 requests away, we block * until the queue is below magic2. Otherwise, we simply return when we === modified file 'src/DiskIO/DiskIOModule.h' --- src/DiskIO/DiskIOModule.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskIOModule.h 2012-08-28 13:00:30 +0000 @@ -84,5 +84,4 @@ static Vector *_Modules; }; - #endif /* SQUID_DISKIOMODULE_H */ === modified file 'src/DiskIO/DiskThreads/CommIO.h' --- src/DiskIO/DiskThreads/CommIO.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskThreads/CommIO.h 2012-08-28 13:00:30 +0000 @@ -22,7 +22,6 @@ static int DoneReadFD; }; - /* Inline code. TODO: make structued approach to inlining */ void CommIO::NotifyIOCompleted() === modified file 'src/DiskIO/DiskThreads/DiskThreads.h' --- src/DiskIO/DiskThreads/DiskThreads.h 2010-11-21 04:40:05 +0000 +++ src/DiskIO/DiskThreads/DiskThreads.h 2012-08-28 13:00:30 +0000 @@ -119,5 +119,4 @@ extern AIOCounts squidaio_counts; extern dlink_list used_list; - #endif === modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc' --- src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc 2012-08-15 15:17:32 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc 2012-08-28 13:00:30 +0000 @@ -33,7 +33,6 @@ * Copyright (c) 2003, Robert Collins */ - #include "squid.h" #include "DiskThreadsDiskFile.h" #include "DiskIO/IORequestor.h" === modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h' --- src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h 2009-01-21 03:47:47 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h 2012-08-28 13:00:30 +0000 @@ -52,5 +52,4 @@ static DiskThreadsDiskIOModule Instance; }; - #endif /* SQUID_DISKTHREADSDISKIOMODULE_H */ === modified file 'src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc' --- src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc 2012-08-28 13:00:30 +0000 @@ -44,7 +44,6 @@ /* for statfs */ #include "Store.h" - void DiskThreadsIOStrategy::init(void) { === modified file 'src/DiskIO/DiskThreads/aiops.cc' --- src/DiskIO/DiskThreads/aiops.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskThreads/aiops.cc 2012-08-28 13:00:30 +0000 @@ -124,7 +124,6 @@ static squidaio_thread_t *threads = NULL; static int squidaio_initialised = 0; - #define AIO_LARGE_BUFS 16384 #define AIO_MEDIUM_BUFS AIO_LARGE_BUFS >> 1 #define AIO_SMALL_BUFS AIO_LARGE_BUFS >> 2 @@ -636,7 +635,6 @@ squidaio_request_pool->freeOne(requestp); } /* squidaio_cleanup_request */ - int squidaio_cancel(squidaio_result_t * resultp) { @@ -654,7 +652,6 @@ return 1; } /* squidaio_cancel */ - int squidaio_open(const char *path, int oflag, mode_t mode, squidaio_result_t * resultp) { @@ -682,7 +679,6 @@ return 0; } - static void squidaio_do_open(squidaio_request_t * requestp) { @@ -690,7 +686,6 @@ requestp->err = errno; } - int squidaio_read(int fd, char *bufp, size_t bufs, off_t offset, int whence, squidaio_result_t * resultp) { @@ -721,7 +716,6 @@ return 0; } - static void squidaio_do_read(squidaio_request_t * requestp) { @@ -730,7 +724,6 @@ requestp->err = errno; } - int squidaio_write(int fd, char *bufp, size_t bufs, off_t offset, int whence, squidaio_result_t * resultp) { @@ -761,7 +754,6 @@ return 0; } - static void squidaio_do_write(squidaio_request_t * requestp) { @@ -769,7 +761,6 @@ requestp->err = errno; } - int squidaio_close(int fd, squidaio_result_t * resultp) { @@ -792,7 +783,6 @@ return 0; } - static void squidaio_do_close(squidaio_request_t * requestp) { @@ -800,7 +790,6 @@ requestp->err = errno; } - int squidaio_stat(const char *path, struct stat *sb, squidaio_result_t * resultp) @@ -829,7 +818,6 @@ return 0; } - static void squidaio_do_stat(squidaio_request_t * requestp) { @@ -837,7 +825,6 @@ requestp->err = errno; } - int squidaio_unlink(const char *path, squidaio_result_t * resultp) { @@ -861,7 +848,6 @@ return 0; } - static void squidaio_do_unlink(squidaio_request_t * requestp) { === modified file 'src/DiskIO/DiskThreads/aiops_win32.cc' --- src/DiskIO/DiskThreads/aiops_win32.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskThreads/aiops_win32.cc 2012-08-28 13:00:30 +0000 @@ -122,7 +122,6 @@ static squidaio_thread_t *threads = NULL; static int squidaio_initialised = 0; - #define AIO_LARGE_BUFS 16384 #define AIO_MEDIUM_BUFS AIO_LARGE_BUFS >> 1 #define AIO_SMALL_BUFS AIO_LARGE_BUFS >> 2 @@ -721,7 +720,6 @@ squidaio_request_pool->free(requestp); } /* squidaio_cleanup_request */ - int squidaio_cancel(squidaio_result_t * resultp) { @@ -739,7 +737,6 @@ return 1; } /* squidaio_cancel */ - int squidaio_open(const char *path, int oflag, mode_t mode, squidaio_result_t * resultp) { @@ -767,7 +764,6 @@ return 0; } - static void squidaio_do_open(squidaio_request_t * requestp) { @@ -775,7 +771,6 @@ requestp->err = errno; } - int squidaio_read(int fd, char *bufp, size_t bufs, off_t offset, int whence, squidaio_result_t * resultp) { @@ -806,7 +801,6 @@ return 0; } - static void squidaio_do_read(squidaio_request_t * requestp) { @@ -821,7 +815,6 @@ requestp->err = errno; } - int squidaio_write(int fd, char *bufp, size_t bufs, off_t offset, int whence, squidaio_result_t * resultp) { @@ -852,7 +845,6 @@ return 0; } - static void squidaio_do_write(squidaio_request_t * requestp) { @@ -865,7 +857,6 @@ requestp->err = errno; } - int squidaio_close(int fd, squidaio_result_t * resultp) { @@ -888,7 +879,6 @@ return 0; } - static void squidaio_do_close(squidaio_request_t * requestp) { @@ -900,7 +890,6 @@ requestp->err = errno; } - int squidaio_stat(const char *path, struct stat *sb, squidaio_result_t * resultp) @@ -929,7 +918,6 @@ return 0; } - static void squidaio_do_stat(squidaio_request_t * requestp) { @@ -937,7 +925,6 @@ requestp->err = errno; } - int squidaio_unlink(const char *path, squidaio_result_t * resultp) { @@ -961,7 +948,6 @@ return 0; } - static void squidaio_do_unlink(squidaio_request_t * requestp) { === modified file 'src/DiskIO/DiskThreads/async_io.cc' --- src/DiskIO/DiskThreads/async_io.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/DiskThreads/async_io.cc 2012-08-28 13:00:30 +0000 @@ -129,7 +129,6 @@ } } - void aioWrite(int fd, off_t offset, char *bufp, size_t len, AIOCB * callback, void *callback_data, FREE * free_func) { @@ -158,7 +157,6 @@ dlinkAdd(ctrlp, &ctrlp->node, &used_list); } /* aioWrite */ - void aioRead(int fd, off_t offset, size_t len, AIOCB * callback, void *callback_data) { === modified file 'src/DiskIO/IpcIo/IpcIoDiskIOModule.cc' --- src/DiskIO/IpcIo/IpcIoDiskIOModule.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/IpcIo/IpcIoDiskIOModule.cc 2012-08-28 13:00:30 +0000 @@ -21,7 +21,6 @@ IpcIoDiskIOModule::shutdown() {} - DiskIOStrategy* IpcIoDiskIOModule::createStrategy() { === modified file 'src/DiskIO/IpcIo/IpcIoFile.cc' --- src/DiskIO/IpcIo/IpcIoFile.cc 2012-08-15 15:17:32 +0000 +++ src/DiskIO/IpcIo/IpcIoFile.cc 2012-08-28 13:00:30 +0000 @@ -62,7 +62,6 @@ (sio.msg.command == IpcIo::cmdRead ? 'r' : 'w') << sio.disker; } - IpcIoFile::IpcIoFile(char const *aDb): dbName(aDb), diskId(-1), error_(false), lastRequestId(0), olderRequests(&requestMap1), newerRequests(&requestMap2), @@ -585,7 +584,6 @@ return -1; } - /* IpcIoMsg */ IpcIoMsg::IpcIoMsg(): @@ -617,8 +615,6 @@ } } - - /* XXX: disker code that should probably be moved elsewhere */ static int TheFile = -1; ///< db file descriptor @@ -675,7 +671,6 @@ Ipc::Mem::PutPage(ipcIo.page); } - void IpcIoFile::DiskerHandleMoreRequests(void *source) { @@ -856,7 +851,6 @@ } } - /// reports our needs for shared memory pages to Ipc::Mem::Pages class IpcIoClaimMemoryNeedsRr: public RegisteredRunner { @@ -867,7 +861,6 @@ RunnerRegistrationEntry(rrClaimMemoryNeeds, IpcIoClaimMemoryNeedsRr); - void IpcIoClaimMemoryNeedsRr::run(const RunnerRegistry &) { @@ -881,7 +874,6 @@ static_cast(itemsCount * 1.1)); } - /// initializes shared memory segments used by IpcIoFile class IpcIoRr: public Ipc::Mem::RegisteredRunner { @@ -899,7 +891,6 @@ RunnerRegistrationEntry(rrAfterConfig, IpcIoRr); - void IpcIoRr::create(const RunnerRegistry &) { if (Config.cacheSwap.n_strands <= 0) === modified file 'src/DiskIO/IpcIo/IpcIoFile.h' --- src/DiskIO/IpcIo/IpcIoFile.h 2012-08-14 11:53:07 +0000 +++ src/DiskIO/IpcIo/IpcIoFile.h 2012-08-28 13:00:30 +0000 @@ -26,7 +26,6 @@ } // namespace IpcIo - /// converts DiskIO requests to IPC queue messages class IpcIoMsg { @@ -140,7 +139,6 @@ CBDATA_CLASS2(IpcIoFile); }; - /// keeps original I/O request parameters while disker is handling the request class IpcIoPendingRequest { @@ -160,5 +158,4 @@ IpcIoPendingRequest &operator =(const IpcIoPendingRequest &d); // ditto }; - #endif /* SQUID_IPC_IOFILE_H */ === modified file 'src/DiskIO/Mmapped/MmappedDiskIOModule.cc' --- src/DiskIO/Mmapped/MmappedDiskIOModule.cc 2012-08-14 11:53:07 +0000 +++ src/DiskIO/Mmapped/MmappedDiskIOModule.cc 2012-08-28 13:00:30 +0000 @@ -21,7 +21,6 @@ MmappedDiskIOModule::shutdown() {} - DiskIOStrategy* MmappedDiskIOModule::createStrategy() { === modified file 'src/DiskIO/Mmapped/MmappedFile.cc' --- src/DiskIO/Mmapped/MmappedFile.cc 2012-08-15 15:17:32 +0000 +++ src/DiskIO/Mmapped/MmappedFile.cc 2012-08-28 13:00:30 +0000 @@ -46,7 +46,6 @@ void *buf; ///< buffer returned by mmap, needed for munmap }; - void * MmappedFile::operator new(size_t sz) { === modified file 'src/EventLoop.h' --- src/EventLoop.h 2012-08-14 11:53:07 +0000 +++ src/EventLoop.h 2012-08-28 13:00:30 +0000 @@ -110,5 +110,4 @@ bool runOnceResult; /**< the result from runOnce */ }; - #endif /* SQUID_EVENTLOOP_H */ === modified file 'src/ExternalACL.h' --- src/ExternalACL.h 2012-06-19 16:08:52 +0000 +++ src/ExternalACL.h 2012-08-28 13:00:30 +0000 @@ -65,7 +65,6 @@ static void ExternalAclLookup(ACLChecklist * ch, ACLExternal *); - ACLExternal(char const *); ACLExternal(ACLExternal const &); ~ACLExternal(); === modified file 'src/ExternalACLEntry.h' --- src/ExternalACLEntry.h 2011-08-14 11:40:33 +0000 +++ src/ExternalACLEntry.h 2012-08-28 13:00:30 +0000 @@ -71,7 +71,6 @@ String log; }; - /******************************************************************* * external_acl cache entry * Used opaqueue in the interface === modified file 'src/HttpBody.cc' --- src/HttpBody.cc 2012-08-14 11:53:07 +0000 +++ src/HttpBody.cc 2012-08-28 13:00:30 +0000 @@ -37,7 +37,6 @@ #include "HttpBody.h" #include "MemBuf.h" - HttpBody::HttpBody() : mb(new MemBuf) {} === modified file 'src/HttpBody.h' --- src/HttpBody.h 2011-12-05 01:40:45 +0000 +++ src/HttpBody.h 2012-08-28 13:00:30 +0000 @@ -74,5 +74,4 @@ MemBuf *mb; }; - #endif /* HTTPBODY_H_ */ === modified file 'src/HttpHdrCc.cc' --- src/HttpHdrCc.cc 2012-08-14 11:53:07 +0000 +++ src/HttpHdrCc.cc 2012-08-28 13:00:30 +0000 @@ -80,7 +80,6 @@ return aHeader; } - /// Module initialization hook void httpHdrCcInitModule(void) === modified file 'src/HttpHdrContRange.cc' --- src/HttpHdrContRange.cc 2012-08-14 11:53:07 +0000 +++ src/HttpHdrContRange.cc 2012-08-28 13:00:30 +0000 @@ -52,7 +52,6 @@ * entity-length = 1*DIGIT */ - /* local constants */ #define range_spec_unknown (-1) === modified file 'src/HttpHdrRange.cc' --- src/HttpHdrRange.cc 2012-08-14 11:53:07 +0000 +++ src/HttpHdrRange.cc 2012-08-28 13:00:30 +0000 @@ -58,7 +58,6 @@ * spec into type one above. (Canonization process). */ - /* local routines */ #define known_spec(s) ((s) > HttpHdrRangeSpec::UnknownPosition) @@ -362,7 +361,6 @@ " specs, merged " << basis.size() - specs.size() << " specs"); } - void HttpHdrRange::getCanonizedSpecs (Vector ©) { === modified file 'src/HttpHdrSc.cc' --- src/HttpHdrSc.cc 2012-08-14 11:53:07 +0000 +++ src/HttpHdrSc.cc 2012-08-28 13:00:30 +0000 @@ -79,7 +79,6 @@ return (int)anSc - (int)anSc2; } - /* module initialization */ void @@ -249,7 +248,6 @@ } } - HttpHdrSc::HttpHdrSc(const HttpHdrSc &sc) { dlink_node *node = sc.targets.head; === modified file 'src/HttpHdrScTarget.h' --- src/HttpHdrScTarget.h 2012-08-14 11:53:07 +0000 +++ src/HttpHdrScTarget.h 2012-08-28 13:00:30 +0000 @@ -130,6 +130,4 @@ extern void httpHdrScTargetStatDumper(StoreEntry * sentry, int idx, double val, double size, int count); - - #endif /* SQUID_HTTPHDRSURROGATECONTROLTARGET_H */ === modified file 'src/HttpHeader.cc' --- src/HttpHeader.cc 2012-08-14 11:53:07 +0000 +++ src/HttpHeader.cc 2012-08-28 13:00:30 +0000 @@ -68,7 +68,6 @@ * An entry is a (field_id, field_name, field_value) triplet. */ - /* * local constants and vars */ @@ -172,7 +171,6 @@ return aHeader; } - /* * headers with field values defined as #(values) in HTTP/1.1 * Headers that are currently not recognized, are commented out. @@ -1699,7 +1697,6 @@ xpercent(count, dump_stat->destroyedCount)); } - static void httpHeaderStatDump(const HttpHeaderStat * hs, StoreEntry * e) { === modified file 'src/HttpHeader.h' --- src/HttpHeader.h 2012-05-30 03:45:12 +0000 +++ src/HttpHeader.h 2012-08-28 13:00:30 +0000 @@ -38,7 +38,6 @@ /* HttpHeader holds a HttpHeaderMask */ #include "HttpHeaderMask.h" - /* class forward declarations */ class HttpHdrContRange; class HttpHdrCc; @@ -46,7 +45,6 @@ class HttpHdrRange; class String; - /* constant attributes of http header fields */ /// recognized or "known" header fields; and the RFC which defines them (or not) @@ -187,7 +185,6 @@ field_type type; }; - /** Iteration for headers; use HttpHeaderPos as opaque type, do not interpret */ typedef ssize_t HttpHeaderPos; @@ -293,7 +290,6 @@ HttpHeaderEntry *findLastEntry(http_hdr_type id) const; }; - extern int httpHeaderParseQuotedString(const char *start, const int len, String *val); SQUIDCEXTERN int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator); SQUIDCEXTERN void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask); === modified file 'src/HttpHeaderStat.h' --- src/HttpHeaderStat.h 2011-12-17 01:26:31 +0000 +++ src/HttpHeaderStat.h 2012-08-28 13:00:30 +0000 @@ -29,5 +29,4 @@ int busyDestroyedCount; }; - #endif /* HTTPHEADERSTAT_H_ */ === modified file 'src/HttpHeaderTools.cc' --- src/HttpHeaderTools.cc 2012-08-15 15:17:32 +0000 +++ src/HttpHeaderTools.cc 2012-08-28 13:00:30 +0000 @@ -60,7 +60,6 @@ static void httpHeaderPutStrvf(HttpHeader * hdr, http_hdr_type id, const char *fmt, va_list vargs); - HttpHeaderFieldInfo * httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count) { @@ -142,7 +141,6 @@ mb.clean(); } - /** wrapper arrounf PutContRange */ void httpHeaderAddContRange(HttpHeader * hdr, HttpHdrRangeSpec spec, int64_t ent_len) @@ -154,7 +152,6 @@ httpHdrContRangeDestroy(cr); } - /** * return true if a given directive is found in at least one of * the "connection" header-fields note: if HDR_PROXY_CONNECTION is @@ -342,7 +339,6 @@ return 1; } - /** * Parses a quoted-string field (RFC 2616 section 2.2), complains if * something went wrong, returns non-zero on success. === modified file 'src/HttpMsg.h' --- src/HttpMsg.h 2012-08-14 11:53:07 +0000 +++ src/HttpMsg.h 2012-08-28 13:00:30 +0000 @@ -45,7 +45,6 @@ template class HttpMsgPointerT; - class HttpMsg { === modified file 'src/HttpParser.cc' --- src/HttpParser.cc 2012-08-14 11:53:07 +0000 +++ src/HttpParser.cc 2012-08-28 13:00:30 +0000 @@ -109,7 +109,6 @@ // NP: we have now seen EOL, more-data (0) cannot occur. // From here on any failure is -1, success is 1 - // Input Validation: // Process what we now know about the line structure into field offsets === modified file 'src/HttpParser.h' --- src/HttpParser.h 2011-05-29 15:19:59 +0000 +++ src/HttpParser.h 2012-08-28 13:00:30 +0000 @@ -94,5 +94,4 @@ #define HttpParserRequestLen(hp) ( (hp)->hdr_end - (hp)->req.start + 1 ) #endif - #endif /* _SQUID_SRC_HTTPPARSER_H */ === modified file 'src/HttpReply.cc' --- src/HttpReply.cc 2012-08-14 11:53:07 +0000 +++ src/HttpReply.cc 2012-08-28 13:00:30 +0000 @@ -626,7 +626,6 @@ return rep; } - bool HttpReply::inheritProperties(const HttpMsg *aMsg) { const HttpReply *aRep = dynamic_cast(aMsg); === modified file 'src/HttpRequestMethod.h' --- src/HttpRequestMethod.h 2012-08-14 11:53:07 +0000 +++ src/HttpRequestMethod.h 2012-08-28 13:00:30 +0000 @@ -73,7 +73,6 @@ METHOD_ENUM_END // MUST be last, (yuck) this is used as an array-initialization index constant! }; - /** * This class represents an HTTP Request METHOD * - i.e. PUT, POST, GET etc. === modified file 'src/HttpStatusLine.h' --- src/HttpStatusLine.h 2012-08-14 11:53:07 +0000 +++ src/HttpStatusLine.h 2012-08-28 13:00:30 +0000 @@ -79,5 +79,4 @@ SQUIDCEXTERN const char *httpStatusString(http_status status); - #endif /* SQUID_HTTPSTATUSLINE_H */ === modified file 'src/ICP.h' --- src/ICP.h 2012-08-14 11:53:07 +0000 +++ src/ICP.h 2012-08-28 13:00:30 +0000 @@ -89,7 +89,6 @@ return aCode; } - /** \ingroup ServerProtocolICPAPI \todo mempool this === modified file 'src/LeakFinder.cc' --- src/LeakFinder.cc 2012-08-24 09:57:00 +0000 +++ src/LeakFinder.cc 2012-08-28 13:00:30 +0000 @@ -118,7 +118,6 @@ return ((unsigned long) p >> 8) % mod; } - void LeakFinder::dump() { === modified file 'src/MemBlob.cc' --- src/MemBlob.cc 2012-01-20 18:55:04 +0000 +++ src/MemBlob.cc 2012-08-28 13:00:30 +0000 @@ -28,7 +28,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ - #include "squid.h" #include "base/TextException.h" #include "Debug.h" @@ -40,11 +39,9 @@ #include #endif - MemBlobStats MemBlob::Stats; InstanceIdDefinitions(MemBlob, "blob"); - /* MemBlobStats */ MemBlobStats::MemBlobStats(): alloc(0), live(0), append(0) @@ -63,7 +60,6 @@ return os; } - /* MemBlob */ MemBlob::MemBlob(const MemBlob::size_type reserveSize) : @@ -134,7 +130,6 @@ ++Stats.append; } - const MemBlobStats& MemBlob::GetStats() { === modified file 'src/MemBlob.h' --- src/MemBlob.h 2011-04-07 13:26:54 +0000 +++ src/MemBlob.h 2012-08-28 13:00:30 +0000 @@ -53,7 +53,6 @@ uint64_t liveBytes; ///< the total size of currently allocated storage }; - /** Refcountable, fixed-size, content-agnostic memory buffer. * * Allocated memory block is divided into two sequential areas: === modified file 'src/MemBuf.cc' --- src/MemBuf.cc 2012-08-14 11:53:07 +0000 +++ src/MemBuf.cc 2012-08-28 13:00:30 +0000 @@ -128,7 +128,6 @@ init(MEM_BUF_INIT_SIZE, MEM_BUF_MAX_SIZE); } - /** init with specific sizes */ void MemBuf::init(mb_size_t szInit, mb_size_t szMax) @@ -286,7 +285,6 @@ va_end(args); } - /** * vPrintf for other printf()'s to use; calls vsnprintf, extends buf if needed */ @@ -403,7 +401,6 @@ PROF_stop(MemBuf_grow); } - /* Reports */ /** === modified file 'src/MemObject.cc' --- src/MemObject.cc 2012-08-14 11:53:07 +0000 +++ src/MemObject.cc 2012-08-28 13:00:30 +0000 @@ -293,7 +293,6 @@ /* Should we check for clients? */ } - int64_t MemObject::lowestMemReaderOffset() const { @@ -408,7 +407,6 @@ inmem_lo = new_mem_lo; } - bool MemObject::isContiguous() const { === modified file 'src/MemObject.h' --- src/MemObject.h 2012-08-14 11:53:07 +0000 +++ src/MemObject.h 2012-08-28 13:00:30 +0000 @@ -92,7 +92,6 @@ DelayId mostBytesAllowed() const; #endif - #if URL_CHECKSUM_DEBUG void checkUrlChecksum() const; === modified file 'src/MemStore.cc' --- src/MemStore.cc 2012-08-14 11:53:07 +0000 +++ src/MemStore.cc 2012-08-28 13:00:30 +0000 @@ -399,7 +399,6 @@ return entryLimit; } - /// reports our needs for shared memory pages to Ipc::Mem::Pages class MemStoreClaimMemoryNeedsRr: public RegisteredRunner { @@ -410,14 +409,12 @@ RunnerRegistrationEntry(rrClaimMemoryNeeds, MemStoreClaimMemoryNeedsRr); - void MemStoreClaimMemoryNeedsRr::run(const RunnerRegistry &) { Ipc::Mem::NotePageNeed(Ipc::Mem::PageId::cachePage, MemStore::EntryLimit()); } - /// decides whether to use a shared memory cache or checks its configuration class MemStoreCfgRr: public ::RegisteredRunner { @@ -446,7 +443,6 @@ } } - /// initializes shared memory segments used by MemStore class MemStoreRr: public Ipc::Mem::RegisteredRunner { @@ -465,7 +461,6 @@ RunnerRegistrationEntry(rrAfterConfig, MemStoreRr); - void MemStoreRr::run(const RunnerRegistry &r) { assert(Config.memShared.configured()); === modified file 'src/Packer.cc' --- src/Packer.cc 2012-08-14 11:53:07 +0000 +++ src/Packer.cc 2012-08-28 13:00:30 +0000 @@ -65,12 +65,10 @@ * */ - /* * To-Do: */ - #include "squid.h" #include "Store.h" #include "MemBuf.h" @@ -111,7 +109,6 @@ e->append(buf, len); } - /* append()'s */ static void (*const store_append) (StoreEntry *, const char *, int) = &storeEntryAppend; static void (*const memBuf_append) (MemBuf *, const char *, mb_size_t) = &memBufAppend; @@ -120,7 +117,6 @@ static void (*const store_vprintf) (StoreEntry *, const char *, va_list ap) = &storeAppendVPrintf; static void (*const memBuf_vprintf) (MemBuf *, const char *, va_list ap) = &memBufVPrintf; - /* init/clean */ /* init with this to forward data to StoreEntry */ === modified file 'src/Packer.h' --- src/Packer.h 2010-11-21 04:40:05 +0000 +++ src/Packer.h 2012-08-28 13:00:30 +0000 @@ -45,7 +45,6 @@ typedef void (*append_f) (void *, const char *buf, int size); typedef void (*vprintf_f) (void *, const char *fmt, va_list args); - class Packer { === modified file 'src/PeerSelectState.h' --- src/PeerSelectState.h 2011-11-28 01:39:47 +0000 +++ src/PeerSelectState.h 2012-08-28 13:00:30 +0000 @@ -108,5 +108,4 @@ CBDATA_CLASS(ps_state); }; - #endif /* SQUID_PEERSELECTSTATE_H */ === modified file 'src/RemovalPolicy.h' --- src/RemovalPolicy.h 2012-08-14 11:53:07 +0000 +++ src/RemovalPolicy.h 2012-08-28 13:00:30 +0000 @@ -103,5 +103,4 @@ typedef RemovalPolicy *REMOVALPOLICYCREATE(wordlist * args); - #endif /* SQUID_REMOVALPOLICY_H */ === modified file 'src/Server.cc' --- src/Server.cc 2012-08-14 11:53:07 +0000 +++ src/Server.cc 2012-08-28 13:00:30 +0000 @@ -58,7 +58,6 @@ // implemented in client_side_reply.cc until sides have a common parent extern void purgeEntriesByUrl(HttpRequest * req, const char *url); - ServerStateData::ServerStateData(FwdState *theFwdState): AsyncJob("ServerStateData"), requestSender(NULL), #if USE_ADAPTATION @@ -127,7 +126,6 @@ #endif } - HttpReply * ServerStateData::virginReply() { @@ -310,7 +308,6 @@ handleRequestBodyProducerAborted(); } - // more origin request body data is available void ServerStateData::handleMoreRequestBodyAvailable() @@ -813,7 +810,6 @@ completeForwarding(); } - // common part of noteAdaptation*Aborted and noteBodyConsumerAborted methods void ServerStateData::handleAdaptationAborted(bool bypassable) === modified file 'src/SquidNew.cc' --- src/SquidNew.cc 2012-08-14 11:53:07 +0000 +++ src/SquidNew.cc 2012-08-28 13:00:30 +0000 @@ -37,7 +37,6 @@ #include "squid.h" - #ifdef __SUNPRO_CC #include === modified file 'src/SquidString.h' --- src/SquidString.h 2011-09-12 23:25:55 +0000 +++ src/SquidString.h 2012-08-28 13:00:30 +0000 @@ -45,7 +45,6 @@ #define SQUIDSTRINGPRINT(s) (s).psize(),(s).rawBuf() #endif /* SQUIDSTRINGPH */ - #define DEBUGSTRINGS 0 #if DEBUGSTRINGS #include "splay.h" @@ -159,7 +158,6 @@ void stat (StoreEntry *) const; #endif - private: void allocAndFill(const char *str, int len); void allocBuffer(size_type sz); === modified file 'src/StatCounters.h' --- src/StatCounters.h 2012-04-25 05:29:20 +0000 +++ src/StatCounters.h 2012-08-28 13:00:30 +0000 @@ -47,7 +47,6 @@ }; #endif - /** General collection of process-wide statistics. * * \note if you add a field to StatCounters, === modified file 'src/StatHist.h' --- src/StatHist.h 2012-05-30 03:36:54 +0000 +++ src/StatHist.h 2012-08-28 13:00:30 +0000 @@ -32,7 +32,6 @@ /* for StoreEntry */ #include "Store.h" - /// function signature for in/out StatHist adaptation typedef double hbase_f(double); === modified file 'src/Store.h' --- src/Store.h 2012-08-14 11:53:07 +0000 +++ src/Store.h 2012-08-28 13:00:30 +0000 @@ -55,7 +55,6 @@ #include #endif - class AsyncCall; class HttpRequest; class MemObject; @@ -254,14 +253,12 @@ void trimMemory(const bool preserveSwappable) {} - static NullStoreEntry _instance; }; /// \ingroup StoreAPI typedef void (*STOREGETCLIENT) (StoreEntry *, void *cbdata); - /** \ingroup StoreAPI * Abstract base class that will replace the whole store and swapdir interface. === modified file 'src/StoreClient.h' --- src/StoreClient.h 2012-08-14 11:53:07 +0000 +++ src/StoreClient.h 2012-08-28 13:00:30 +0000 @@ -129,5 +129,4 @@ SQUIDCEXTERN void storeClientCopy(store_client *, StoreEntry *, StoreIOBuffer, STCB *, void *); - #endif /* SQUID_STORECLIENT_H */ === modified file 'src/StoreFileSystem.h' --- src/StoreFileSystem.h 2012-08-14 11:53:07 +0000 +++ src/StoreFileSystem.h 2012-08-28 13:00:30 +0000 @@ -146,5 +146,4 @@ // TODO: Kill this typedef! typedef StoreFileSystem storefs_entry_t; - #endif /* SQUID_STOREFILESYSTEM_H */ === modified file 'src/StoreMeta.cc' --- src/StoreMeta.cc 2012-08-14 11:53:07 +0000 +++ src/StoreMeta.cc 2012-08-28 13:00:30 +0000 @@ -111,7 +111,6 @@ return true; } - StoreMeta * StoreMeta::Factory (char type, size_t len, void const *value) { === modified file 'src/StoreStats.cc' --- src/StoreStats.cc 2012-01-20 18:55:04 +0000 +++ src/StoreStats.cc 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ #include "protos.h" /* for xmemset only */ #include "StoreStats.h" - /* StoreInfoStats */ StoreInfoStats::StoreInfoStats() @@ -51,8 +50,6 @@ return *this; } - - /* StoreIoStats */ StoreIoStats::StoreIoStats() === modified file 'src/StoreStats.h' --- src/StoreStats.h 2011-10-16 04:01:39 +0000 +++ src/StoreStats.h 2012-08-28 13:00:30 +0000 @@ -34,11 +34,9 @@ bool shared; ///< whether memory cache is shared among workers }; - StoreInfoStats(); StoreInfoStats &operator +=(const StoreInfoStats &stats); - Swap swap; ///< cache_mem stats Mem mem; ///< all cache_dirs stats === modified file 'src/StoreSwapLogData.h' --- src/StoreSwapLogData.h 2012-08-14 11:53:07 +0000 +++ src/StoreSwapLogData.h 2012-08-28 13:00:30 +0000 @@ -225,5 +225,4 @@ int32_t record_size; }; - #endif /* SQUID_STORESWAPLOGDATA_H */ === modified file 'src/String.cc' --- src/String.cc 2012-08-14 11:53:07 +0000 +++ src/String.cc 2012-08-28 13:00:30 +0000 @@ -51,7 +51,6 @@ return size(); } - // low-level buffer allocation, // does not free old buffer and does not adjust or look at len_ void @@ -264,7 +263,6 @@ return rv; } - #if DEBUGSTRINGS void String::stat(StoreEntry *entry) const @@ -497,8 +495,6 @@ return c-rawBuf(); } - - #if !_USE_INLINE_ #include "String.cci" #endif === modified file 'src/String.cci' --- src/String.cci 2012-08-14 11:53:07 +0000 +++ src/String.cci 2012-08-28 13:00:30 +0000 @@ -42,7 +42,6 @@ #endif /* INT_MAX */ #endif /* HAVE_STDINT_H */ - String::String() : size_(0), len_(0), buf_ (NULL) { #if DEBUGSTRINGS @@ -86,7 +85,6 @@ return buf_[aPos]; } - /// compare NULL and empty strings because str*cmp() may fail on NULL strings /// and because we need to return consistent results for strncmp(count == 0). bool @@ -105,7 +103,6 @@ return true; } - int String::cmp (char const *aString) const { @@ -162,7 +159,6 @@ return caseCmp(str.rawBuf(),str.size()); } - void String::set(char const *loc, char const ch) { === modified file 'src/SwapDir.cc' --- src/SwapDir.cc 2012-08-14 11:53:07 +0000 +++ src/SwapDir.cc 2012-08-28 13:00:30 +0000 @@ -150,7 +150,6 @@ return true; // kids may provide more tests and should report true load } - void SwapDir::sync() {} === modified file 'src/acl/Acl.cc' --- src/acl/Acl.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Acl.cc 2012-08-28 13:00:30 +0000 @@ -209,7 +209,6 @@ return false; } - ACLList::ACLList() : op (1), _acl (NULL), next (NULL) {} @@ -341,7 +340,6 @@ return true; } - /*********************/ /* Destroy functions */ /*********************/ === modified file 'src/acl/Acl.h' --- src/acl/Acl.h 2012-08-14 11:53:07 +0000 +++ src/acl/Acl.h 2012-08-28 13:00:30 +0000 @@ -213,7 +213,6 @@ MEMPROXY_CLASS_INLINE(acl_proxy_auth_match_cache); - /// \ingroup ACLAPI extern const char *AclMatchedName; /* NULL */ === modified file 'src/acl/Arp.cc' --- src/acl/Arp.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Arp.cc 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ static SplayNode::SPLAYCMP aclArpCompare; static SplayNode::SPLAYWALKEE aclDumpArpListWalkee; - ACL * ACLARP::clone() const { @@ -132,7 +131,6 @@ return q; } - /*******************/ /* aclParseArpList */ /*******************/ === modified file 'src/acl/Asn.cc' --- src/acl/Asn.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Asn.cc 2012-08-28 13:00:30 +0000 @@ -56,7 +56,6 @@ /* BEGIN of definitions for radix tree entries */ - /* 32/128 bits address in memory with length */ class m_ADDR { @@ -114,7 +113,6 @@ static STCB asHandleReply; - #if defined(__cplusplus) extern "C" { #endif @@ -233,7 +231,6 @@ /* PRIVATE */ - static void asnCacheStart(int as) { @@ -391,7 +388,6 @@ cbdataFree(asState); } - /** * add a network (addr, mask) to the radix tree, with matching AS number */ @@ -631,7 +627,6 @@ ACLSourceASNStrategy ACLSourceASNStrategy::Instance_; - int ACLDestinationASNStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/Browser.cc' --- src/acl/Browser.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Browser.cc 2012-08-28 13:00:30 +0000 @@ -43,4 +43,3 @@ template class ACLRequestHeaderStrategy; - === modified file 'src/acl/Certificate.cc' --- src/acl/Certificate.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Certificate.cc 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ #include "fde.h" #include "globals.h" - int ACLCertificateStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/Checklist.cc' --- src/acl/Checklist.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Checklist.cc 2012-08-28 13:00:30 +0000 @@ -263,7 +263,6 @@ return true; } - /// Check whether a single ACL matches, returning NodeMatchingResult ACLChecklist::NodeMatchingResult ACLChecklist::matchNode(const ACLList &node, bool const fast) @@ -336,7 +335,6 @@ debugs(28, 4, "ACLChecklist::~ACLChecklist: destroyed " << this); } - void ACLChecklist::AsyncState::changeState (ACLChecklist *checklist, AsyncState *newState) const { === modified file 'src/acl/Checklist.h' --- src/acl/Checklist.h 2012-06-28 18:26:44 +0000 +++ src/acl/Checklist.h 2012-08-28 13:00:30 +0000 @@ -86,7 +86,6 @@ static NullState _instance; }; - public: ACLChecklist(); virtual ~ACLChecklist(); === modified file 'src/acl/DestinationDomain.cc' --- src/acl/DestinationDomain.cc 2012-08-14 11:53:07 +0000 +++ src/acl/DestinationDomain.cc 2012-08-28 13:00:30 +0000 @@ -72,7 +72,6 @@ checklist->matchNonBlocking(); } - int ACLDestinationDomainStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/DestinationIp.cc' --- src/acl/DestinationIp.cc 2012-08-14 11:53:07 +0000 +++ src/acl/DestinationIp.cc 2012-08-28 13:00:30 +0000 @@ -111,8 +111,6 @@ checklist->matchNonBlocking(); } - - ACL * ACLDestinationIP::clone() const { === modified file 'src/acl/DomainData.cc' --- src/acl/DomainData.cc 2012-08-14 11:53:07 +0000 +++ src/acl/DomainData.cc 2012-08-28 13:00:30 +0000 @@ -81,7 +81,6 @@ return matchDomainName(h, d); } - /* compare two domains */ template @@ -167,7 +166,6 @@ return domains->empty(); } - ACLData * ACLDomainData::clone() const { === modified file 'src/acl/Eui64.cc' --- src/acl/Eui64.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Eui64.cc 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ static SplayNode::SPLAYCMP aclEui64Compare; static SplayNode::SPLAYWALKEE aclDumpEuiListWalkee; - ACL * ACLEui64::clone() const { @@ -106,7 +105,6 @@ return q; } - /*******************/ /* aclParseEuiList */ /*******************/ === modified file 'src/acl/Eui64.h' --- src/acl/Eui64.h 2009-11-01 00:13:06 +0000 +++ src/acl/Eui64.h 2012-08-28 13:00:30 +0000 @@ -41,7 +41,6 @@ class Eui64; }; - /// \ingroup ACLAPI class ACLEui64 : public ACL { === modified file 'src/acl/FilledChecklist.cc' --- src/acl/FilledChecklist.cc 2012-08-14 11:53:07 +0000 +++ src/acl/FilledChecklist.cc 2012-08-28 13:00:30 +0000 @@ -10,10 +10,8 @@ #include "auth/AclProxyAuth.h" #endif - CBDATA_CLASS_INIT(ACLFilledChecklist); - void * ACLFilledChecklist::operator new (size_t size) { @@ -30,7 +28,6 @@ cbdataFree(t); } - ACLFilledChecklist::ACLFilledChecklist() : dst_peer(NULL), dst_rdns(NULL), @@ -57,7 +54,6 @@ rfc931[0] = '\0'; } - ACLFilledChecklist::~ACLFilledChecklist() { assert (!asyncInProgress()); @@ -80,7 +76,6 @@ debugs(28, 4, HERE << "ACLFilledChecklist destroyed " << this); } - ConnStateData * ACLFilledChecklist::conn() const { === modified file 'src/acl/Gadgets.cc' --- src/acl/Gadgets.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Gadgets.cc 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ #include "HttpRequest.h" #include "protos.h" - /* does name lookup, returns page_id */ err_type aclGetDenyInfoPage(acl_deny_info_list ** head, const char *name, int redirect_allowed) @@ -99,7 +98,6 @@ return false; } - /* maex@space.net (05.09.96) * get the info for redirecting "access denied" to info pages * TODO (probably ;-) @@ -235,8 +233,6 @@ } } - - /*********************/ /* Destroy functions */ /*********************/ === modified file 'src/acl/HierCode.cc' --- src/acl/HierCode.cc 2012-08-14 11:53:07 +0000 +++ src/acl/HierCode.cc 2012-08-28 13:00:30 +0000 @@ -8,7 +8,6 @@ template class ACLStrategised; - int ACLHierCodeStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/HttpRepHeader.cc' --- src/acl/HttpRepHeader.cc 2012-08-14 11:53:07 +0000 +++ src/acl/HttpRepHeader.cc 2012-08-28 13:00:30 +0000 @@ -39,8 +39,6 @@ #include "acl/Checklist.h" #include "HttpReply.h" - - int ACLHTTPRepHeaderStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/HttpReqHeader.cc' --- src/acl/HttpReqHeader.cc 2012-08-14 11:53:07 +0000 +++ src/acl/HttpReqHeader.cc 2012-08-28 13:00:30 +0000 @@ -39,8 +39,6 @@ #include "acl/Checklist.h" #include "HttpRequest.h" - - int ACLHTTPReqHeaderStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/HttpStatus.cc' --- src/acl/HttpStatus.cc 2012-08-24 09:57:00 +0000 +++ src/acl/HttpStatus.cc 2012-08-28 13:00:30 +0000 @@ -85,8 +85,6 @@ return ret; } - - ACL * ACLHTTPStatus::clone() const { @@ -136,7 +134,6 @@ return new acl_httpstatus_data(status, INT_MAX); } - void ACLHTTPStatus::parse() { === modified file 'src/acl/Ip.cc' --- src/acl/Ip.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Ip.cc 2012-08-28 13:00:30 +0000 @@ -148,7 +148,6 @@ } } - /* * acl_ip_data::NetworkCompare - Compare two acl_ip_data entries. Strictly * used by the splay insertion routine. It emits a warning if it === modified file 'src/acl/LocalIp.cc' --- src/acl/LocalIp.cc 2012-08-14 11:53:07 +0000 +++ src/acl/LocalIp.cc 2012-08-28 13:00:30 +0000 @@ -49,9 +49,6 @@ return ACLIP::match (Filled(checklist)->my_addr); } - - - ACL * ACLLocalIP::clone() const { === modified file 'src/acl/Method.cc' --- src/acl/Method.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Method.cc 2012-08-28 13:00:30 +0000 @@ -43,8 +43,6 @@ template class ACLStrategised; - - int ACLMethodStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/PeerName.cc' --- src/acl/PeerName.cc 2012-08-14 11:53:07 +0000 +++ src/acl/PeerName.cc 2012-08-28 13:00:30 +0000 @@ -4,8 +4,6 @@ #include "acl/StringData.h" #include "acl/Checklist.h" - - int ACLPeerNameStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/Protocol.cc' --- src/acl/Protocol.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Protocol.cc 2012-08-28 13:00:30 +0000 @@ -43,8 +43,6 @@ template class ACLStrategised; - - int ACLProtocolStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/Referer.cc' --- src/acl/Referer.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Referer.cc 2012-08-28 13:00:30 +0000 @@ -43,4 +43,3 @@ template class ACLRequestHeaderStrategy; - === modified file 'src/acl/ReplyMimeType.cc' --- src/acl/ReplyMimeType.cc 2012-08-14 11:53:07 +0000 +++ src/acl/ReplyMimeType.cc 2012-08-28 13:00:30 +0000 @@ -43,4 +43,3 @@ template class ACLReplyHeaderStrategy; - === modified file 'src/acl/RequestMimeType.cc' --- src/acl/RequestMimeType.cc 2012-08-14 11:53:07 +0000 +++ src/acl/RequestMimeType.cc 2012-08-28 13:00:30 +0000 @@ -43,4 +43,3 @@ template class ACLRequestHeaderStrategy; - === modified file 'src/acl/SourceDomain.cc' --- src/acl/SourceDomain.cc 2012-08-14 11:53:07 +0000 +++ src/acl/SourceDomain.cc 2012-08-28 13:00:30 +0000 @@ -70,7 +70,6 @@ checklist->matchNonBlocking(); } - int ACLSourceDomainStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/SourceIp.cc' --- src/acl/SourceIp.cc 2012-08-14 11:53:07 +0000 +++ src/acl/SourceIp.cc 2012-08-28 13:00:30 +0000 @@ -49,8 +49,6 @@ return ACLIP::match(Filled(checklist)->src_addr); } - - ACL * ACLSourceIP::clone() const { === modified file 'src/acl/StringData.h' --- src/acl/StringData.h 2009-03-08 19:34:36 +0000 +++ src/acl/StringData.h 2012-08-28 13:00:30 +0000 @@ -39,7 +39,6 @@ #include "acl/Acl.h" #include "acl/Data.h" - class ACLStringData : public ACLData { === modified file 'src/acl/Time.cc' --- src/acl/Time.cc 2012-08-14 11:53:07 +0000 +++ src/acl/Time.cc 2012-08-28 13:00:30 +0000 @@ -39,7 +39,6 @@ #include "acl/TimeData.h" #include "SquidTime.h" - int ACLTimeStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/UrlPort.cc' --- src/acl/UrlPort.cc 2012-08-14 11:53:07 +0000 +++ src/acl/UrlPort.cc 2012-08-28 13:00:30 +0000 @@ -39,7 +39,6 @@ #include "acl/Checklist.h" #include "HttpRequest.h" - int ACLUrlPortStrategy::match (ACLData * &data, ACLFilledChecklist *checklist) { === modified file 'src/acl/UserData.cc' --- src/acl/UserData.cc 2012-08-14 11:53:07 +0000 +++ src/acl/UserData.cc 2012-08-28 13:00:30 +0000 @@ -161,7 +161,6 @@ } } - bool ACLUserData::empty() const { === modified file 'src/adaptation/AccessRule.cc' --- src/adaptation/AccessRule.cc 2012-08-24 09:57:00 +0000 +++ src/adaptation/AccessRule.cc 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ return FindGroup(groupId); } - Adaptation::AccessRules & Adaptation::AllRules() { === modified file 'src/adaptation/Answer.cc' --- src/adaptation/Answer.cc 2012-01-20 18:55:04 +0000 +++ src/adaptation/Answer.cc 2012-08-28 13:00:30 +0000 @@ -24,7 +24,6 @@ return answer; } - Adaptation::Answer Adaptation::Answer::Block(const String &aRule) { === modified file 'src/adaptation/Config.cc' --- src/adaptation/Config.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/Config.cc 2012-08-28 13:00:30 +0000 @@ -54,7 +54,6 @@ int Adaptation::Config::use_indirect_client = true; Adaptation::Config::MetaHeaders Adaptation::Config::metaHeaders; - Adaptation::Config::MetaHeader::Value::~Value() { aclDestroyAclList(&aclList); @@ -101,7 +100,6 @@ return meta; } - Adaptation::ServiceConfig* Adaptation::Config::newServiceConfig() const { === modified file 'src/adaptation/Elements.cc' --- src/adaptation/Elements.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/Elements.cc 2012-08-28 13:00:30 +0000 @@ -27,7 +27,6 @@ return "NONE"; } - const char * Adaptation::vectPointStr(Adaptation::VectPoint point) { @@ -48,4 +47,3 @@ return "NONE"; } - === modified file 'src/adaptation/History.cc' --- src/adaptation/History.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/History.cc 2012-08-28 13:00:30 +0000 @@ -32,7 +32,6 @@ return theRptm; } - Adaptation::History::History(): lastMeta(hoReply), allMeta(hoReply), === modified file 'src/adaptation/History.h' --- src/adaptation/History.h 2011-04-14 16:58:28 +0000 +++ src/adaptation/History.h 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ namespace Adaptation { - /// collects information about adaptations related to a master transaction class History: public RefCountable { === modified file 'src/adaptation/Initiate.cc' --- src/adaptation/Initiate.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/Initiate.cc 2012-08-28 13:00:30 +0000 @@ -52,7 +52,6 @@ theInitiator = i; } - // internal cleanup void Adaptation::Initiate::swanSong() { @@ -79,7 +78,6 @@ clearInitiator(); } - void Adaptation::Initiate::tellQueryAborted(bool final) { sendAnswer(Answer::Error(final)); === modified file 'src/adaptation/Iterator.cc' --- src/adaptation/Iterator.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/Iterator.cc 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include "HttpReply.h" #include "HttpMsg.h" - Adaptation::Iterator::Iterator( HttpMsg *aMsg, HttpRequest *aCause, const ServiceGroupPointer &aGroup): === modified file 'src/adaptation/Iterator.h' --- src/adaptation/Iterator.h 2011-03-11 23:02:23 +0000 +++ src/adaptation/Iterator.h 2012-08-28 13:00:30 +0000 @@ -66,5 +66,4 @@ } // namespace Adaptation - #endif /* SQUID_ADAPTATION__ITERATOR_H */ === modified file 'src/adaptation/Service.cc' --- src/adaptation/Service.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/Service.cc 2012-08-28 13:00:30 +0000 @@ -51,7 +51,6 @@ return true; } - Adaptation::Services & Adaptation::AllServices() { === modified file 'src/adaptation/ServiceConfig.cc' --- src/adaptation/ServiceConfig.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/ServiceConfig.cc 2012-08-28 13:00:30 +0000 @@ -250,7 +250,6 @@ return true; } - bool Adaptation::ServiceConfig::grokBool(bool &var, const char *name, const char *value) { === modified file 'src/adaptation/ServiceFilter.cc' --- src/adaptation/ServiceFilter.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/ServiceFilter.cc 2012-08-28 13:00:30 +0000 @@ -3,7 +3,6 @@ #include "HttpReply.h" #include "adaptation/ServiceFilter.h" - Adaptation::ServiceFilter::ServiceFilter(Method aMethod, VectPoint aPoint, HttpRequest *aReq, HttpReply *aRep): method(aMethod), point(aPoint), request(HTTPMSGLOCK(aReq)), === modified file 'src/adaptation/ServiceGroups.cc' --- src/adaptation/ServiceGroups.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/ServiceGroups.cc 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ #include "protos.h" #include "wordlist.h" - Adaptation::ServiceGroup::ServiceGroup(const String &aKind, bool allSame): kind(aKind), method(methodNone), point(pointNone), allServicesSame(allSame) @@ -195,14 +194,12 @@ return !allServicesSame && findService(filter, pos); } - /* ServiceSet */ Adaptation::ServiceSet::ServiceSet(): ServiceGroup("adaptation set", true) { } - /* SingleService */ Adaptation::SingleService::SingleService(const String &aServiceId): @@ -212,14 +209,12 @@ services.push_back(aServiceId); } - /* ServiceChain */ Adaptation::ServiceChain::ServiceChain(): ServiceGroup("adaptation chain", false) { } - /* DynamicServiceChain */ Adaptation::DynamicServiceChain::DynamicServiceChain( @@ -315,7 +310,6 @@ (atEof ? ".]" : "]"); } - /* globals */ Adaptation::Groups & === modified file 'src/adaptation/ServiceGroups.h' --- src/adaptation/ServiceGroups.h 2011-08-10 15:54:51 +0000 +++ src/adaptation/ServiceGroups.h 2012-08-28 13:00:30 +0000 @@ -108,7 +108,6 @@ DynamicGroupCfg ¤t, DynamicGroupCfg &future); }; - /** iterates services stored in a group; iteration is not linear because we need to both replace failed services and advance to the next chain link */ class ServicePlan @@ -146,7 +145,6 @@ extern Groups &AllGroups(); extern ServiceGroupPointer FindGroup(const ServiceGroup::Id &id); - } // namespace Adaptation #endif /* SQUID_ADAPTATION__SERVICE_GROUPS_H */ === modified file 'src/adaptation/ecap/Config.cc' --- src/adaptation/ecap/Config.cc 2012-08-24 09:57:00 +0000 +++ src/adaptation/ecap/Config.cc 2012-08-28 13:00:30 +0000 @@ -39,7 +39,6 @@ return new Adaptation::Ecap::ServiceRep(cfg); } - /* ServiceConfig */ bool === modified file 'src/adaptation/ecap/Config.h' --- src/adaptation/ecap/Config.h 2011-08-03 08:30:00 +0000 +++ src/adaptation/ecap/Config.h 2012-08-28 13:00:30 +0000 @@ -29,7 +29,6 @@ Extensions extensions; }; - /// General eCAP configuration class Config: public Adaptation::Config { === modified file 'src/adaptation/ecap/Host.cc' --- src/adaptation/ecap/Host.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/ecap/Host.cc 2012-08-28 13:00:30 +0000 @@ -111,7 +111,6 @@ Debug::finishDebug(); } - Adaptation::Ecap::Host::MessagePtr Adaptation::Ecap::Host::newRequest() const { === modified file 'src/adaptation/ecap/MessageRep.cc' --- src/adaptation/ecap/MessageRep.cc 2012-08-21 16:15:33 +0000 +++ src/adaptation/ecap/MessageRep.cc 2012-08-28 13:00:30 +0000 @@ -111,7 +111,6 @@ return HDR_OTHER; } - /* FirstLineRep */ Adaptation::Ecap::FirstLineRep::FirstLineRep(HttpMsg &aMessage): theMessage(aMessage) @@ -193,7 +192,6 @@ return AnyP::PROTO_UNKNOWN; } - /* RequestHeaderRep */ Adaptation::Ecap::RequestLineRep::RequestLineRep(HttpRequest &aMessage): @@ -284,7 +282,6 @@ FirstLineRep::protocol(p); } - /* ReplyHeaderRep */ Adaptation::Ecap::StatusLineRep::StatusLineRep(HttpReply &aMessage): @@ -364,7 +361,6 @@ return !theBody ? BodySize() : BodySize(theBody->bodySize()); } - /* MessageRep */ Adaptation::Ecap::MessageRep::MessageRep(HttpMsg *rawHeader): === modified file 'src/adaptation/ecap/MessageRep.h' --- src/adaptation/ecap/MessageRep.h 2011-03-11 21:57:27 +0000 +++ src/adaptation/ecap/MessageRep.h 2012-08-28 13:00:30 +0000 @@ -53,7 +53,6 @@ HttpMsg &theMessage; // the message being translated to libecap }; - // Helps translate Squid HttpMsg into libecap::FirstLine (see children). class FirstLineRep { @@ -123,7 +122,6 @@ HttpReply &theMessage; // the request header being translated to libecap }; - // Translates Squid BodyPipe into libecap::Body. class BodyRep: public libecap::Body { === modified file 'src/adaptation/ecap/ServiceRep.cc' --- src/adaptation/ecap/ServiceRep.cc 2012-08-21 16:15:33 +0000 +++ src/adaptation/ecap/ServiceRep.cc 2012-08-28 13:00:30 +0000 @@ -42,7 +42,6 @@ } // namespace Ecap } // namespace Adaptation - Adaptation::Ecap::ConfigRep::ConfigRep(const Master &aMaster): master(aMaster) { } @@ -77,8 +76,6 @@ visitor.visit(Name(i->first), Area::FromTempString(i->second)); } - - Adaptation::Ecap::ServiceRep::ServiceRep(const ServiceConfigPointer &cfg): /*AsyncJob("Adaptation::Ecap::ServiceRep"),*/ Adaptation::Service(cfg), isDetached(false) === modified file 'src/adaptation/ecap/XactionRep.cc' --- src/adaptation/ecap/XactionRep.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/ecap/XactionRep.cc 2012-08-28 13:00:30 +0000 @@ -18,7 +18,6 @@ CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Ecap::XactionRep, XactionRep); - /// a libecap Visitor for converting adapter transaction options to HttpHeader class OptionsExtractor: public libecap::NamedValueVisitor { @@ -464,7 +463,6 @@ adaptedReq->adaptHistoryImport(*request); } - void Adaptation::Ecap::XactionRep::vbDiscard() { @@ -678,7 +676,6 @@ if (vbProductionFinished) buf.append(".", 1); - buf.Printf(" A%d", static_cast(proxyingAb)); if (proxyingAb == opOn) { === modified file 'src/adaptation/icap/Client.h' --- src/adaptation/icap/Client.h 2009-08-23 09:30:49 +0000 +++ src/adaptation/icap/Client.h 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ // ICAP-related things needed by code unaware of ICAP internals. - namespace Adaptation { namespace Icap @@ -45,7 +44,6 @@ extern void InitModule(); extern void CleanModule(); - } // namespace Icap } // namespace Adaptation === modified file 'src/adaptation/icap/Config.h' --- src/adaptation/icap/Config.h 2011-03-08 23:56:22 +0000 +++ src/adaptation/icap/Config.h 2012-08-28 13:00:30 +0000 @@ -81,7 +81,6 @@ extern Config TheConfig; - } // namespace Icap } // namespace Adaptation === modified file 'src/adaptation/icap/Elements.h' --- src/adaptation/icap/Elements.h 2011-09-06 21:27:17 +0000 +++ src/adaptation/icap/Elements.h 2012-08-28 13:00:30 +0000 @@ -38,7 +38,6 @@ // ICAP-related things shared by many ICAP classes - namespace Adaptation { namespace Icap === modified file 'src/adaptation/icap/InOut.h' --- src/adaptation/icap/InOut.h 2009-08-23 09:30:49 +0000 +++ src/adaptation/icap/InOut.h 2012-08-28 13:00:30 +0000 @@ -43,7 +43,6 @@ // as the "cause". ICAP transactions use this class to store virgin // and adapted HTTP messages. - namespace Adaptation { namespace Icap @@ -90,7 +89,6 @@ // TODO: s/Header/Message/i ? - } // namespace Icap } // namespace Adaptation === modified file 'src/adaptation/icap/Launcher.cc' --- src/adaptation/icap/Launcher.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/icap/Launcher.cc 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ #include "HttpRequest.h" #include "HttpReply.h" - Adaptation::Icap::Launcher::Launcher(const char *aTypeName, Adaptation::ServicePointer &aService): AsyncJob(aTypeName), === modified file 'src/adaptation/icap/Launcher.h' --- src/adaptation/icap/Launcher.h 2010-12-15 17:52:35 +0000 +++ src/adaptation/icap/Launcher.h 2012-08-28 13:00:30 +0000 @@ -58,7 +58,6 @@ * ICAP transactions. */ - namespace Adaptation { namespace Icap @@ -136,5 +135,4 @@ } // namespace Icap } // namespace Adaptation - #endif /* SQUID_ICAPLAUNCHER_H */ === modified file 'src/adaptation/icap/ModXact.cc' --- src/adaptation/icap/ModXact.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/icap/ModXact.cc 2012-08-28 13:00:30 +0000 @@ -716,8 +716,6 @@ } } - - // note that allocation for echoing is done in handle204NoContent() void Adaptation::Icap::ModXact::maybeAllocateHttpMsg() { @@ -1318,7 +1316,6 @@ Xaction::finalizeLogInfo(); } - void Adaptation::Icap::ModXact::makeRequestHeaders(MemBuf &buf) { char ntoabuf[MAX_IPSTRLEN]; @@ -1365,7 +1362,6 @@ } } - buf.Printf("Encapsulated: "); MemBuf httpBuf; @@ -1785,7 +1781,6 @@ adapted.body_pipe << " pipe"); } - // TODO: Move SizedEstimate and Preview elsewhere Adaptation::Icap::SizedEstimate::SizedEstimate() @@ -1814,8 +1809,6 @@ return static_cast(theData); } - - Adaptation::Icap::VirginBodyAct::VirginBodyAct(): theStart(0), theState(stUndecided) {} @@ -1847,7 +1840,6 @@ return static_cast(theStart); } - Adaptation::Icap::Preview::Preview(): theWritten(0), theAd(0), theState(stDisabled) {} === modified file 'src/adaptation/icap/ModXact.h' --- src/adaptation/icap/ModXact.h 2012-06-19 21:51:49 +0000 +++ src/adaptation/icap/ModXact.h 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ * receive the HTTP body. */ - class ChunkedCodingParser; namespace Adaptation @@ -106,7 +105,6 @@ State theState; }; - // maintains preview-related sizes class Preview @@ -365,7 +363,6 @@ CBDATA_CLASS2(ModXactLauncher); }; - } // namespace Icap } // namespace Adaptation === modified file 'src/adaptation/icap/OptXact.cc' --- src/adaptation/icap/OptXact.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/icap/OptXact.cc 2012-08-28 13:00:30 +0000 @@ -17,7 +17,6 @@ CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, OptXact); CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, OptXactLauncher); - Adaptation::Icap::OptXact::OptXact(Adaptation::Icap::ServiceRep::Pointer &aService): AsyncJob("Adaptation::Icap::OptXact"), Adaptation::Icap::Xaction("Adaptation::Icap::OptXact", aService), === modified file 'src/adaptation/icap/OptXact.h' --- src/adaptation/icap/OptXact.h 2010-09-12 21:58:38 +0000 +++ src/adaptation/icap/OptXact.h 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ #include "adaptation/icap/Xaction.h" #include "adaptation/icap/Launcher.h" - namespace Adaptation { namespace Icap @@ -89,7 +88,6 @@ CBDATA_CLASS2(OptXactLauncher); }; - } // namespace Icap } // namespace Adaptation === modified file 'src/adaptation/icap/Options.cc' --- src/adaptation/icap/Options.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/icap/Options.cc 2012-08-28 13:00:30 +0000 @@ -155,7 +155,6 @@ list.report(5, "Adaptation::Icap::Options::cfgTransferList: "); } - /* Adaptation::Icap::Options::TransferList */ Adaptation::Icap::Options::TransferList::TransferList(): extensions(NULL), name(NULL), === modified file 'src/adaptation/icap/Options.h' --- src/adaptation/icap/Options.h 2012-08-14 11:53:07 +0000 +++ src/adaptation/icap/Options.h 2012-08-28 13:00:30 +0000 @@ -122,9 +122,6 @@ void cfgTransferList(const HttpHeader *h, TransferList &l); }; - - - } // namespace Icap } // namespace Adaptation === modified file 'src/adaptation/icap/ServiceRep.cc' --- src/adaptation/icap/ServiceRep.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/icap/ServiceRep.cc 2012-08-28 13:00:30 +0000 @@ -295,7 +295,6 @@ return (available != 0); // it is -1 (no limit) or has available slots } - bool Adaptation::Icap::ServiceRep::wantsUrl(const String &urlPath) const { Must(hasOptions()); @@ -331,7 +330,6 @@ return false; } - static void ServiceRep_noteTimeToUpdate(void *data) { @@ -492,7 +490,6 @@ } } - /* * Check the ICAP server's date header for clock skew */ === modified file 'src/adaptation/icap/ServiceRep.h' --- src/adaptation/icap/ServiceRep.h 2011-09-06 21:27:17 +0000 +++ src/adaptation/icap/ServiceRep.h 2012-08-28 13:00:30 +0000 @@ -81,7 +81,6 @@ * auto-destroyed by refcounting when no longer used. */ - class ServiceRep : public RefCountable, public Adaptation::Service, public Adaptation::Initiator { === modified file 'src/adaptation/icap/Xaction.cc' --- src/adaptation/icap/Xaction.cc 2012-08-14 11:53:07 +0000 +++ src/adaptation/icap/Xaction.cc 2012-08-28 13:00:30 +0000 @@ -25,7 +25,6 @@ #include "protos.h" #include "SquidTime.h" - //CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, Xaction); Adaptation::Icap::Xaction::Xaction(const char *aTypeName, Adaptation::Icap::ServiceRep::Pointer &aService): @@ -333,7 +332,6 @@ Adaptation::Initiate::callException(e); } - void Adaptation::Icap::Xaction::callEnd() { if (doneWithIo()) { @@ -537,7 +535,6 @@ } } - void Adaptation::Icap::Xaction::maybeLog() { if (IcapLogfileStatus == LOG_ENABLE) { === modified file 'src/adaptation/icap/Xaction.h' --- src/adaptation/icap/Xaction.h 2012-07-18 16:21:47 +0000 +++ src/adaptation/icap/Xaction.h 2012-08-28 13:00:30 +0000 @@ -193,7 +193,6 @@ //CBDATA_CLASS2(Xaction); }; - } // namespace Icap } // namespace Adaptation === modified file 'src/auth/User.cc' --- src/auth/User.cc 2012-08-14 11:53:07 +0000 +++ src/auth/User.cc 2012-08-28 13:00:30 +0000 @@ -80,7 +80,6 @@ credentials_state = newCreds; } - /** * Combine two user structs. ONLY to be called from within a scheme * module. The scheme module is responsible for ensuring that the === modified file 'src/auth/UserRequest.cc' --- src/auth/UserRequest.cc 2012-08-14 11:53:07 +0000 +++ src/auth/UserRequest.cc 2012-08-28 13:00:30 +0000 @@ -193,7 +193,6 @@ return auth_user_request->user()->ipcount; } - /* * authenticateUserAuthenticated: is this auth_user structure logged in ? */ === modified file 'src/auth/basic/auth_basic.cc' --- src/auth/basic/auth_basic.cc 2012-08-14 11:53:07 +0000 +++ src/auth/basic/auth_basic.cc 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ - #include "squid.h" #include "auth/basic/auth_basic.h" #include "auth/basic/Scheme.h" @@ -61,7 +60,6 @@ static int authbasic_initialised = 0; - /* * * Public Functions === modified file 'src/auth/digest/auth_digest.cc' --- src/auth/digest/auth_digest.cc 2012-08-14 11:53:07 +0000 +++ src/auth/digest/auth_digest.cc 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ - #include "squid.h" #include "rfc2617.h" #include "auth/digest/auth_digest.h" @@ -678,7 +677,6 @@ return Auth::Digest::Scheme::GetInstance()->type(); } - static void authenticateDigestStats(StoreEntry * sentry) { @@ -920,7 +918,6 @@ temp.clean(); - /* now we validate the data given to us */ /* @@ -1035,7 +1032,6 @@ /* the method we'll check at the authenticate step as well */ - /* we don't send or parse opaques. Ok so we're flexable ... */ /* find the user */ === modified file 'src/auth/negotiate/auth_negotiate.cc' --- src/auth/negotiate/auth_negotiate.cc 2012-08-14 11:53:07 +0000 +++ src/auth/negotiate/auth_negotiate.cc 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ - #include "squid.h" #include "auth/negotiate/auth_negotiate.h" #include "auth/Gadgets.h" === modified file 'src/auth/ntlm/auth_ntlm.cc' --- src/auth/ntlm/auth_ntlm.cc 2012-08-14 11:53:07 +0000 +++ src/auth/ntlm/auth_ntlm.cc 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ - #include "squid.h" #include "auth/Gadgets.h" #include "auth/ntlm/auth_ntlm.h" === modified file 'src/base/AsyncCall.cc' --- src/base/AsyncCall.cc 2012-08-14 11:53:07 +0000 +++ src/base/AsyncCall.cc 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ InstanceIdDefinitions(AsyncCall, "call"); - /* AsyncCall */ AsyncCall::AsyncCall(int aDebugSection, int aDebugLevel, === modified file 'src/base/AsyncCall.h' --- src/base/AsyncCall.h 2011-01-31 11:50:28 +0000 +++ src/base/AsyncCall.h 2012-08-28 13:00:30 +0000 @@ -162,5 +162,4 @@ /** Call scheduling helper. */ #define ScheduleCallHere(call) ScheduleCall(__FILE__, __LINE__, (call)) - #endif /* SQUID_ASYNCCALL_H */ === modified file 'src/base/AsyncCallQueue.cc' --- src/base/AsyncCallQueue.cc 2012-08-14 11:53:07 +0000 +++ src/base/AsyncCallQueue.cc 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ AsyncCallQueue *AsyncCallQueue::TheInstance = 0; - AsyncCallQueue::AsyncCallQueue(): theHead(NULL), theTail(NULL) { } === modified file 'src/base/AsyncJob.cc' --- src/base/AsyncJob.cc 2012-08-14 11:53:07 +0000 +++ src/base/AsyncJob.cc 2012-08-28 13:00:30 +0000 @@ -163,4 +163,3 @@ return buf.content(); } - === modified file 'src/base/AsyncJobCalls.h' --- src/base/AsyncJobCalls.h 2012-08-14 11:53:07 +0000 +++ src/base/AsyncJobCalls.h 2012-08-28 13:00:30 +0000 @@ -51,7 +51,6 @@ return ScheduleCall(fileName, fileLine, call); } - #define CallJobHere(debugSection, debugLevel, job, Class, method) \ CallJob((debugSection), (debugLevel), __FILE__, __LINE__, \ (#Class "::" #method), \ @@ -62,13 +61,11 @@ (#Class "::" #method), \ JobMemFun((job), &Class::method, (arg1))) - /// Convenience macro to create a Dialer-based job callback #define JobCallback(dbgSection, dbgLevel, Dialer, job, method) \ asyncCall((dbgSection), (dbgLevel), #method, \ Dialer(CbcPointer(job), &method)) - /* * *MemFunT are member function (i.e., class method) wrappers. They store * details of a method call in an object so that the call can be delayed @@ -123,7 +120,6 @@ // ... add more as needed - // Now we add global templated functions that create the member function // wrappers above. These are for convenience: it is often easier to // call a templated function than to create a templated object. @@ -143,7 +139,6 @@ return UnaryMemFunT(job, method, arg1); } - // inlined methods template === modified file 'src/base/CbcPointer.h' --- src/base/CbcPointer.h 2010-08-31 00:14:13 +0000 +++ src/base/CbcPointer.h 2012-08-28 13:00:30 +0000 @@ -158,5 +158,4 @@ return os << cbc << '/' << lock; } - #endif /* SQUID_CBC_POINTER_H */ === modified file 'src/base/InstanceId.h' --- src/base/InstanceId.h 2011-02-18 12:32:27 +0000 +++ src/base/InstanceId.h 2012-08-28 13:00:30 +0000 @@ -48,7 +48,6 @@ return os << Prefix << value; \ } - /// print the id template inline @@ -57,5 +56,4 @@ return id.print(os); } - #endif /* SQUID_BASE_INSTANCE_ID_H */ === modified file 'src/base/RunnersRegistry.h' --- src/base/RunnersRegistry.h 2012-01-26 14:52:35 +0000 +++ src/base/RunnersRegistry.h 2012-08-28 13:00:30 +0000 @@ -51,7 +51,6 @@ virtual void run(const RunnerRegistry &r) = 0; }; - /// registers a given runner with the given registry and returns registry count int RegisterRunner(const RunnerRegistry ®istry, RegisteredRunner *rr); @@ -60,7 +59,6 @@ /// deletes all runners in the given registry void DeactivateRegistered(const RunnerRegistry ®istry); - /// convenience function to "use" an otherwise unreferenced static variable bool UseThisStatic(const void *); === modified file 'src/cache_cf.cc' --- src/cache_cf.cc 2012-08-14 11:53:07 +0000 +++ src/cache_cf.cc 2012-08-28 13:00:30 +0000 @@ -85,9 +85,6 @@ #include "snmp.h" #endif - - - #if HAVE_GLOB_H #include #endif @@ -623,7 +620,6 @@ return err_count; } - static void configDoConfigure(void) { @@ -1095,7 +1091,6 @@ self_destruct(); } - static void parseBytesLine(size_t * bptr, const char *units) { @@ -3303,7 +3298,6 @@ return option > 0 ? (void*)this : NULL; } - inline void free_YesNoNone(YesNoNone *) { @@ -4247,7 +4241,6 @@ } #endif /* USE_ADAPTATION */ - #if ICAP_CLIENT static void @@ -4286,7 +4279,6 @@ #endif - #if USE_ECAP static void === modified file 'src/cache_diff.cc' --- src/cache_diff.cc 2012-08-15 15:17:32 +0000 +++ src/cache_diff.cc 2012-08-28 13:00:30 +0000 @@ -53,7 +53,6 @@ int bad_del_count; /* #dels with no prior add */ } CacheIndex; - typedef struct _CacheEntry { const cache_key *key; @@ -62,7 +61,6 @@ unsigned char key_arr[SQUID_MD5_DIGEST_LENGTH]; } CacheEntry; - /* copied from url.c */ const char *RequestMethodStr[] = { "NONE", @@ -75,10 +73,8 @@ "PURGE" }; - static int cacheIndexScan(CacheIndex * idx, const char *fname, FILE * file); - static CacheEntry * cacheEntryCreate(const StoreSwapLogData * s) { @@ -265,7 +261,6 @@ cacheIndexCmpReport(idx2, shared_count); } - static int usage(const char *prg_name) { === modified file 'src/cache_manager.cc' --- src/cache_manager.cc 2012-01-27 12:28:26 +0000 +++ src/cache_manager.cc 2012-08-28 13:00:30 +0000 @@ -56,7 +56,6 @@ #include "wordlist.h" #include - /// \ingroup CacheManagerInternal #define MGR_PASSWD_SZ 128 @@ -77,7 +76,6 @@ Handler *handler; }; - /// Registers new profiles, ignoring attempts to register a duplicate void CacheManager::registerProfile(const Mgr::ActionProfile::Pointer &profile) === modified file 'src/cbdata.cc' --- src/cbdata.cc 2012-08-14 11:53:07 +0000 +++ src/cbdata.cc 2012-08-28 13:00:30 +0000 @@ -208,7 +208,6 @@ } #endif - cbdata::~cbdata() { #if USE_CBDATA_DEBUG === modified file 'src/cbdata.h' --- src/cbdata.h 2012-08-14 11:53:07 +0000 +++ src/cbdata.h 2012-08-28 13:00:30 +0000 @@ -276,7 +276,6 @@ /// \ingroup CBDATAAPI extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, int size, FREE * free_func); - /* cbdata macros */ #if USE_CBDATA_DEBUG #define cbdataAlloc(type) ((type *)cbdataInternalAllocDbg(CBDATA_##type,__FILE__,__LINE__)) === modified file 'src/clientStream.cc' --- src/clientStream.cc 2012-08-14 11:53:07 +0000 +++ src/clientStream.cc 2012-08-28 13:00:30 +0000 @@ -108,7 +108,6 @@ /// \ingroup ClientStreamInternal CBDATA_TYPE(clientStreamNode); - /* Local functions */ static FREE clientStreamFree; === modified file 'src/client_db.cc' --- src/client_db.cc 2012-08-14 11:53:07 +0000 +++ src/client_db.cc 2012-08-28 13:00:30 +0000 @@ -44,7 +44,6 @@ #include "StatCounters.h" #include "Store.h" - static hash_table *client_table = NULL; static ClientInfo *clientdbAdd(const Ip::Address &addr); === modified file 'src/client_side.cc' --- src/client_side.cc 2012-08-14 11:53:07 +0000 +++ src/client_side.cc 2012-08-28 13:00:30 +0000 @@ -182,7 +182,6 @@ /* our socket-related context */ - CBDATA_CLASS_INIT(ClientSocketContext); void * @@ -239,7 +238,6 @@ static ConnStateData *connStateCreate(const Comm::ConnectionPointer &client, AnyP::PortCfg *port); - clientStreamNode * ClientSocketContext::getTail() const { @@ -275,7 +273,6 @@ comm_read(clientConnection, in.addressToReadInto(), getAvailableBufferLength(), reader); } - void ClientSocketContext::removeFromConnectionList(ConnStateData * conn) { @@ -1807,7 +1804,6 @@ } } - void ClientSocketContext::doClose() { @@ -2723,7 +2719,6 @@ goto finish; } - if (!chunked && !clientIsContentLengthValid(request)) { clientStreamNode *node = context->getClientReplyContext(); clientReplyContext *repContext = dynamic_cast(node->data.getRaw()); @@ -3534,7 +3529,6 @@ " client certificate: issuer: " << X509_NAME_oneline(X509_get_issuer_name(client_cert), 0, 0)); - X509_free(client_cert); } else { debugs(83, 5, "clientNegotiateSSL: FD " << fd << @@ -4287,7 +4281,6 @@ } } - BodyPipe::Pointer ConnStateData::expectRequestBody(int64_t size) { === modified file 'src/client_side.h' --- src/client_side.h 2012-08-14 11:53:07 +0000 +++ src/client_side.h 2012-08-28 13:00:30 +0000 @@ -163,7 +163,6 @@ CBDATA_CLASS(ClientSocketContext); }; - class ConnectionDetail; #if USE_SSL namespace Ssl === modified file 'src/client_side_reply.cc' --- src/client_side_reply.cc 2012-08-14 11:53:07 +0000 +++ src/client_side_reply.cc 2012-08-28 13:00:30 +0000 @@ -307,7 +307,6 @@ } } - void clientReplyContext::sendClientUpstreamResponse() { @@ -1106,7 +1105,6 @@ } } - /* A write has completed, what is the next status based on the * canonical request data? * 1 something is wrong @@ -1526,7 +1524,6 @@ httpHdrMangleList(hdr, request, ROR_REPLY); } - void clientReplyContext::cloneReply() { @@ -1685,7 +1682,6 @@ assert (context); assert(context->http == http); - clientStreamNode *next = ( clientStreamNode *)aNode->node.next->data; if (!context->ourNode) @@ -1993,7 +1989,6 @@ startError(err); - return; } @@ -2153,8 +2148,6 @@ return; } - - /* Using this breaks the client layering just a little! */ void === modified file 'src/client_side_request.cc' --- src/client_side_request.cc 2012-08-14 11:53:07 +0000 +++ src/client_side_request.cc 2012-08-28 13:00:30 +0000 @@ -33,7 +33,6 @@ * */ - /* * General logic of request processing: * @@ -86,7 +85,6 @@ #include "ssl/ServerBump.h" #endif - #if LINGERING_CLOSE #define comm_close comm_lingering_close #endif === modified file 'src/client_side_request.h' --- src/client_side_request.h 2012-08-14 11:53:07 +0000 +++ src/client_side_request.h 2012-08-28 13:00:30 +0000 @@ -27,7 +27,6 @@ * */ - #ifndef SQUID_CLIENTSIDEREQUEST_H #define SQUID_CLIENTSIDEREQUEST_H === modified file 'src/comm.cc' --- src/comm.cc 2012-08-15 15:17:32 +0000 +++ src/comm.cc 2012-08-28 13:00:30 +0000 @@ -212,7 +212,6 @@ #endif } - /** * Return whether the FD has a pending completed callback. * NP: does not work. @@ -322,7 +321,6 @@ Comm::SetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0); } - /** * synchronous wrapper around udp socket functions */ @@ -361,7 +359,6 @@ return send(s, buf, len, flags); } - bool comm_has_incomplete_write(int fd) { @@ -1157,7 +1154,6 @@ comm_empty_os_read_buffers(fd); - AsyncCall::Pointer completeCall=commCbCall(5,4, "comm_close_complete", FdeCbPtrFun(comm_close_complete, NULL)); FdeCbParams &completeParams = GetCommParams(completeCall); @@ -1235,7 +1231,6 @@ fd_table[fd].closeHandler = call; } - // remove function-based close handler void comm_remove_close_handler(int fd, CLCB * handler, void *data) @@ -1933,7 +1928,6 @@ commPlanHalfClosedCheck(); // make sure this fd will be checked again } - CommRead::CommRead() : conn(NULL), buf(NULL), len(0), callback(NULL) {} CommRead::CommRead(const Comm::ConnectionPointer &c, char *buf_, int len_, AsyncCall::Pointer &callback_) === modified file 'src/comm.h' --- src/comm.h 2012-08-14 11:53:07 +0000 +++ src/comm.h 2012-08-28 13:00:30 +0000 @@ -71,14 +71,12 @@ SQUIDCEXTERN void commCloseAllSockets(void); SQUIDCEXTERN void checkTimeouts(void); - //typedef void IOACB(int fd, int nfd, Comm::ConnectionPointer details, comm_err_t flag, int xerrno, void *data); extern void comm_add_close_handler(int fd, CLCB *, void *); extern void comm_add_close_handler(int fd, AsyncCall::Pointer &); extern void comm_remove_close_handler(int fd, CLCB *, void *); extern void comm_remove_close_handler(int fd, AsyncCall::Pointer &); - extern int comm_has_pending_read_callback(int fd); extern bool comm_monitors_read(int fd); //extern void comm_read(const Comm::ConnectionPointer &conn, char *buf, int len, IOCB *handler, void *data); === modified file 'src/comm/ModDevPoll.cc' --- src/comm/ModDevPoll.cc 2012-08-15 15:17:32 +0000 +++ src/comm/ModDevPoll.cc 2012-08-28 13:00:30 +0000 @@ -100,7 +100,6 @@ int size; /**< maximum number of elements in array */ } devpoll_update; - /* STATIC VARIABLES */ static int devpoll_fd; /**< handle to /dev/poll device */ static int max_poll_time = 1000; /**< maximum milliseconds to spend in poll */ @@ -112,7 +111,6 @@ /* PROTOTYPES */ static void commDevPollRegisterWithCacheManager(void); - /* PRIVATE FUNCTIONS */ /** \brief Write batched file descriptor event changes to poll device * @@ -174,7 +172,6 @@ devpoll_update.pfds[devpoll_update.cur].revents = 0; } - static void commIncomingStats(StoreEntry *sentry) { storeAppendPrintf(sentry, "Total number of devpoll loops: %ld\n", statCounter.select_loops); @@ -182,7 +179,6 @@ statCounter.select_fds_hist.dump(sentry, statHistIntDumper); } - static void commDevPollRegisterWithCacheManager(void) { @@ -195,7 +191,6 @@ ); } - /* PUBLIC FUNCTIONS */ /** \brief Initialise /dev/poll support @@ -319,7 +314,6 @@ F->timeout = squid_curtime + timeout; } - /** \brief Clear polling of file handle (both read and write) * * @param fd file descriptor to clear polling on @@ -331,7 +325,6 @@ SetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0); } - /** \brief Do poll and trigger callback functions as appropriate * * Check all connections for new connections and input data that is to be === modified file 'src/comm/ModEpoll.cc' --- src/comm/ModEpoll.cc 2012-08-15 15:17:32 +0000 +++ src/comm/ModEpoll.cc 2012-08-28 13:00:30 +0000 @@ -81,11 +81,9 @@ static void commEPollRegisterWithCacheManager(void); - /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ /* Public functions */ - /* * This is a needed exported function which will be called to initialise * the network loop code. @@ -216,7 +214,6 @@ SetSelect(fd, 0, NULL, NULL, 0); } - static void commIncomingStats(StoreEntry * sentry); static void === modified file 'src/comm/ModKqueue.cc' --- src/comm/ModKqueue.cc 2012-08-15 15:17:32 +0000 +++ src/comm/ModKqueue.cc 2012-08-28 13:00:30 +0000 @@ -154,12 +154,9 @@ } } - - /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ /* Public functions */ - /* * comm_select_init * === modified file 'src/comm/ModPoll.cc' --- src/comm/ModPoll.cc 2012-08-15 15:17:32 +0000 +++ src/comm/ModPoll.cc 2012-08-28 13:00:30 +0000 @@ -143,7 +143,6 @@ #define commCheckDnsIncoming (++dns_io_events > (incoming_dns_interval>> INCOMING_FACTOR)) #define commCheckTcpIncoming (++tcp_io_events > (incoming_tcp_interval>> INCOMING_FACTOR)) - void Comm::SetSelect(int fd, unsigned int type, PF * handler, void *client_data, time_t timeout) { @@ -592,7 +591,6 @@ return COMM_TIMEOUT; } - static void comm_poll_dns_incoming(void) { @@ -633,7 +631,6 @@ statCounter.comm_dns_incoming.count(nevents); } - static void commPollRegisterWithCacheManager(void) { === modified file 'src/comm/ModSelect.cc' --- src/comm/ModSelect.cc 2012-08-15 15:17:32 +0000 +++ src/comm/ModSelect.cc 2012-08-28 13:00:30 +0000 @@ -75,7 +75,6 @@ static void commUpdateReadBits(int fd, PF * handler); static void commUpdateWriteBits(int fd, PF * handler); - static struct timeval zero_tv; static fd_set global_readfds; static fd_set global_writefds; @@ -764,7 +763,6 @@ return 0; } - static void commIncomingStats(StoreEntry * sentry) { === modified file 'src/comm/ModSelectWin32.cc' --- src/comm/ModSelectWin32.cc 2012-08-15 15:17:32 +0000 +++ src/comm/ModSelectWin32.cc 2012-08-28 13:00:30 +0000 @@ -70,7 +70,6 @@ static void commUpdateReadBits(int fd, PF * handler); static void commUpdateWriteBits(int fd, PF * handler); - static struct timeval zero_tv; static fd_set global_readfds; static fd_set global_writefds; @@ -779,7 +778,6 @@ return 0; } - static void commIncomingStats(StoreEntry * sentry) { === modified file 'src/comm_poll.h' --- src/comm_poll.h 2009-01-21 03:47:47 +0000 +++ src/comm_poll.h 2012-08-28 13:00:30 +0000 @@ -34,5 +34,4 @@ #ifndef SQUID_COMM_POLL_H #define SQUID_COMM_POLL_H - #endif /* SQUID_COMM_POLL_H */ === modified file 'src/debug.cc' --- src/debug.cc 2012-08-06 17:41:08 +0000 +++ src/debug.cc 2012-08-28 13:00:30 +0000 @@ -660,7 +660,6 @@ /* "safe" get secription */ static const char *ctx_get_descr(Ctx ctx); - Ctx ctx_enter(const char *descr) { === modified file 'src/delay_pools.cc' --- src/delay_pools.cc 2012-08-14 11:53:07 +0000 +++ src/delay_pools.cc 2012-08-28 13:00:30 +0000 @@ -555,7 +555,6 @@ RegisterWithCacheManager(); } - void DelayPools::InitDelayData() { @@ -893,7 +892,6 @@ return ( (ntohl(net.s_addr) >> 8) & 0xff); } - ClassCHostPool::ClassCHostPool() { DelayPools::registerForUpdates (this); === modified file 'src/disk.cc' --- src/disk.cc 2012-08-15 15:17:32 +0000 +++ src/disk.cc 2012-08-28 13:00:30 +0000 @@ -100,7 +100,6 @@ return fd; } - /* close a disk file. */ void file_close(int fd) @@ -309,7 +308,6 @@ q << "," << (int) q->buf_offset << ", " << q->len << ", " << len << " FD " << fd << ")"); - assert(q->buf_offset <= q->len); if (q->buf_offset == q->len) { @@ -361,7 +359,6 @@ PROF_stop(diskHandleWrite); } - /* write block to a file */ /* write back queue. Only one writer at a time. */ /* call a handle when writing is complete. */ @@ -487,7 +484,6 @@ PROF_stop(diskHandleRead); } - /* start read operation */ /* buffer must be allocated from the caller. * It must have at least req_len space in there. === modified file 'src/dlink.cc' --- src/dlink.cc 2012-01-20 18:55:04 +0000 +++ src/dlink.cc 2012-08-28 13:00:30 +0000 @@ -7,7 +7,6 @@ /* dlink are Mem-pooled */ #include "MemPool.h" - dlink_list ClientActiveRequests; MemAllocator *dlink_node_pool = NULL; === modified file 'src/dns_internal.cc' --- src/dns_internal.cc 2012-08-15 15:17:32 +0000 +++ src/dns_internal.cc 2012-08-28 13:00:30 +0000 @@ -335,7 +335,6 @@ ++npc; } - static void idnsFreeNameservers(void) { @@ -350,8 +349,6 @@ npc = npc_alloc = 0; } - - static void idnsParseNameservers(void) { === modified file 'src/dnsserver.cc' --- src/dnsserver.cc 2012-07-17 17:38:50 +0000 +++ src/dnsserver.cc 2012-08-28 13:00:30 +0000 @@ -445,7 +445,6 @@ #endif /* HAVE_RES_INIT */ } - /** * \ingroup dnsserver * === modified file 'src/enums.h' --- src/enums.h 2012-05-12 03:21:00 +0000 +++ src/enums.h 2012-08-28 13:00:30 +0000 @@ -112,7 +112,6 @@ SC_ENUM_END } http_hdr_sc_type; - typedef enum _mem_status_t { NOT_IN_MEMORY, IN_MEMORY @@ -249,7 +248,6 @@ psError } HttpMsgParseState; - enum { PCTILE_HTTP, PCTILE_ICP_QUERY, @@ -304,7 +302,6 @@ ROR_REPLY }; - /* CygWin & Windows NT Port */ #if _SQUID_WINDOWS_ /* === modified file 'src/errorpage.cc' --- src/errorpage.cc 2012-08-14 11:53:07 +0000 +++ src/errorpage.cc 2012-08-28 13:00:30 +0000 @@ -66,7 +66,6 @@ * Config.errorDirectory) */ - #if !defined(DEFAULT_SQUID_ERROR_DIR) /** Where to look for errors if config path fails. \note Please use ./configure --datadir=/path instead of patching === modified file 'src/esi/ElementList.h' --- src/esi/ElementList.h 2012-08-14 11:53:07 +0000 +++ src/esi/ElementList.h 2012-08-28 13:00:30 +0000 @@ -62,5 +62,4 @@ ElementList &operator=(ElementList const&); }; - #endif /* SQUID_ELEMENTLIST_H */ === modified file 'src/esi/Esi.cc' --- src/esi/Esi.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Esi.cc 2012-08-28 13:00:30 +0000 @@ -101,7 +101,6 @@ typedef ESIContext::esiKick_t esiKick_t; - /* some core operators */ /* esiComment */ @@ -146,7 +145,6 @@ static FREE esiRemoveFree; static ESIElement * esiRemoveNew(void); - /* esiTry */ struct esiTry : public ESIElement { @@ -270,7 +268,6 @@ return reading_; } - ESIStreamContext::ESIStreamContext() : finished(false), include (NULL), localbuffer (new ESISegment), buffer (NULL) {} @@ -278,7 +275,6 @@ /* ESIContext */ static ESIContext *ESIContextNew(HttpReply *, clientStreamNode *, ClientHttpRequest *); - void * ESIContext::operator new(size_t byteCount) { @@ -486,7 +482,6 @@ return; } - if (context->flags.oktosend && context->flags.finished) { StoreIOBuffer tempBuffer; assert (!context->outbound.getRaw()); @@ -680,7 +675,6 @@ if (len == 0) len = 1; /* tell the caller we sent something (because we sent headers */ - cbdataReferenceDone (templock); debugs (86,5,"ESIContext::send: this=" << this << " sent " << len); @@ -1455,7 +1449,6 @@ extern ErrorState *clientBuildError (err_type, http_status, char const *, Ip::Address &, HttpRequest *); - /* This can ONLY be used before we have sent *any* data to the client */ void ESIContext::fail () @@ -2217,7 +2210,6 @@ parent->provideData (data, this); } - esiChoose::esiChoose(esiChoose const &old) : chosenelement(-1), otherwise (NULL), parent (NULL) { for (size_t counter = 0; counter < old.elements.size(); ++counter) { === modified file 'src/esi/Expression.cc' --- src/esi/Expression.cc 2012-08-15 15:17:32 +0000 +++ src/esi/Expression.cc 2012-08-28 13:00:30 +0000 @@ -274,7 +274,6 @@ return 1; } - int evalor(stackmember * stack, int *depth, int whereAmI, stackmember * candidate) { @@ -423,7 +422,6 @@ /* debugs(86, DBG_IMPORTANT, "?= " << srv.value.integral << " "); */ return 0; - } int @@ -472,7 +470,6 @@ /* debugs(86, DBG_IMPORTANT, "?= " << srv.value.integral << " "); */ return 0; - } int @@ -521,7 +518,6 @@ /* debugs(86, DBG_IMPORTANT, "?= " << srv.value.integral << " "); */ return 0; - } int === modified file 'src/esi/Include.cc' --- src/esi/Include.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Include.cc 2012-08-28 13:00:30 +0000 @@ -161,7 +161,6 @@ return; } - /* after the write to the user occurs, (ie here, or in a callback) * we call */ if (clientHttpRequestStatus(-1, http)) { @@ -261,8 +260,6 @@ return rv; } - - /* ESIInclude */ ESIInclude::~ESIInclude() { @@ -322,7 +319,6 @@ tempheaders.removeHopByHopEntries(); } - void ESIInclude::Start (ESIStreamContext::Pointer stream, char const *url, ESIVarState *vars) { === modified file 'src/esi/Parser.h' --- src/esi/Parser.h 2010-11-21 04:40:05 +0000 +++ src/esi/Parser.h 2012-08-28 13:00:30 +0000 @@ -42,7 +42,6 @@ virtual ~ESIParserClient() {}; }; - /* for RefCountable */ #include "RefCount.h" === modified file 'src/esi/Segment.h' --- src/esi/Segment.h 2012-08-14 11:53:07 +0000 +++ src/esi/Segment.h 2012-08-28 13:00:30 +0000 @@ -60,7 +60,6 @@ void adsorbList (ESISegment::Pointer from); size_t space() const; - char buf[HTTP_REQBUF_SZ]; size_t len; /* how much data has been pushed into this */ Pointer next; === modified file 'src/esi/Sequence.cc' --- src/esi/Sequence.cc 2012-08-14 11:53:07 +0000 +++ src/esi/Sequence.cc 2012-08-28 13:00:30 +0000 @@ -120,7 +120,6 @@ parent = NULL; } - void esiSequence::provideData (ESISegment::Pointer data, ESIElement *source) { @@ -130,7 +129,6 @@ debugs(86, 5, "esiSequence::provideData: " << this << " data provided during processing"); debugs(86, 5, "esiSequence::provideData " << this << " " << data.getRaw() << " " << source); - /* when data is provided, the element *must* be completed */ /* XXX: when the callback model is complete, * we can introduce 'finished'. And then this rule can be === modified file 'src/esi/VarState.cc' --- src/esi/VarState.cc 2012-08-14 11:53:07 +0000 +++ src/esi/VarState.cc 2012-08-28 13:00:30 +0000 @@ -54,7 +54,6 @@ "OTHER" }; - void ESIVarState::Variable::eval (ESIVarState &state, char const *subref, char const *found_default) const { @@ -857,7 +856,6 @@ delete currentFunction; } - /* XXX FIXME: this should be comma delimited, no? */ void ESIVarState::buildVary (HttpReply *rep) === modified file 'src/esi/VarState.h' --- src/esi/VarState.h 2009-03-10 20:52:45 +0000 +++ src/esi/VarState.h 2012-08-28 13:00:30 +0000 @@ -192,6 +192,4 @@ char *browserversion; }; - - #endif /* SQUID_ESIVARSTATE_H */ === modified file 'src/event.cc' --- src/event.cc 2012-08-14 11:53:07 +0000 +++ src/event.cc 2012-08-28 13:00:30 +0000 @@ -43,7 +43,6 @@ /* The list of event processes */ - static OBJH eventDump; static const char *last_event_ran = NULL; @@ -111,7 +110,6 @@ os << ')'; } - ev_entry::ev_entry(char const * aName, EVH * aFunction, void * aArgument, double evWhen, int aWeight, bool haveArgument) : name(aName), func(aFunction), arg(haveArgument ? cbdataReference(aArgument) : aArgument), when(evWhen), weight(aWeight), === modified file 'src/external_acl.cc' --- src/external_acl.cc 2012-08-14 11:53:07 +0000 +++ src/external_acl.cc 2012-08-28 13:00:30 +0000 @@ -666,7 +666,6 @@ external_acl_cache_delete(this, static_cast(lru_list.tail->data)); } - /****************************************************************** * external acl type */ === modified file 'src/fd.cc' --- src/fd.cc 2012-08-14 11:53:07 +0000 +++ src/fd.cc 2012-08-28 13:00:30 +0000 @@ -41,7 +41,6 @@ #include "profiler/Profiler.h" #include "SquidTime.h" - // Solaris and possibly others lack MSG_NOSIGNAL optimization // TODO: move this into compat/? Use a dedicated compat file to avoid dragging // sys/types.h and sys/socket.h into the rest of Squid?? === modified file 'src/format/Format.cc' --- src/format/Format.cc 2012-08-14 11:53:07 +0000 +++ src/format/Format.cc 2012-08-28 13:00:30 +0000 @@ -18,7 +18,6 @@ #include "ssl/ErrorDetail.h" #endif - /// Convert a string to NULL pointer if it is "" #define strOrNull(s) ((s)==NULL||(s)[0]=='\0'?NULL:(s)) @@ -441,7 +440,6 @@ doint = 1; break; - case LFT_TIME_LOCALTIME: case LFT_TIME_GMT: { === modified file 'src/forward.cc' --- src/forward.cc 2012-08-15 15:17:32 +0000 +++ src/forward.cc 2012-08-28 13:00:30 +0000 @@ -30,7 +30,6 @@ * */ - #include "squid.h" #include "AccessLogEntry.h" #include "acl/FilledChecklist.h" @@ -457,7 +456,6 @@ } } - /**** CALLBACK WRAPPERS ************************************************************/ static void @@ -1273,7 +1271,6 @@ } } - /**** STATIC MEMBER FUNCTIONS *************************************************/ bool === modified file 'src/forward.h' --- src/forward.h 2012-08-14 11:53:07 +0000 +++ src/forward.h 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ class ErrorState; class HttpRequest; - /** * Returns the TOS value that we should be setting on the connection * to the server, based on the ACL. @@ -28,7 +27,6 @@ */ nfmark_t GetNfmarkToServer(HttpRequest * request); - class FwdState : public RefCountable { public: === modified file 'src/fqdncache.cc' --- src/fqdncache.cc 2012-08-14 11:53:07 +0000 +++ src/fqdncache.cc 2012-08-28 13:00:30 +0000 @@ -165,7 +165,6 @@ return request_time.tv_sec ? tvSubMsec(request_time, current_time) : -1; } - /** \ingroup FQDNCacheInternal * Removes the given fqdncache entry @@ -488,7 +487,6 @@ #endif - /** \ingroup FQDNCacheAPI * @@ -686,7 +684,6 @@ return NULL; } - /** \ingroup FQDNCacheInternal * @@ -873,7 +870,6 @@ fqdncacheLockEntry(fce); } - #if SQUID_SNMP /** * \ingroup FQDNCacheAPI === modified file 'src/fs/Module.cc' --- src/fs/Module.cc 2012-08-14 11:53:07 +0000 +++ src/fs/Module.cc 2012-08-28 13:00:30 +0000 @@ -17,7 +17,6 @@ static Fs::Ufs::StoreFSufs *AufsInstance; #endif - #if HAVE_FS_DISKD static Fs::Ufs::StoreFSufs *DiskdInstance; #endif @@ -27,7 +26,6 @@ static Rock::StoreFileSystem *RockInstance = NULL; #endif - /* TODO: Modify coss code to: * (a) remove the StoreFScoss::GetInstance method, * (b) declare the StoreFScoss::stats as static and @@ -37,7 +35,6 @@ StoreFScoss &CossInstance = StoreFScoss::GetInstance(); #endif - void Fs::Init() { @@ -49,7 +46,6 @@ AufsInstance = new Fs::Ufs::StoreFSufs("DiskThreads", "aufs");; #endif - #if HAVE_FS_DISKD DiskdInstance = new Fs::Ufs::StoreFSufs("DiskDaemon", "diskd");; #endif @@ -60,7 +56,6 @@ } - void Fs::Clean() { #if HAVE_FS_UFS @@ -71,7 +66,6 @@ delete AufsInstance; #endif - #if HAVE_FS_DISKD delete DiskdInstance; #endif === modified file 'src/fs/coss/CossSwapDir.h' --- src/fs/coss/CossSwapDir.h 2012-08-07 15:12:08 +0000 +++ src/fs/coss/CossSwapDir.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "SwapDir.h" #include "DiskIO/IORequestor.h" - #ifndef COSS_MEMBUF_SZ #define COSS_MEMBUF_SZ 1048576 #endif @@ -23,7 +22,6 @@ #define COSS_ALLOC_ALLOCATE 1 #define COSS_ALLOC_REALLOC 2 - /// \ingroup COSS class CossSwapDir : public SwapDir, public IORequestor { @@ -113,7 +111,6 @@ /// \ingroup COSS extern void storeCossStartMembuf(CossSwapDir * SD); - #include "StoreSearch.h" /// \ingroup COSS === modified file 'src/fs/coss/StoreFScoss.h' --- src/fs/coss/StoreFScoss.h 2009-01-21 03:47:47 +0000 +++ src/fs/coss/StoreFScoss.h 2012-08-28 13:00:30 +0000 @@ -66,7 +66,6 @@ open, create, close, unlink, read, write, stripe_write; }; - class CacheManager; #include "StoreFileSystem.h" === modified file 'src/fs/coss/store_coss.h' --- src/fs/coss/store_coss.h 2011-04-17 10:27:49 +0000 +++ src/fs/coss/store_coss.h 2012-08-28 13:00:30 +0000 @@ -50,8 +50,6 @@ dlink_node node; }; - - /** \ingroup COSS * Per-storeiostate info @@ -91,7 +89,6 @@ /// \ingroup COSS typedef struct _cossindex CossIndexNode; - /** \ingroup COSS * Whether the coss system has been setup or not === modified file 'src/fs/coss/store_dir_coss.cc' --- src/fs/coss/store_dir_coss.cc 2012-08-15 15:17:32 +0000 +++ src/fs/coss/store_dir_coss.cc 2012-08-28 13:00:30 +0000 @@ -218,7 +218,6 @@ debugs(79, 3, "storeCossWriteMemBufDone: buf " << cossWrite->membuf << ", len " << len); - if (errflag) { ++ StoreFScoss::GetInstance().stats.stripe_write.fail; debugs(79, DBG_IMPORTANT, "storeCossWriteMemBufDone: got failure (" << errflag << ")"); @@ -227,7 +226,6 @@ ++ StoreFScoss::GetInstance().stats.stripe_write.success; } - dlinkDelete(&cossWrite->membuf->node, &membufs); cbdataFree(cossWrite->membuf); -- StoreFScoss::GetInstance().stats.stripes; @@ -306,7 +304,6 @@ &CossSwapDir::optionBlockSizeParse, &CossSwapDir::optionBlockSizeDump)); - ConfigOption *ioOptions = NULL; if (io) @@ -1037,7 +1034,6 @@ } } - void CossSwapDir::reconfigure() { === modified file 'src/fs/coss/store_io_coss.cc' --- src/fs/coss/store_io_coss.cc 2012-08-14 11:53:07 +0000 +++ src/fs/coss/store_io_coss.cc 2012-08-28 13:00:30 +0000 @@ -50,7 +50,6 @@ CossState::CossState(CossSwapDir *aCSD):SD (aCSD) {} - /* * This routine sucks. I want to rewrite it when possible, and I also think * that we should check after creatmembuf() to see if the object has a === modified file 'src/fs/rock/RockIoRequests.h' --- src/fs/rock/RockIoRequests.h 2011-09-06 22:32:30 +0000 +++ src/fs/rock/RockIoRequests.h 2012-08-28 13:00:30 +0000 @@ -21,7 +21,6 @@ CBDATA_CLASS2(ReadRequest); }; - /// \ingroup Rock class WriteRequest: public ::WriteRequest { @@ -33,7 +32,6 @@ CBDATA_CLASS2(WriteRequest); }; - } // namespace Rock #endif /* SQUID_FS_ROCK_IO_REQUESTS_H */ === modified file 'src/fs/rock/RockIoState.cc' --- src/fs/rock/RockIoState.cc 2012-08-14 11:53:07 +0000 +++ src/fs/rock/RockIoState.cc 2012-08-28 13:00:30 +0000 @@ -194,7 +194,6 @@ Rock::IoState::Pointer sio; }; - void Rock::IoState::callBack(int errflag) { === modified file 'src/fs/rock/RockStoreFileSystem.cc' --- src/fs/rock/RockStoreFileSystem.cc 2012-01-20 18:55:04 +0000 +++ src/fs/rock/RockStoreFileSystem.cc 2012-08-28 13:00:30 +0000 @@ -8,7 +8,6 @@ #include "fs/rock/RockStoreFileSystem.h" #include "fs/rock/RockSwapDir.h" - Rock::StoreFileSystem::StoreFileSystem() { FsAdd(*this); === modified file 'src/fs/rock/RockSwapDir.cc' --- src/fs/rock/RockSwapDir.cc 2012-08-14 11:53:07 +0000 +++ src/fs/rock/RockSwapDir.cc 2012-08-28 13:00:30 +0000 @@ -464,7 +464,6 @@ return false; } - bool Rock::SwapDir::canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) const { @@ -779,7 +778,6 @@ repl->Add(repl, &e, &e.repl); } - void Rock::SwapDir::ignoreReferences(StoreEntry &e) { @@ -828,7 +826,6 @@ } - namespace Rock { RunnerRegistrationEntry(rrAfterConfig, SwapDirRr); === modified file 'src/fs/rock/RockSwapDir.h' --- src/fs/rock/RockSwapDir.h 2011-10-27 23:14:28 +0000 +++ src/fs/rock/RockSwapDir.h 2012-08-28 13:00:30 +0000 @@ -112,7 +112,6 @@ Vector owners; }; - } // namespace Rock #endif /* SQUID_FS_ROCK_SWAP_DIR_H */ === modified file 'src/fs/ufs/RebuildState.h' --- src/fs/ufs/RebuildState.h 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/RebuildState.h 2012-08-28 13:00:30 +0000 @@ -95,7 +95,6 @@ void *cbdata; }; - } /* namespace Ufs */ } /* namespace Fs */ === modified file 'src/fs/ufs/UFSStoreState.cc' --- src/fs/ufs/UFSStoreState.cc 2012-08-14 11:53:07 +0000 +++ src/fs/ufs/UFSStoreState.cc 2012-08-28 13:00:30 +0000 @@ -45,7 +45,6 @@ #include "UFSStrategy.h" #include "UFSStoreState.h" - CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,UFSStoreState); void * @@ -185,7 +184,6 @@ theFile->read(new ReadRequest(buf,aOffset,size)); } - /* * DPW 2006-05-24 * This, the public write interface, places the write request at the end @@ -211,7 +209,6 @@ drainWriteQueue(); } - /* * DPW 2006-05-24 * This, the private write method, calls the lower level write for the === modified file 'src/fs/ufs/UFSSwapDir.cc' --- src/fs/ufs/UFSSwapDir.cc 2012-08-15 15:17:32 +0000 +++ src/fs/ufs/UFSSwapDir.cc 2012-08-28 13:00:30 +0000 @@ -950,7 +950,6 @@ #endif - cleanLog = state; return 0; } @@ -1175,7 +1174,6 @@ repl->Add(repl, e, &e->repl); } - void Fs::Ufs::UFSSwapDir::replacementRemove(StoreEntry * e) { === modified file 'src/ftp.cc' --- src/ftp.cc 2012-08-15 15:17:32 +0000 +++ src/ftp.cc 2012-08-28 13:00:30 +0000 @@ -1951,7 +1951,6 @@ if (reply) err->ftp.reply = xstrdup(reply); - HttpReply *newrep = err->BuildHttpReply(); delete err; @@ -3296,7 +3295,6 @@ entry->unlock(); } - /// \ingroup ServerProtocolFTPInternal static void ftpReadTransferDone(FtpStateData * ftpState) === modified file 'src/globals.h' --- src/globals.h 2012-08-15 00:13:13 +0000 +++ src/globals.h 2012-08-28 13:00:30 +0000 @@ -44,7 +44,6 @@ /* for iostats */ #include "structs.h" - extern char *ConfigFile; /* NULL */ extern char *IcpOpcodeStr[]; extern char tmp_error_buf[ERROR_BUF_SZ]; === modified file 'src/gopher.cc' --- src/gopher.cc 2012-08-14 11:53:07 +0000 +++ src/gopher.cc 2012-08-28 13:00:30 +0000 @@ -637,7 +637,6 @@ break; } /* HTML_DIR, HTML_INDEX_RESULT */ - case gopher_ds::HTML_CSO_RESULT: { if (line[0] == '-') { int code, recno; @@ -697,7 +696,6 @@ break; } - } } === modified file 'src/helper.cc' --- src/helper.cc 2012-08-14 11:53:07 +0000 +++ src/helper.cc 2012-08-28 13:00:30 +0000 @@ -48,7 +48,6 @@ #define HELPER_MAX_ARGS 64 - /** Initial Squid input buffer size. Helper responses may exceed this, and * Squid will grow the input buffer as needed, up to ReadBufMaxSize. */ @@ -80,7 +79,6 @@ static void StatefulEnqueue(statefulhelper * hlp, helper_stateful_request * r); static bool helperStartStats(StoreEntry *sentry, void *hlp, const char *label); - CBDATA_CLASS_INIT(helper); CBDATA_TYPE(helper_server); CBDATA_CLASS_INIT(statefulhelper); @@ -386,7 +384,6 @@ helperStatefulKickQueue(hlp); } - void helperSubmit(helper * hlp, const char *buf, HLPCB * callback, void *data) { @@ -969,7 +966,6 @@ debugs(84, 5, "helperStatefulHandleRead: " << len << " bytes from " << hlp->id_name << " #" << srv->index + 1); - if (flag != COMM_OK || len == 0) { srv->closePipesSafely(); return; @@ -1228,7 +1224,6 @@ return NULL; } - static void helperDispatchWriteDone(const Comm::ConnectionPointer &conn, char *buf, size_t len, comm_err_t flag, int xerrno, void *data) { @@ -1311,7 +1306,6 @@ /* nothing! */ } - static void helperStatefulDispatch(helper_stateful_server * srv, helper_stateful_request * r) { @@ -1357,7 +1351,6 @@ ++ hlp->stats.requests; } - static void helperKickQueue(helper * hlp) { === modified file 'src/helper.h' --- src/helper.h 2012-08-14 11:53:07 +0000 +++ src/helper.h 2012-08-28 13:00:30 +0000 @@ -213,5 +213,4 @@ SQUIDCEXTERN void helperStatefulReleaseServer(helper_stateful_server * srv); SQUIDCEXTERN void *helperStatefulServerGetData(helper_stateful_server * srv); - #endif /* SQUID_HELPER_H */ === modified file 'src/htcp.cc' --- src/htcp.cc 2012-08-14 11:53:07 +0000 +++ src/htcp.cc 2012-08-28 13:00:30 +0000 @@ -248,7 +248,6 @@ static int old_squid_format = 0; - static ssize_t htcpBuildPacket(char *buf, size_t buflen, htcpStuff * stuff); static htcpSpecifier *htcpUnpackSpecifier(char *buf, int sz); static htcpDetail *htcpUnpackDetail(char *buf, int sz); === modified file 'src/http.cc' --- src/http.cc 2012-08-14 11:53:07 +0000 +++ src/http.cc 2012-08-28 13:00:30 +0000 @@ -784,7 +784,6 @@ CallJobHere(11, 3, this, HttpStateData, HttpStateData::processReply); } - /** * returns true if the peer can support connection pinning */ @@ -1381,7 +1380,6 @@ if (request->flags.spoof_client_ip) client_addr = request->client_addr; - if (request->flags.pinned) { ispinned = true; } else if (request->flags.connection_auth && request->flags.auth_sent) { @@ -1829,7 +1827,6 @@ case HDR_TRANSFER_ENCODING: /** \par Transfer-Encoding: */ break; - /** \par OTHER headers I haven't bothered to track down yet. */ case HDR_AUTHORIZATION: === modified file 'src/icmp/Icmp.h' --- src/icmp/Icmp.h 2010-11-21 04:40:05 +0000 +++ src/icmp/Icmp.h 2012-08-28 13:00:30 +0000 @@ -70,7 +70,6 @@ #endif /* USE_ICMP */ - /** * Implements the squid interface to access ICMP operations * === modified file 'src/icmp/Icmp4.h' --- src/icmp/Icmp4.h 2011-07-23 08:37:52 +0000 +++ src/icmp/Icmp4.h 2012-08-28 13:00:30 +0000 @@ -77,7 +77,6 @@ #define ip_dst daddr #endif - /* Native Windows port doesn't have netinet support, so we emulate it. At this time, Cygwin lacks icmp support in its include files, so we need to use the native Windows port definitions. === modified file 'src/icmp/Icmp6.cc' --- src/icmp/Icmp6.cc 2012-08-14 11:53:07 +0000 +++ src/icmp/Icmp6.cc 2012-08-28 13:00:30 +0000 @@ -164,7 +164,6 @@ icmp6_pktsize = sizeof(struct icmp6_hdr); - // Fill Icmp6 ECHO data content echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr)); echo->opcode = (unsigned char) opcode; @@ -268,7 +267,6 @@ #define ip6_hlim // MAX hops (always 64, but no guarantee) #define ip6_hops // HOPS!!! (can it be true??) - ip = (struct ip6_hdr *) pkt; pkt += sizeof(ip6_hdr); === modified file 'src/icmp/IcmpSquid.cc' --- src/icmp/IcmpSquid.cc 2012-08-15 15:17:32 +0000 +++ src/icmp/IcmpSquid.cc 2012-08-28 13:00:30 +0000 @@ -61,7 +61,6 @@ #endif /* USE_ICMP */ - IcmpSquid::IcmpSquid() : Icmp() { ; // nothing new. @@ -72,7 +71,6 @@ Close(); } - #if USE_ICMP void === modified file 'src/icmp/net_db.cc' --- src/icmp/net_db.cc 2012-08-14 11:53:07 +0000 +++ src/icmp/net_db.cc 2012-08-28 13:00:30 +0000 @@ -676,7 +676,6 @@ memFree(x, MEM_NET_DB_NAME); } - static void netdbExchangeHandleReply(void *data, StoreIOBuffer receivedData) { @@ -893,7 +892,6 @@ #endif /* USE_ICMP */ - /* PUBLIC FUNCTIONS */ void @@ -983,7 +981,6 @@ #endif } - #if 0 // AYJ: Looks to be unused code. int netdbHops(Ip::Address &addr) @@ -1211,7 +1208,6 @@ #endif } - void netdbBinaryExchange(StoreEntry * s) { === modified file 'src/icmp/net_db.h' --- src/icmp/net_db.h 2010-11-21 04:40:05 +0000 +++ src/icmp/net_db.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ /* for struct peer */ #include "structs.h" - SQUIDCEXTERN void netdbInit(void); SQUIDCEXTERN void netdbHandlePingReply(const Ip::Address &from, int hops, int rtt); === modified file 'src/icp_v2.cc' --- src/icp_v2.cc 2012-08-15 15:17:32 +0000 +++ src/icp_v2.cc 2012-08-28 13:00:30 +0000 @@ -133,7 +133,6 @@ HTTPMSGUNLOCK(request); } - /* End ICPState */ /* ICP2State */ === modified file 'src/icp_v3.cc' --- src/icp_v3.cc 2012-08-14 11:53:07 +0000 +++ src/icp_v3.cc 2012-08-28 13:00:30 +0000 @@ -105,7 +105,6 @@ delete this; } - /// \ingroup ServerProtocolICPInternal3 /* Currently Harvest cached-2.x uses ICP_VERSION_3 */ void === modified file 'src/ident/AclIdent.cc' --- src/ident/AclIdent.cc 2012-08-14 11:53:07 +0000 +++ src/ident/AclIdent.cc 2012-08-28 13:00:30 +0000 @@ -119,7 +119,6 @@ return new ACLIdent(*this); } - IdentLookup IdentLookup::instance_; IdentLookup * === modified file 'src/ident/AclIdent.h' --- src/ident/AclIdent.h 2010-11-21 04:40:05 +0000 +++ src/ident/AclIdent.h 2012-08-28 13:00:30 +0000 @@ -52,7 +52,6 @@ static void LookupDone(const char *ident, void *data); }; - #include "acl/Acl.h" #include "acl/Data.h" === modified file 'src/ip/Address.h' --- src/ip/Address.h 2012-02-21 09:59:51 +0000 +++ src/ip/Address.h 2012-08-28 13:00:30 +0000 @@ -234,7 +234,6 @@ */ bool ApplyMask(const unsigned int cidr, int mtype); - /** Return the ASCII equivalent of the address * Semantically equivalent to the IPv4 inet_ntoa() * eg. 127.0.0.1 (IPv4) or ::1 (IPv6) @@ -382,7 +381,6 @@ static const struct in6_addr v6_noaddr; }; - inline std::ostream & operator << (std::ostream &os, const Address &ipa) { === modified file 'src/ip/Intercept.h' --- src/ip/Intercept.h 2011-02-25 03:38:04 +0000 +++ src/ip/Intercept.h 2012-08-28 13:00:30 +0000 @@ -85,7 +85,6 @@ */ inline void StopInterception(const char *str); - private: /** @@ -133,7 +132,6 @@ */ bool PfInterception(const Comm::ConnectionPointer &newConn, int silent); - int transparentActive_; int interceptActive_; time_t lastReported_; /**< Time of last error report. Throttles NAT error display to 1 per minute */ === modified file 'src/ip/stubQosConfig.cc' --- src/ip/stubQosConfig.cc 2012-08-14 11:53:07 +0000 +++ src/ip/stubQosConfig.cc 2012-08-28 13:00:30 +0000 @@ -3,7 +3,6 @@ #include "ip/QosConfig.h" #include "Store.h" - void Ip::Qos::getTosFromServer(fde *clientFde, const int server_fd) { === modified file 'src/ip/testAddress.cc' --- src/ip/testAddress.cc 2012-01-20 18:55:04 +0000 +++ src/ip/testAddress.cc 2012-08-28 13:00:30 +0000 @@ -24,7 +24,6 @@ #include #endif - CPPUNIT_TEST_SUITE_REGISTRATION( testIpAddress ); /* so that we don't break POD dependency just for the test */ @@ -154,7 +153,6 @@ CPPUNIT_ASSERT( memcmp( &insock, &outsock, sizeof(struct sockaddr_in6)) == 0 ); } - void testIpAddress::testCopyConstructor() { @@ -174,7 +172,6 @@ Ip::Address inIPA(insock); Ip::Address outIPA(inIPA); - /* test stored values */ CPPUNIT_ASSERT( !outIPA.IsAnyAddr() ); CPPUNIT_ASSERT( !outIPA.IsNoAddr() ); @@ -734,7 +731,6 @@ Ip::Address anIPA = "192.168.100.12"; - /* test stored values */ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() ); CPPUNIT_ASSERT( !anIPA.IsNoAddr() ); @@ -745,7 +741,6 @@ anIPA.GetInAddr(outval); CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 ); - /* POKE NtoA display function to see what it is doing */ anIPA.NtoA(ntoabuf,MAX_IPSTRLEN); CPPUNIT_ASSERT( !anIPA.IsAnyAddr() ); @@ -759,8 +754,6 @@ anIPA.GetInAddr(outval); CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 ); - - /* POKE ToHostname display function to see what it is doing */ anIPA.ToHostname(hostbuf,MAX_IPSTRLEN); CPPUNIT_ASSERT( !anIPA.IsAnyAddr() ); @@ -774,7 +767,6 @@ anIPA.GetInAddr(outval); CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 ); - /* POKE ToURL display function to see what it is doing */ anIPA.ToURL(urlbuf,MAX_IPSTRLEN); CPPUNIT_ASSERT( !anIPA.IsAnyAddr() ); === modified file 'src/ipc/Coordinator.cc' --- src/ipc/Coordinator.cc 2012-08-15 15:17:32 +0000 +++ src/ipc/Coordinator.cc 2012-08-28 13:00:30 +0000 @@ -5,7 +5,6 @@ * */ - #include "squid.h" #include "base/Subscription.h" #include "base/TextException.h" @@ -30,7 +29,6 @@ CBDATA_NAMESPACED_CLASS_INIT(Ipc, Coordinator); Ipc::Coordinator* Ipc::Coordinator::TheInstance = NULL; - Ipc::Coordinator::Coordinator(): Port(coordinatorAddr) { === modified file 'src/ipc/Coordinator.h' --- src/ipc/Coordinator.h 2011-09-06 21:07:56 +0000 +++ src/ipc/Coordinator.h 2012-08-28 13:00:30 +0000 @@ -8,7 +8,6 @@ #ifndef SQUID_IPC_COORDINATOR_H #define SQUID_IPC_COORDINATOR_H - #include "Array.h" #include "ipc/Messages.h" #include "ipc/Port.h" @@ -80,7 +79,6 @@ CBDATA_CLASS2(Coordinator); }; - } // namespace Ipc #endif /* SQUID_IPC_COORDINATOR_H */ === modified file 'src/ipc/FdNotes.cc' --- src/ipc/FdNotes.cc 2012-08-06 17:21:57 +0000 +++ src/ipc/FdNotes.cc 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ #include "Debug.h" #include "ipc/FdNotes.h" - const char * Ipc::FdNote(int fdNoteId) { === modified file 'src/ipc/FdNotes.h' --- src/ipc/FdNotes.h 2011-01-28 17:56:41 +0000 +++ src/ipc/FdNotes.h 2012-08-28 13:00:30 +0000 @@ -25,5 +25,4 @@ } // namespace Ipc; - #endif /* SQUID_IPC_FD_NOTES_H */ === modified file 'src/ipc/Forwarder.cc' --- src/ipc/Forwarder.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/Forwarder.cc 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ #include "ipc/Port.h" #include "ipc/TypedMsgHdr.h" - CBDATA_NAMESPACED_CLASS_INIT(Ipc, Forwarder); Ipc::Forwarder::RequestsMap Ipc::Forwarder::TheRequestsMap; === modified file 'src/ipc/Forwarder.h' --- src/ipc/Forwarder.h 2011-05-13 08:13:01 +0000 +++ src/ipc/Forwarder.h 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ #include "ipc/Request.h" #include - namespace Ipc { === modified file 'src/ipc/Inquirer.cc' --- src/ipc/Inquirer.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/Inquirer.cc 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ #include "MemBuf.h" #include - CBDATA_NAMESPACED_CLASS_INIT(Ipc, Inquirer); Ipc::Inquirer::RequestsMap Ipc::Inquirer::TheRequestsMap; === modified file 'src/ipc/Inquirer.h' --- src/ipc/Inquirer.h 2011-05-13 08:13:01 +0000 +++ src/ipc/Inquirer.h 2012-08-28 13:00:30 +0000 @@ -16,7 +16,6 @@ #include "ipc/StrandCoords.h" #include - namespace Ipc { === modified file 'src/ipc/Kid.h' --- src/ipc/Kid.h 2011-09-06 22:32:30 +0000 +++ src/ipc/Kid.h 2012-08-28 13:00:30 +0000 @@ -8,7 +8,6 @@ #include "SquidString.h" - /// Squid child, including current forked process info and /// info persistent across restarts class Kid @@ -85,7 +84,6 @@ status_type status; ///< exit status of a stopped kid }; - // TODO: processes may not be kids; is there a better place to put this? /// process kinds @@ -99,5 +97,4 @@ /// ProcessKind for the current process extern int TheProcessKind; - #endif /* SQUID_IPC_KID_H */ === modified file 'src/ipc/Kids.h' --- src/ipc/Kids.h 2011-04-14 16:58:28 +0000 +++ src/ipc/Kids.h 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ #include "Array.h" #include "ipc/Kid.h" - /// a collection of kids class Kids { @@ -57,5 +56,4 @@ typedef char KidName[64]; ///< Squid process name (e.g., "squid-coord") extern KidName TheKidName; ///< current Squid process name - #endif /* SQUID_IPC_KIDS_H */ === modified file 'src/ipc/Messages.h' --- src/ipc/Messages.h 2011-04-14 16:58:28 +0000 +++ src/ipc/Messages.h 2012-08-28 13:00:30 +0000 @@ -27,5 +27,4 @@ } // namespace Ipc; - #endif /* SQUID_IPC_MESSAGES_H */ === modified file 'src/ipc/Port.cc' --- src/ipc/Port.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/Port.cc 2012-08-28 13:00:30 +0000 @@ -5,7 +5,6 @@ * */ - #include "squid.h" #include "comm.h" #include "CommCalls.h" @@ -15,7 +14,6 @@ const char Ipc::coordinatorAddr[] = DEFAULT_STATEDIR "/coordinator.ipc"; const char Ipc::strandAddrPfx[] = DEFAULT_STATEDIR "/kid"; - Ipc::Port::Port(const String& aListenAddr): UdsOp(aListenAddr) { === modified file 'src/ipc/Port.h' --- src/ipc/Port.h 2010-10-28 18:52:59 +0000 +++ src/ipc/Port.h 2012-08-28 13:00:30 +0000 @@ -8,15 +8,12 @@ #ifndef SQUID_IPC_PORT_H #define SQUID_IPC_PORT_H - #include "SquidString.h" #include "ipc/UdsOp.h" - namespace Ipc { - /// Waits for and receives incoming IPC messages; kids handle the messages class Port: public UdsOp { @@ -42,11 +39,9 @@ TypedMsgHdr buf; ///< msghdr struct filled by Comm }; - extern const char coordinatorAddr[]; ///< where coordinator listens extern const char strandAddrPfx[]; ///< strand's listening address prefix } // namespace Ipc - #endif /* SQUID_IPC_PORT_H */ === modified file 'src/ipc/Queue.cc' --- src/ipc/Queue.cc 2012-08-06 15:38:12 +0000 +++ src/ipc/Queue.cc 2012-08-28 13:00:30 +0000 @@ -35,7 +35,6 @@ return id; } - /* QueueReader */ InstanceIdDefinitions(Ipc::QueueReader, "ipcQR"); @@ -71,7 +70,6 @@ return sizeof(QueueReaders) + sizeof(QueueReader) * capacity; } - // OneToOneUniQueue Ipc::OneToOneUniQueue::OneToOneUniQueue(const unsigned int aMaxItemSize, const int aCapacity): @@ -97,7 +95,6 @@ return sizeof(OneToOneUniQueue) + maxItemSize * size; } - /* OneToOneUniQueues */ Ipc::OneToOneUniQueues::OneToOneUniQueues(const int aCapacity, const unsigned int maxItemSize, const int queueCapacity): theCapacity(aCapacity) @@ -131,7 +128,6 @@ return *reinterpret_cast(queue); } - // FewToFewBiQueue Ipc::FewToFewBiQueue::Owner * === modified file 'src/ipc/Queue.h' --- src/ipc/Queue.h 2012-08-06 15:38:12 +0000 +++ src/ipc/Queue.h 2012-08-28 13:00:30 +0000 @@ -254,7 +254,6 @@ int theLastPopProcessId; ///< the ID of the last process we tried to pop() from }; - // OneToOneUniQueue template @@ -321,7 +320,6 @@ return wasEmpty && (!reader || reader->raiseSignal()); } - // OneToOneUniQueues inline OneToOneUniQueue & @@ -338,7 +336,6 @@ return *reinterpret_cast(queue); } - // FewToFewBiQueue template === modified file 'src/ipc/ReadWriteLock.cc' --- src/ipc/ReadWriteLock.cc 2012-08-24 09:57:00 +0000 +++ src/ipc/ReadWriteLock.cc 2012-08-28 13:00:30 +0000 @@ -63,7 +63,6 @@ ++stats.count; } - /* Ipc::ReadWriteLockStats */ Ipc::ReadWriteLockStats::ReadWriteLockStats() === modified file 'src/ipc/ReadWriteLock.h' --- src/ipc/ReadWriteLock.h 2011-10-28 01:01:41 +0000 +++ src/ipc/ReadWriteLock.h 2012-08-28 13:00:30 +0000 @@ -30,7 +30,6 @@ Atomic::Word writers; ///< number of writers trying to modify protected data }; - /// approximate stats of a set of ReadWriteLocks class ReadWriteLockStats { === modified file 'src/ipc/Request.h' --- src/ipc/Request.h 2011-05-13 08:13:01 +0000 +++ src/ipc/Request.h 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "ipc/forward.h" #include "RefCount.h" - namespace Ipc { @@ -37,7 +36,6 @@ unsigned int requestId; ///< unique for sender; matches request w/ response }; - } // namespace Ipc #endif /* SQUID_IPC_REQUEST_H */ === modified file 'src/ipc/Response.h' --- src/ipc/Response.h 2011-02-03 08:02:28 +0000 +++ src/ipc/Response.h 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "ipc/forward.h" #include "RefCount.h" - namespace Ipc { @@ -43,7 +42,6 @@ return os; } - } // namespace Ipc #endif /* SQUID_IPC_RESPONSE_H */ === modified file 'src/ipc/SharedListen.cc' --- src/ipc/SharedListen.cc 2012-08-24 09:57:00 +0000 +++ src/ipc/SharedListen.cc 2012-08-28 13:00:30 +0000 @@ -65,8 +65,6 @@ return addr.compareWhole(p.addr) < 0; } - - Ipc::SharedListenRequest::SharedListenRequest(): requestorId(-1), mapId(-1) { // caller will then set public data members @@ -84,7 +82,6 @@ hdrMsg.putPod(*this); } - Ipc::SharedListenResponse::SharedListenResponse(int aFd, int anErrNo, int aMapId): fd(aFd), errNo(anErrNo), mapId(aMapId) { @@ -106,7 +103,6 @@ hdrMsg.putFd(fd); } - void Ipc::JoinSharedListen(const OpenListenerParams ¶ms, AsyncCall::Pointer &callback) { === modified file 'src/ipc/SharedListen.h' --- src/ipc/SharedListen.h 2011-07-20 12:38:39 +0000 +++ src/ipc/SharedListen.h 2012-08-28 13:00:30 +0000 @@ -78,5 +78,4 @@ } // namespace Ipc; - #endif /* SQUID_IPC_SHARED_LISTEN_H */ === modified file 'src/ipc/StartListening.h' --- src/ipc/StartListening.h 2011-05-13 08:13:01 +0000 +++ src/ipc/StartListening.h 2012-08-28 13:00:30 +0000 @@ -44,5 +44,4 @@ } // namespace Ipc; - #endif /* SQUID_IPC_START_LISTENING_H */ === modified file 'src/ipc/StoreMap.cc' --- src/ipc/StoreMap.cc 2012-08-24 09:57:00 +0000 +++ src/ipc/StoreMap.cc 2012-08-28 13:00:30 +0000 @@ -267,7 +267,6 @@ " in map [" << path << ']'); } - /* Ipc::StoreMapSlot */ Ipc::StoreMapSlot::StoreMapSlot(): state(Empty) === modified file 'src/ipc/StoreMap.h' --- src/ipc/StoreMap.h 2012-08-06 15:38:12 +0000 +++ src/ipc/StoreMap.h 2012-08-28 13:00:30 +0000 @@ -197,7 +197,6 @@ return sharedExtras[fileno]; } - } // namespace Ipc // We do not reuse FileMap because we cannot control its size, === modified file 'src/ipc/Strand.cc' --- src/ipc/Strand.cc 2012-08-14 11:53:07 +0000 +++ src/ipc/Strand.cc 2012-08-28 13:00:30 +0000 @@ -32,7 +32,6 @@ CBDATA_NAMESPACED_CLASS_INIT(Ipc, Strand); - Ipc::Strand::Strand(): Port(MakeAddr(strandAddrPfx, KidIdentifier)), isRegistered(false) === modified file 'src/ipc/Strand.h' --- src/ipc/Strand.h 2011-04-14 16:58:28 +0000 +++ src/ipc/Strand.h 2012-08-28 13:00:30 +0000 @@ -52,8 +52,6 @@ CBDATA_CLASS2(Strand); }; - } - #endif /* SQUID_IPC_STRAND_H */ === modified file 'src/ipc/StrandCoord.cc' --- src/ipc/StrandCoord.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/StrandCoord.cc 2012-08-28 13:00:30 +0000 @@ -5,14 +5,12 @@ * */ - #include "squid.h" #include "Debug.h" #include "ipc/Messages.h" #include "ipc/StrandCoord.h" #include "ipc/TypedMsgHdr.h" - Ipc::StrandCoord::StrandCoord(): kidId(-1), pid(0) { } @@ -36,7 +34,6 @@ hdrMsg.putString(tag); } - Ipc::HereIamMessage::HereIamMessage(const StrandCoord &aStrand): strand(aStrand) { === modified file 'src/ipc/StrandCoord.h' --- src/ipc/StrandCoord.h 2011-09-11 21:52:19 +0000 +++ src/ipc/StrandCoord.h 2012-08-28 13:00:30 +0000 @@ -41,8 +41,6 @@ StrandCoord strand; ///< registrant coordinates and related details }; - - } // namespace Ipc; #endif /* SQUID_IPC_STRAND_COORD_H */ === modified file 'src/ipc/StrandSearch.cc' --- src/ipc/StrandSearch.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/StrandSearch.cc 2012-08-28 13:00:30 +0000 @@ -5,13 +5,11 @@ * */ - #include "squid.h" #include "ipc/Messages.h" #include "ipc/StrandSearch.h" #include "ipc/TypedMsgHdr.h" - Ipc::StrandSearchRequest::StrandSearchRequest(): requestorId(-1) { } @@ -31,7 +29,6 @@ hdrMsg.putString(tag); } - /* StrandSearchResponse */ Ipc::StrandSearchResponse::StrandSearchResponse(const Ipc::StrandCoord &aStrand): === modified file 'src/ipc/TypedMsgHdr.cc' --- src/ipc/TypedMsgHdr.cc 2012-08-24 09:57:00 +0000 +++ src/ipc/TypedMsgHdr.cc 2012-08-28 13:00:30 +0000 @@ -5,7 +5,6 @@ * */ - #include "squid.h" #include "protos.h" #include "base/TextException.h" @@ -61,8 +60,6 @@ offset = 0; } - - int Ipc::TypedMsgHdr::type() const { === modified file 'src/ipc/UdsOp.cc' --- src/ipc/UdsOp.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/UdsOp.cc 2012-08-28 13:00:30 +0000 @@ -5,7 +5,6 @@ * */ - #include "squid.h" #include "comm.h" #include "CommCalls.h" @@ -14,7 +13,6 @@ #include "base/TextException.h" #include "ipc/UdsOp.h" - Ipc::UdsOp::UdsOp(const String& pathAddr): AsyncJob("Ipc::UdsOp"), address(PathToAddress(pathAddr)), @@ -68,7 +66,6 @@ timedout(); // our kid handles communication timeout } - struct sockaddr_un Ipc::PathToAddress(const String& pathAddr) { assert(pathAddr.size() != 0); @@ -79,7 +76,6 @@ return unixAddr; } - CBDATA_NAMESPACED_CLASS_INIT(Ipc, UdsSender); Ipc::UdsSender::UdsSender(const String& pathAddr, const TypedMsgHdr& aMessage): @@ -131,7 +127,6 @@ mustStop("timedout"); } - void Ipc::SendMessage(const String& toAddress, const TypedMsgHdr &message) { AsyncJob::Start(new UdsSender(toAddress, message)); === modified file 'src/ipc/UdsOp.h' --- src/ipc/UdsOp.h 2012-08-14 11:53:07 +0000 +++ src/ipc/UdsOp.h 2012-08-28 13:00:30 +0000 @@ -8,7 +8,6 @@ #ifndef SQUID_IPC_ASYNCUDSOP_H #define SQUID_IPC_ASYNCUDSOP_H - #include "SquidString.h" #include "base/AsyncJob.h" #include "cbdata.h" @@ -60,8 +59,6 @@ /// converts human-readable filename path into UDS address extern struct sockaddr_un PathToAddress(const String &pathAddr); - - // XXX: move UdsSender code to UdsSender.{cc,h} /// attempts to send an IPC message a few times, with a timeout class UdsSender: public UdsOp @@ -91,12 +88,10 @@ CBDATA_CLASS2(UdsSender); }; - void SendMessage(const String& toAddress, const TypedMsgHdr& message); /// import socket fd from another strand into our Comm state const Comm::ConnectionPointer & ImportFdIntoComm(const Comm::ConnectionPointer &conn, int socktype, int protocol, FdNoteId noteId); - } #endif /* SQUID_IPC_ASYNCUDSOP_H */ === modified file 'src/ipc/mem/Page.cc' --- src/ipc/mem/Page.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/mem/Page.cc 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include #endif - std::ostream &Ipc::Mem::operator <<(std::ostream &os, const PageId &page) { return os << "sh_page" << page.pool << '.' << page.number; === modified file 'src/ipc/mem/PagePool.cc' --- src/ipc/mem/PagePool.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/mem/PagePool.cc 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ #include "ipc/mem/Page.h" #include "ipc/mem/PagePool.h" - // Ipc::Mem::PagePool Ipc::Mem::PagePool::Owner * === modified file 'src/ipc/mem/PageStack.cc' --- src/ipc/mem/PageStack.cc 2012-08-06 15:38:12 +0000 +++ src/ipc/mem/PageStack.cc 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ /// used to mark a stack slot available for storing free page offsets const Ipc::Mem::PageStack::Value Writable = 0; - Ipc::Mem::PageStack::PageStack(const uint32_t aPoolId, const unsigned int aCapacity, const size_t aPageSize): thePoolId(aPoolId), theCapacity(aCapacity), thePageSize(aPageSize), theSize(theCapacity), === modified file 'src/ipc/mem/Pages.cc' --- src/ipc/mem/Pages.cc 2012-08-14 11:53:07 +0000 +++ src/ipc/mem/Pages.cc 2012-08-28 13:00:30 +0000 @@ -104,7 +104,6 @@ RunnerRegistrationEntry(rrAfterConfig, SharedMemPagesRr); - void SharedMemPagesRr::run(const RunnerRegistry &r) { === modified file 'src/ipc/mem/Pages.h' --- src/ipc/mem/Pages.h 2011-10-27 21:57:26 +0000 +++ src/ipc/mem/Pages.h 2012-08-28 13:00:30 +0000 @@ -25,7 +25,6 @@ /// converts page handler into a temporary writeable shared memory pointer char *PagePointer(const PageId &page); - /* Limits and statistics */ /// the total number of shared memory pages that can be in use at any time === modified file 'src/ipc/mem/Segment.cc' --- src/ipc/mem/Segment.cc 2012-01-20 18:55:04 +0000 +++ src/ipc/mem/Segment.cc 2012-08-28 13:00:30 +0000 @@ -16,7 +16,6 @@ #include #include - // test cases change this const char *Ipc::Mem::Segment::BasePath = DEFAULT_STATEDIR; === modified file 'src/ipcache.cc' --- src/ipcache.cc 2012-08-14 11:53:07 +0000 +++ src/ipcache.cc 2012-08-28 13:00:30 +0000 @@ -177,8 +177,6 @@ return request_time.tv_sec ? tvSubMsec(request_time, current_time) : -1; } - - /** \ingroup IPCacheInternal * @@ -712,7 +710,6 @@ stat_ipcache_get, 0, 1); } - /** \ingroup IPCacheAPI * === modified file 'src/log/ModDaemon.cc' --- src/log/ModDaemon.cc 2012-08-15 15:17:32 +0000 +++ src/log/ModDaemon.cc 2012-08-28 13:00:30 +0000 @@ -226,7 +226,6 @@ eventAdd("logfileFlush", logfileFlushEvent, lf, 1.0, 1); } - /* External code */ int === modified file 'src/log/ModSyslog.cc' --- src/log/ModSyslog.cc 2012-08-14 11:53:07 +0000 +++ src/log/ModSyslog.cc 2012-08-28 13:00:30 +0000 @@ -153,8 +153,6 @@ lf->data = NULL; } - - /* * This code expects the path to be syslog: */ === modified file 'src/log/ModTcp.cc' --- src/log/ModTcp.cc 2012-08-15 15:17:32 +0000 +++ src/log/ModTcp.cc 2012-08-28 13:00:30 +0000 @@ -149,8 +149,6 @@ lf->data = NULL; } - - /* * This code expects the path to be //host:port */ === modified file 'src/log/ModUdp.cc' --- src/log/ModUdp.cc 2012-08-15 15:17:32 +0000 +++ src/log/ModUdp.cc 2012-08-28 13:00:30 +0000 @@ -147,8 +147,6 @@ lf->data = NULL; } - - /* * This code expects the path to be //host:port */ === modified file 'src/log/access_log.cc' --- src/log/access_log.cc 2012-08-24 09:57:00 +0000 +++ src/log/access_log.cc 2012-08-28 13:00:30 +0000 @@ -32,7 +32,6 @@ * */ - #include "squid.h" #include "AccessLogEntry.h" #include "Store.h" === modified file 'src/mem.cc' --- src/mem.cc 2012-08-14 11:53:07 +0000 +++ src/mem.cc 2012-08-28 13:00:30 +0000 @@ -199,7 +199,6 @@ MemPools[type]->zeroOnPush(zeroOnPush); } - /* find appropriate pool and use it (pools always init buffer with 0s) */ void * memAllocate(mem_type type) === modified file 'src/mgr/Action.cc' --- src/mgr/Action.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/Action.cc 2012-08-28 13:00:30 +0000 @@ -19,7 +19,6 @@ #include "SquidTime.h" #include "Store.h" - Mgr::Action::Action(const Command::Pointer &aCmd): cmd(aCmd) { Must(cmd != NULL); === modified file 'src/mgr/Action.h' --- src/mgr/Action.h 2010-10-29 00:12:28 +0000 +++ src/mgr/Action.h 2012-08-28 13:00:30 +0000 @@ -27,7 +27,6 @@ Action(const CommandPointer &aCmd); virtual ~Action(); - /* for local Cache Manager use */ /// collect + fillEntry: collect local information and fill the store entry @@ -36,13 +35,11 @@ /// prepare store entry, dump info, close store entry (if possible) void fillEntry(StoreEntry *entry, bool writeHttpHeader); - /* for global Coordinator use */ /// incrementally merge in remote information (of the same action type) virtual void add(const Action &action); - /* global-local communication */ /// respond to Coordinator request; default is to collect and sendResponse @@ -56,7 +53,6 @@ /// notify Coordinator that this action is done with local processing void sendResponse(unsigned int requestId); - /* Action properties */ /// whether at least some local kid info can be combined and, hence, the @@ -79,11 +75,9 @@ */ virtual void dump(StoreEntry *entry) {} - private: const CommandPointer cmd; ///< the command that caused this action - private: Action(const Action &); // not implemented Action &operator= (const Action &); // not implemented === modified file 'src/mgr/ActionWriter.cc' --- src/mgr/ActionWriter.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/ActionWriter.cc 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "mgr/ActionWriter.h" #include "Store.h" - CBDATA_NAMESPACED_CLASS_INIT(Mgr, ActionWriter); Mgr::ActionWriter::ActionWriter(const Action::Pointer &anAction, const Comm::ConnectionPointer &conn): === modified file 'src/mgr/ActionWriter.h' --- src/mgr/ActionWriter.h 2010-11-26 09:55:11 +0000 +++ src/mgr/ActionWriter.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "HttpRequestMethod.h" #include "mgr/StoreToCommWriter.h" - namespace Mgr { === modified file 'src/mgr/BasicActions.h' --- src/mgr/BasicActions.h 2011-12-30 16:01:37 +0000 +++ src/mgr/BasicActions.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ /* a collection of simple, mostly stateless actions */ - namespace Mgr { @@ -31,7 +30,6 @@ IndexAction(const CommandPointer &cmd); }; - /// returns available Cache Manager actions and their access requirements class MenuAction: public Action { @@ -44,7 +42,6 @@ MenuAction(const CommandPointer &cmd); }; - /// shuts Squid down class ShutdownAction: public Action { === modified file 'src/mgr/CountersAction.cc' --- src/mgr/CountersAction.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/CountersAction.cc 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include "SquidTime.h" #include "Store.h" - extern void GetCountersStats(Mgr::CountersActionData& stats); extern void DumpCountersStats(Mgr::CountersActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/CountersAction.h' --- src/mgr/CountersAction.h 2010-10-28 18:52:59 +0000 +++ src/mgr/CountersAction.h 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "mgr/Action.h" #include - namespace Mgr { === modified file 'src/mgr/Filler.cc' --- src/mgr/Filler.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/Filler.cc 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "mgr/Response.h" #include "Store.h" - CBDATA_NAMESPACED_CLASS_INIT(Mgr, Filler); Mgr::Filler::Filler(const Action::Pointer &anAction, const Comm::ConnectionPointer &conn, === modified file 'src/mgr/Forwarder.cc' --- src/mgr/Forwarder.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/Forwarder.cc 2012-08-28 13:00:30 +0000 @@ -20,10 +20,8 @@ #include "SquidTime.h" #include "Store.h" - CBDATA_NAMESPACED_CLASS_INIT(Mgr, Forwarder); - Mgr::Forwarder::Forwarder(const Comm::ConnectionPointer &aConn, const ActionParams &aParams, HttpRequest* aRequest, StoreEntry* anEntry): Ipc::Forwarder(new Request(KidIdentifier, 0, aConn, aParams), 10), === modified file 'src/mgr/Forwarder.h' --- src/mgr/Forwarder.h 2011-05-13 08:13:01 +0000 +++ src/mgr/Forwarder.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "ipc/Forwarder.h" #include "mgr/ActionParams.h" - class CommCloseCbParams; class HttpRequest; class StoreEntry; === modified file 'src/mgr/FunAction.cc' --- src/mgr/FunAction.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/FunAction.cc 2012-08-28 13:00:30 +0000 @@ -17,7 +17,6 @@ #include "protos.h" #include "Store.h" - Mgr::FunAction::Pointer Mgr::FunAction::Create(const Command::Pointer &aCmd, OBJH* aHandler) { === modified file 'src/mgr/FunAction.h' --- src/mgr/FunAction.h 2010-10-29 00:12:28 +0000 +++ src/mgr/FunAction.h 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "mgr/Action.h" #include "mgr/ActionCreator.h" - namespace Mgr { @@ -38,7 +37,6 @@ OBJH *handler; ///< legacy function that collects and dumps info }; - /// creates FunAction using ActionCreator API class FunActionCreator: public ActionCreator { === modified file 'src/mgr/InfoAction.cc' --- src/mgr/InfoAction.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/InfoAction.cc 2012-08-28 13:00:30 +0000 @@ -21,7 +21,6 @@ #include "SquidTime.h" #include "Store.h" - extern void GetInfo(Mgr::InfoActionData& stats); extern void DumpInfo(Mgr::InfoActionData& stats, StoreEntry* sentry); extern void DumpMallocStatistics(StoreEntry* sentry); === modified file 'src/mgr/InfoAction.h' --- src/mgr/InfoAction.h 2011-10-14 16:21:48 +0000 +++ src/mgr/InfoAction.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "StoreStats.h" #include - namespace Mgr { === modified file 'src/mgr/Inquirer.cc' --- src/mgr/Inquirer.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/Inquirer.cc 2012-08-28 13:00:30 +0000 @@ -25,10 +25,8 @@ #include #include - CBDATA_NAMESPACED_CLASS_INIT(Mgr, Inquirer); - Mgr::Inquirer::Inquirer(Action::Pointer anAction, const Request &aCause, const Ipc::StrandCoords &coords): Ipc::Inquirer(aCause.clone(), applyQueryParams(coords, aCause.params.queryParams), anAction->atomic() ? 10 : 100), === modified file 'src/mgr/IntParam.cc' --- src/mgr/IntParam.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/IntParam.cc 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ #include "ipc/TypedMsgHdr.h" #include "mgr/IntParam.h" - Mgr::IntParam::IntParam(): QueryParam(QueryParam::ptInt), array() { === modified file 'src/mgr/IntParam.h' --- src/mgr/IntParam.h 2011-01-24 17:24:59 +0000 +++ src/mgr/IntParam.h 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ #include "mgr/QueryParam.h" #include - namespace Mgr { === modified file 'src/mgr/IntervalAction.cc' --- src/mgr/IntervalAction.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/IntervalAction.cc 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include "SquidMath.h" #include "Store.h" - extern void GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours); extern void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/IntervalAction.h' --- src/mgr/IntervalAction.h 2010-10-28 18:52:59 +0000 +++ src/mgr/IntervalAction.h 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "mgr/Action.h" #include - namespace Mgr { === modified file 'src/mgr/IoAction.cc' --- src/mgr/IoAction.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/IoAction.cc 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include "SquidMath.h" #include "Store.h" - extern void GetIoStats(Mgr::IoActionData& stats); extern void DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry); === modified file 'src/mgr/QueryParam.h' --- src/mgr/QueryParam.h 2011-01-24 17:24:59 +0000 +++ src/mgr/QueryParam.h 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "ipc/forward.h" #include "RefCount.h" - namespace Mgr { === modified file 'src/mgr/QueryParams.cc' --- src/mgr/QueryParams.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/QueryParams.cc 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "mgr/StringParam.h" #include "mgr/QueryParams.h" - Mgr::QueryParam::Pointer Mgr::QueryParams::get(const String& name) const { === modified file 'src/mgr/QueryParams.h' --- src/mgr/QueryParams.h 2011-03-02 18:49:11 +0000 +++ src/mgr/QueryParams.h 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include #include - namespace Mgr { === modified file 'src/mgr/Request.cc' --- src/mgr/Request.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/Request.cc 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ #include "mgr/ActionParams.h" #include "mgr/Request.h" - Mgr::Request::Request(int aRequestorId, unsigned int aRequestId, const Comm::ConnectionPointer &aConn, const ActionParams &aParams): Ipc::Request(aRequestorId, aRequestId), === modified file 'src/mgr/Request.h' --- src/mgr/Request.h 2011-05-13 08:13:01 +0000 +++ src/mgr/Request.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "ipc/Request.h" #include "mgr/ActionParams.h" - namespace Mgr { @@ -37,7 +36,6 @@ ActionParams params; ///< action name and parameters }; - } // namespace Mgr #endif /* SQUID_MGR_REQUEST_H */ === modified file 'src/mgr/Response.cc' --- src/mgr/Response.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/Response.cc 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include "mgr/ActionProfile.h" #include "mgr/Response.h" - Mgr::Response::Response(unsigned int aRequestId, Action::Pointer anAction): Ipc::Response(aRequestId), action(anAction) { === modified file 'src/mgr/Response.h' --- src/mgr/Response.h 2011-01-19 10:12:54 +0000 +++ src/mgr/Response.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "ipc/Response.h" #include "mgr/Action.h" - namespace Mgr { === modified file 'src/mgr/ServiceTimesAction.h' --- src/mgr/ServiceTimesAction.h 2010-10-28 18:52:59 +0000 +++ src/mgr/ServiceTimesAction.h 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ #include "mgr/Action.h" - namespace Mgr { === modified file 'src/mgr/StoreIoAction.cc' --- src/mgr/StoreIoAction.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/StoreIoAction.cc 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ #include "protos.h" #include "Store.h" - Mgr::StoreIoActionData::StoreIoActionData() { xmemset(this, 0, sizeof(*this)); === modified file 'src/mgr/StoreIoAction.h' --- src/mgr/StoreIoAction.h 2010-10-28 18:52:59 +0000 +++ src/mgr/StoreIoAction.h 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ #include "mgr/Action.h" - namespace Mgr { === modified file 'src/mgr/StoreToCommWriter.cc' --- src/mgr/StoreToCommWriter.cc 2012-08-14 11:53:07 +0000 +++ src/mgr/StoreToCommWriter.cc 2012-08-28 13:00:30 +0000 @@ -16,10 +16,8 @@ #include "StoreClient.h" #include "Store.h" - CBDATA_NAMESPACED_CLASS_INIT(Mgr, StoreToCommWriter); - Mgr::StoreToCommWriter::StoreToCommWriter(const Comm::ConnectionPointer &conn, StoreEntry* anEntry): AsyncJob("Mgr::StoreToCommWriter"), clientConnection(conn), entry(anEntry), sc(NULL), writeOffset(0), closer(NULL) === modified file 'src/mgr/StoreToCommWriter.h' --- src/mgr/StoreToCommWriter.h 2011-05-13 08:13:01 +0000 +++ src/mgr/StoreToCommWriter.h 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ #include "mgr/Action.h" #include "StoreIOBuffer.h" - class store_client; class CommIoCbParams; class CommCloseCbParams; === modified file 'src/mgr/StringParam.cc' --- src/mgr/StringParam.cc 2012-01-20 18:55:04 +0000 +++ src/mgr/StringParam.cc 2012-08-28 13:00:30 +0000 @@ -9,7 +9,6 @@ #include "ipc/TypedMsgHdr.h" #include "mgr/StringParam.h" - Mgr::StringParam::StringParam(): QueryParam(QueryParam::ptString), str() { === modified file 'src/mgr/StringParam.h' --- src/mgr/StringParam.h 2011-01-24 17:24:59 +0000 +++ src/mgr/StringParam.h 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ #include "mgr/QueryParam.h" #include "SquidString.h" - namespace Mgr { === modified file 'src/mime.cc' --- src/mime.cc 2012-08-14 11:53:07 +0000 +++ src/mime.cc 2012-08-28 13:00:30 +0000 @@ -172,7 +172,6 @@ safe_free (url); } - char const * mimeGetIcon(const char *fn) { === modified file 'src/mime_header.cc' --- src/mime_header.cc 2012-08-14 11:53:07 +0000 +++ src/mime_header.cc 2012-08-28 13:00:30 +0000 @@ -119,7 +119,6 @@ return mime_get_header_field(mime, name, NULL); } - size_t headersEnd(const char *mime, size_t l) { === modified file 'src/neighbors.cc' --- src/neighbors.cc 2012-08-14 11:53:07 +0000 +++ src/neighbors.cc 2012-08-28 13:00:30 +0000 @@ -98,7 +98,6 @@ return "Parent"; } - peer * whichPeer(const Ip::Address &from) { === modified file 'src/pconn.h' --- src/pconn.h 2011-09-06 08:24:09 +0000 +++ src/pconn.h 2012-08-28 13:00:30 +0000 @@ -90,7 +90,6 @@ CBDATA_CLASS2(IdleConnList); }; - #include "ip/forward.h" class StoreEntry; @@ -145,7 +144,6 @@ int theCount; ///< the number of pooled connections }; - class StoreEntry; class PconnPool; === modified file 'src/peer_digest.cc' --- src/peer_digest.cc 2012-08-14 11:53:07 +0000 +++ src/peer_digest.cc 2012-08-28 13:00:30 +0000 @@ -70,7 +70,6 @@ static int peerDigestSetCBlock(PeerDigest * pd, const char *buf); static int peerDigestUseful(const PeerDigest * pd); - /* local constants */ Version const CacheDigestVer = { 5, 3 }; @@ -405,7 +404,6 @@ peerDigestHandleReply, fetch); } - /* Handle the data copying .. */ /* @@ -515,8 +513,6 @@ cbdataReferenceDone(fetch); } - - /* wait for full http headers to be received then parse them */ /* * This routine handles parsing the reply line. @@ -865,7 +861,6 @@ peerDigestFetchFinish(fetch, err); } - /* destroys digest if peer disappeared * must be called only when fetch and pd cbdata are valid */ static void @@ -980,7 +975,6 @@ } - static int peerDigestSetCBlock(PeerDigest * pd, const char *buf) { === modified file 'src/peer_proxy_negotiate_auth.cc' --- src/peer_proxy_negotiate_auth.cc 2012-07-18 15:47:58 +0000 +++ src/peer_proxy_negotiate_auth.cc 2012-08-28 13:00:30 +0000 @@ -534,7 +534,6 @@ output_token.length); } - cleanup: gss_delete_sec_context(&minor_status, &gss_context, NULL); gss_release_buffer(&minor_status, &service); === modified file 'src/peer_select.cc' --- src/peer_select.cc 2012-08-14 11:53:07 +0000 +++ src/peer_select.cc 2012-08-28 13:00:30 +0000 @@ -135,7 +135,6 @@ return n; } - void peerSelect(Comm::ConnectionList * paths, HttpRequest * request, @@ -580,7 +579,6 @@ " ICP replies expected, RTT " << ps->ping.timeout << " msec"); - if (ps->ping.n_replies_expected > 0) { entry->ping_status = PING_WAITING; eventAdd("peerPingTimeout", @@ -639,7 +637,6 @@ } } - /* * peerGetSomeDirect * === modified file 'src/peer_userhash.cc' --- src/peer_userhash.cc 2012-08-14 11:53:07 +0000 +++ src/peer_userhash.cc 2012-08-28 13:00:30 +0000 @@ -84,7 +84,6 @@ n_userhash_peers = 0; /* find out which peers we have */ - peerUserHashRegisterWithCacheManager(); for (p = Config.peers; p; p = p->next) { === modified file 'src/protos.h' --- src/protos.h 2012-08-14 11:53:07 +0000 +++ src/protos.h 2012-08-28 13:00:30 +0000 @@ -43,13 +43,11 @@ /* for parameters that still need these */ #include "lookup_t.h" - class HttpRequestMethod; #if USE_DELAY_POOLS class ClientInfo; #endif - #if USE_FORW_VIA_DB extern void fvdbCountVia(const char *key); extern void fvdbCountForw(const char *key); @@ -70,7 +68,6 @@ extern int xatoi(const char *token); extern long xatol(const char *token); - /* extra functions from cache_cf.c useful for lib modules */ SQUIDCEXTERN void parse_int(int *var); SQUIDCEXTERN void parse_onoff(int *var); @@ -79,7 +76,6 @@ SQUIDCEXTERN void requirePathnameExists(const char *name, const char *path); SQUIDCEXTERN void parse_time_t(time_t * var); - /* client_side.c - FD related client side routines */ SQUIDCEXTERN void clientdbInit(void); @@ -163,7 +159,6 @@ /// \ingroup ServerProtocolFTPAPI SQUIDCEXTERN const char *ftpUrlWith2f(HttpRequest *); - /** \defgroup ServerProtocolGopherAPI Server-Side Gopher API \ingroup ServerProtocol @@ -175,7 +170,6 @@ /// \ingroup ServerProtocolGopherAPI SQUIDCEXTERN int gopherCachable(const HttpRequest *); - /** \defgroup ServerProtocolWhoisAPI Server-Side WHOIS API \ingroup ServerProtocol @@ -184,7 +178,6 @@ /// \ingroup ServerProtocolWhoisAPI SQUIDCEXTERN void whoisStart(FwdState *); - /* http.c */ /* for http_hdr_type field */ #include "HttpHeader.h" @@ -223,7 +216,6 @@ SQUIDCEXTERN int httpHeaderParseInt(const char *start, int *val); SQUIDCEXTERN void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3; - /* Http Header */ SQUIDCEXTERN void httpHeaderInitModule(void); SQUIDCEXTERN void httpHeaderCleanModule(void); @@ -357,7 +349,6 @@ extern void rotate_logs(int); extern void reconfigure(int); - extern void start_announce(void *unused); extern void waisStart(FwdState *); @@ -395,7 +386,6 @@ SQUIDCEXTERN void memDataInit(mem_type, const char *, size_t, int, bool zeroOnPush = true); SQUIDCEXTERN void memCheckInit(void); - /* Mem */ SQUIDCEXTERN void memConfigure(void); @@ -412,7 +402,6 @@ extern void storeLogClose(void); extern void storeLogOpen(void); - /* * store_key_*.c */ @@ -455,7 +444,6 @@ /// checks whether the loaded entry should be kept; updates counters extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts); - /* * store_swapin.c */ @@ -472,7 +460,6 @@ SQUIDCEXTERN int storePendingNClients(const StoreEntry * e); SQUIDCEXTERN int storeClientIsThisAClient(store_client * sc, void *someClient); - SQUIDCEXTERN const char *getMyHostname(void); SQUIDCEXTERN const char *uniqueHostname(void); SQUIDCEXTERN void safeunlink(const char *path, int quiet); @@ -582,7 +569,6 @@ SQUIDCEXTERN char *strwordtok(char *buf, char **t); SQUIDCEXTERN void strwordquote(MemBuf * mb, const char *str); - /* * ipc.c */ === modified file 'src/recv-announce.cc' --- src/recv-announce.cc 2012-07-18 15:47:58 +0000 +++ src/recv-announce.cc 2012-08-28 13:00:30 +0000 @@ -76,7 +76,6 @@ exit(0); } - int main(int argc, char *argv[]) { @@ -93,7 +92,6 @@ signal(len, sig_handle); } - if (argc > 1) logfile = argv[1]; else @@ -109,7 +107,6 @@ close(2); dup(1); - IPAddress ipa; chat tmp[MAX_HOSTNAMELEN]; for (;;) { === modified file 'src/repl/heap/store_heap_replacement.cc' --- src/repl/heap/store_heap_replacement.cc 2012-08-14 11:53:07 +0000 +++ src/repl/heap/store_heap_replacement.cc 2012-08-28 13:00:30 +0000 @@ -98,7 +98,6 @@ return (double) key; } - /* * Key generation function to implement the GDS-Frequency policy. * Similar to Greedy Dual-Size Hits policy, but adds aging of === modified file 'src/snmp/Forwarder.cc' --- src/snmp/Forwarder.cc 2012-08-14 11:53:07 +0000 +++ src/snmp/Forwarder.cc 2012-08-28 13:00:30 +0000 @@ -16,10 +16,8 @@ #include "snmp/Request.h" #include "snmp/Response.h" - CBDATA_NAMESPACED_CLASS_INIT(Snmp, Forwarder); - Snmp::Forwarder::Forwarder(const Pdu& aPdu, const Session& aSession, int aFd, const Ip::Address& anAddress): Ipc::Forwarder(new Request(KidIdentifier, 0, aPdu, aSession, aFd, anAddress), 2), === modified file 'src/snmp/Forwarder.h' --- src/snmp/Forwarder.h 2011-01-31 14:04:00 +0000 +++ src/snmp/Forwarder.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "snmp/Pdu.h" #include "snmp/Session.h" - class CommCloseCbParams; namespace Snmp === modified file 'src/snmp/Inquirer.cc' --- src/snmp/Inquirer.cc 2012-01-20 18:55:04 +0000 +++ src/snmp/Inquirer.cc 2012-08-28 13:00:30 +0000 @@ -16,10 +16,8 @@ #include "snmp/Response.h" #include "snmp/Request.h" - CBDATA_NAMESPACED_CLASS_INIT(Snmp, Inquirer); - Snmp::Inquirer::Inquirer(const Request& aRequest, const Ipc::StrandCoords& coords): Ipc::Inquirer(aRequest.clone(), coords, 2), aggrPdu(aRequest.pdu) === modified file 'src/snmp/Inquirer.h' --- src/snmp/Inquirer.h 2011-05-13 08:13:01 +0000 +++ src/snmp/Inquirer.h 2012-08-28 13:00:30 +0000 @@ -13,7 +13,6 @@ #include "snmp/forward.h" #include "snmp/Pdu.h" - class CommCloseCbParams; namespace Snmp === modified file 'src/snmp/Pdu.cc' --- src/snmp/Pdu.cc 2012-07-13 10:48:12 +0000 +++ src/snmp/Pdu.cc 2012-08-28 13:00:30 +0000 @@ -16,7 +16,6 @@ #include #endif - Snmp::Pdu::Pdu() { init(); === modified file 'src/snmp/Pdu.h' --- src/snmp/Pdu.h 2011-05-30 06:02:25 +0000 +++ src/snmp/Pdu.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "Range.h" #include "snmp.h" - namespace Snmp { === modified file 'src/snmp/Request.cc' --- src/snmp/Request.cc 2012-01-20 18:55:04 +0000 +++ src/snmp/Request.cc 2012-08-28 13:00:30 +0000 @@ -10,7 +10,6 @@ #include "ipc/TypedMsgHdr.h" #include "snmp/Request.h" - Snmp::Request::Request(int aRequestorId, unsigned int aRequestId, const Pdu& aPdu, const Session& aSession, int aFd, const Ip::Address& anAddress): === modified file 'src/snmp/Request.h' --- src/snmp/Request.h 2011-02-03 08:02:28 +0000 +++ src/snmp/Request.h 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include "snmp/Pdu.h" #include "snmp/Session.h" - namespace Snmp { @@ -40,7 +39,6 @@ Ip::Address address; ///< client address }; - } // namespace Snmp #endif /* SQUID_SNMPX_REQUEST_H */ === modified file 'src/snmp/Response.cc' --- src/snmp/Response.cc 2012-01-20 18:55:04 +0000 +++ src/snmp/Response.cc 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "ipc/TypedMsgHdr.h" #include "snmp/Response.h" - std::ostream& Snmp::operator << (std::ostream& os, const Response& response) { os << "response: {requestId: " << response.requestId << '}'; === modified file 'src/snmp/Session.cc' --- src/snmp/Session.cc 2012-01-20 18:55:04 +0000 +++ src/snmp/Session.cc 2012-08-28 13:00:30 +0000 @@ -11,7 +11,6 @@ #include "protos.h" #include "snmp/Session.h" - Snmp::Session::Session() { clear(); === modified file 'src/snmp/Session.h' --- src/snmp/Session.h 2011-05-30 06:02:25 +0000 +++ src/snmp/Session.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "snmp.h" #include "snmp_session.h" - namespace Snmp { === modified file 'src/snmp/Var.cc' --- src/snmp/Var.cc 2012-01-20 18:55:04 +0000 +++ src/snmp/Var.cc 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #include #endif - Snmp::Var::Var() { init(); === modified file 'src/snmp/Var.h' --- src/snmp/Var.h 2011-05-30 06:02:25 +0000 +++ src/snmp/Var.h 2012-08-28 13:00:30 +0000 @@ -12,7 +12,6 @@ #include "Range.h" #include "snmp_vars.h" - namespace Snmp { === modified file 'src/snmp_agent.cc' --- src/snmp_agent.cc 2012-08-14 11:53:07 +0000 +++ src/snmp_agent.cc 2012-08-28 13:00:30 +0000 @@ -194,7 +194,6 @@ return Answer; } - /* * cacheMesh group * - cachePeerTable @@ -224,7 +223,6 @@ return NULL; } - switch (Var->name[LEN_SQ_MESH + 2]) { case MESH_PTBL_INDEX: { // FIXME INET6: Should be visible? Answer = snmp_var_new_integer(Var->name, Var->name_length, @@ -232,7 +230,6 @@ } break; - case MESH_PTBL_NAME: cp = p->host; Answer = snmp_var_new(Var->name, Var->name_length); === modified file 'src/snmp_core.cc' --- src/snmp_core.cc 2012-08-14 11:53:07 +0000 +++ src/snmp_core.cc 2012-08-28 13:00:30 +0000 @@ -643,7 +643,6 @@ if (mibTreeEntry == mib_tree_last) return (Fn); - if ((mibTreeEntry) && (mibTreeEntry->parsefunction)) { *NextLen = CurrentLen; *Next = (*mibTreeEntry->instancefunction) (Current, NextLen, mibTreeEntry, &Fn); @@ -742,7 +741,6 @@ return (instance); } - static oid * peer_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn) { @@ -1003,7 +1001,6 @@ return m; } - /* * Adds a node to the MIB tree structure and adds the appropriate children */ @@ -1087,8 +1084,6 @@ debugs(49, lvl, buf); } - - /* IPv4 address: 10.10.0.9 ==> oid == 10.10.0.9 === modified file 'src/snmp_core.h' --- src/snmp_core.h 2011-06-04 12:48:45 +0000 +++ src/snmp_core.h 2012-08-28 13:00:30 +0000 @@ -14,7 +14,6 @@ #define SNMP_REQUEST_SIZE 4096 #define MAX_PROTOSTAT 5 - typedef struct _mib_tree_entry mib_tree_entry; typedef oid *(instance_Fn) (oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn); typedef enum {atNone = 0, atSum, atAverage, atMax, atMin} AggrType; === modified file 'src/ssl/ErrorDetailManager.cc' --- src/ssl/ErrorDetailManager.cc 2012-08-14 11:53:07 +0000 +++ src/ssl/ErrorDetailManager.cc 2012-08-28 13:00:30 +0000 @@ -87,7 +87,6 @@ TheDetailsManager = NULL; } - Ssl::ErrorDetailsManager::ErrorDetailsManager() { theDefaultErrorDetails = new ErrorDetailsList(); === modified file 'src/ssl/ErrorDetailManager.h' --- src/ssl/ErrorDetailManager.h 2012-08-24 09:57:00 +0000 +++ src/ssl/ErrorDetailManager.h 2012-08-28 13:00:30 +0000 @@ -87,7 +87,6 @@ static ErrorDetailsManager *TheDetailsManager; }; - void errorDetailInitialize(); void errorDetailClean(); } //namespace Ssl === modified file 'src/ssl/ServerBump.cc' --- src/ssl/ServerBump.cc 2012-08-14 11:53:07 +0000 +++ src/ssl/ServerBump.cc 2012-08-28 13:00:30 +0000 @@ -13,10 +13,8 @@ #include "ssl/ServerBump.h" #include "Store.h" - CBDATA_NAMESPACED_CLASS_INIT(Ssl, ServerBump); - Ssl::ServerBump::ServerBump(HttpRequest *fakeRequest, StoreEntry *e): request(fakeRequest), sslErrors(NULL) === modified file 'src/ssl/certificate_db.cc' --- src/ssl/certificate_db.cc 2012-08-08 07:21:13 +0000 +++ src/ssl/certificate_db.cc 2012-08-28 13:00:30 +0000 @@ -56,7 +56,6 @@ #endif throw std::runtime_error("Failed to open file " + filename); - #if _SQUID_MSWIN_ if (!LockFile(hFile, 0, 0, 1, 0)) #else === modified file 'src/ssl/context_storage.h' --- src/ssl/context_storage.h 2010-11-18 08:01:53 +0000 +++ src/ssl/context_storage.h 2012-08-28 13:00:30 +0000 @@ -88,7 +88,6 @@ Queue lru_queue; ///< LRU cache index }; - /// Class for storing/manipulating LocalContextStorage per local listening address/port. class GlobalContextStorage { === modified file 'src/ssl/crtd_message.cc' --- src/ssl/crtd_message.cc 2012-07-23 07:02:06 +0000 +++ src/ssl/crtd_message.cc 2012-08-28 13:00:30 +0000 @@ -124,7 +124,6 @@ void Ssl::CrtdMessage::setCode(std::string const & aCode) { code = aCode; } - std::string Ssl::CrtdMessage::compose() const { if (code.empty()) return std::string(); @@ -177,7 +176,6 @@ body += '\n' + other_part; } - bool Ssl::CrtdMessage::parseRequest(Ssl::CertificateProperties &certProperties, std::string &error) { Ssl::CrtdMessage::BodyParams map; === modified file 'src/ssl/gadgets.cc' --- src/ssl/gadgets.cc 2012-07-23 15:34:12 +0000 +++ src/ssl/gadgets.cc 2012-08-28 13:00:30 +0000 @@ -603,7 +603,6 @@ return false; } - char *alStr1; int alLen; alStr1 = (char *)X509_alias_get0(cert, &alLen); === modified file 'src/ssl/gadgets.h' --- src/ssl/gadgets.h 2012-07-27 23:02:09 +0000 +++ src/ssl/gadgets.h 2012-08-28 13:00:30 +0000 @@ -95,7 +95,6 @@ CtoCpp1(SSL_free, SSL *) typedef TidyPointer SSL_Pointer; - /** \ingroup SslCrtdSslAPI * Create 1024 bits rsa key. === modified file 'src/ssl/support.cc' --- src/ssl/support.cc 2012-08-15 15:17:32 +0000 +++ src/ssl/support.cc 2012-08-28 13:00:30 +0000 @@ -1245,7 +1245,6 @@ PEM_write_bio_X509(mem, cert); - len = BIO_get_mem_data(mem, &ptr); str = (char *)xmalloc(len + 1); === modified file 'src/ssl/support.h' --- src/ssl/support.h 2012-06-19 21:51:49 +0000 +++ src/ssl/support.h 2012-08-28 13:00:30 +0000 @@ -88,7 +88,6 @@ /// \ingroup ServerProtocolSSLAPI void ssl_shutdown_method(SSL *ssl); - /// \ingroup ServerProtocolSSLAPI const char *sslGetUserEmail(SSL *ssl); === modified file 'src/stat.cc' --- src/stat.cc 2012-08-14 11:53:07 +0000 +++ src/stat.cc 2012-08-28 13:00:30 +0000 @@ -91,7 +91,6 @@ CBDATA_CLASS2(StatObjectsState); }; - /* LOCALS */ static const char *describeStatuses(const StoreEntry *); static const char *describeTimestamps(const StoreEntry *); @@ -1380,7 +1379,6 @@ #endif } - void statInit(void) { === modified file 'src/stmem.cc' --- src/stmem.cc 2012-08-14 11:53:07 +0000 +++ src/stmem.cc 2012-08-28 13:00:30 +0000 @@ -362,7 +362,6 @@ return candidate; } - bool mem_hdr::write (StoreIOBuffer const &writeBuffer) { === modified file 'src/store.cc' --- src/store.cc 2012-08-14 11:53:07 +0000 +++ src/store.cc 2012-08-28 13:00:30 +0000 @@ -71,7 +71,6 @@ #define STORE_IN_MEM_BUCKETS (229) - /** \todo Convert these string constants to enum string-arrays generated */ const char *memStatusStr[] = { @@ -96,7 +95,6 @@ "SWAPOUT_DONE" }; - /* * This defines an repl type */ @@ -110,7 +108,6 @@ static storerepl_entry_t *storerepl_list = NULL; - /* * local function prototypes */ @@ -493,7 +490,6 @@ /* -------------------------------------------------------------------------- */ - /* get rid of memory copy of the object */ void StoreEntry::purgeMem() @@ -903,7 +899,6 @@ write(tempBuffer); } - void storeAppendPrintf(StoreEntry * e, const char *fmt,...) { @@ -1206,7 +1201,6 @@ PROF_stop(storeGetMemSpace); } - /* thunk through to Store::Root().maintain(). Note that this would be better still * if registered against the root store itself, but that requires more complex * update logic - bigger fish to fry first. Long term each store when @@ -1825,7 +1819,6 @@ #endif - /* * Replace a store entry with * a new reply. This eats the reply. @@ -1846,7 +1839,6 @@ startWriting(); } - void StoreEntry::startWriting() { @@ -1871,7 +1863,6 @@ packerClean(&p); } - char const * StoreEntry::getSerialisedMetaData() { === modified file 'src/store_digest.cc' --- src/store_digest.cc 2012-08-14 11:53:07 +0000 +++ src/store_digest.cc 2012-08-28 13:00:30 +0000 @@ -33,7 +33,6 @@ * */ - /* * TODO: We probably do not track all the cases when * storeDigestNoteStoreReady() must be called; this may prevent @@ -77,7 +76,6 @@ int rewrite_count; }; - typedef struct { int del_count; /* #store entries deleted from store_digest */ int del_lost_count; /* #store entries not found in store_digest on delete */ @@ -375,7 +373,6 @@ eventAdd("storeDigestRebuildStep", storeDigestRebuildStep, NULL, 0.0, 1); } - /* starts swap out sequence for the digest */ static void storeDigestRewriteStart(void *datanotused) === modified file 'src/store_dir.cc' --- src/store_dir.cc 2012-08-15 15:17:32 +0000 +++ src/store_dir.cc 2012-08-28 13:00:30 +0000 @@ -70,7 +70,6 @@ #include #endif - static STDIRSELECT storeDirSelectSwapDirRoundRobin; static STDIRSELECT storeDirSelectSwapDirLeastLoad; @@ -194,7 +193,6 @@ return min_objsize <= objsize && max_objsize > objsize; } - /* * This new selection scheme simply does round-robin on all SwapDirs. * A SwapDir is skipped if it is over the max_size (100%) limit, or @@ -523,7 +521,6 @@ debugs(20, DBG_IMPORTANT, " Took "<< std::setw(3)<< std::setprecision(2) << dt << " seconds ("<< std::setw(6) << ((double) n / (dt > 0.0 ? dt : 1.0)) << " entries/sec)."); - return n; } === modified file 'src/store_swapmeta.cc' --- src/store_swapmeta.cc 2012-08-14 11:53:07 +0000 +++ src/store_swapmeta.cc 2012-08-28 13:00:30 +0000 @@ -94,7 +94,6 @@ return NULL; } - if (objsize >= 0) { T = StoreMeta::Add(T, t); t = StoreMeta::Factory(STORE_META_OBJSIZE, sizeof(objsize), &objsize); === modified file 'src/store_swapout.cc' --- src/store_swapout.cc 2012-08-14 11:53:07 +0000 +++ src/store_swapout.cc 2012-08-28 13:00:30 +0000 @@ -179,7 +179,6 @@ } while (true); } - /* This routine is called every time data is sent to the client side. * It's overhead is therefor, significant. */ === modified file 'src/structs.h' --- src/structs.h 2012-08-14 11:53:07 +0000 +++ src/structs.h 2012-08-28 13:00:30 +0000 @@ -695,7 +695,6 @@ off_t offset; }; - /* per field statistics */ class HttpHeaderFieldStat @@ -962,7 +961,6 @@ Http, Ftp, Gopher; }; - struct request_flags { request_flags(): range(0),nocache(0),ims(0),auth(0),cachable(0),hierarchical(0),loopdetect(0),proxy_keepalive(0),proxying(0),refresh(0),redirected(0),need_validation(0),fail_on_validation_err(0),stale_if_hit(0),accelerated(0),ignore_cc(0),intercepted(0),hostVerified(0),spoof_client_ip(0),internal(0),internalclient(0),must_keepalive(0),pinned(0),canRePin(0),chunked_reply(0),stream_error(0),sslPeek(0),sslBumped(0),destinationIPLookedUp_(0) { #if USE_HTTP_VIOLATIONS @@ -1071,7 +1069,6 @@ int max_stale; }; - struct _CacheDigest { /* public, read-only */ char *mask; /* bit mask */ @@ -1082,7 +1079,6 @@ int del_count; /* number of deletions performed so far */ }; - struct _store_rebuild_data { int objcount; /* # objects successfully reloaded */ int expcount; /* # objects expired */ === modified file 'src/test_cache_digest.cc' --- src/test_cache_digest.cc 2012-08-15 15:17:32 +0000 +++ src/test_cache_digest.cc 2012-08-28 13:00:30 +0000 @@ -64,7 +64,6 @@ int bad_del_count; /* #dels with no prior add */ }; - typedef struct _CacheEntry { const cache_key *key; @@ -241,7 +240,6 @@ xfree(e); } - /* Cache */ static Cache * @@ -502,7 +500,6 @@ return frOk; } - static void cachePurge(Cache * cache, storeSwapLogData * s, int update_digest) { === modified file 'src/tests/STUB.h' --- src/tests/STUB.h 2012-08-08 12:14:34 +0000 +++ src/tests/STUB.h 2012-08-28 13:00:30 +0000 @@ -36,7 +36,6 @@ /// Intended for registration pattern APIs where the function result does not matter to the test #define STUB_RETVAL_NOP(x) { std::cerr<<"SKIP: "< - class testStatHist : public CPPUNIT_NS::TestFixture { CPPUNIT_TEST_SUITE( testStatHist ); === modified file 'src/tests/testStore.h' --- src/tests/testStore.h 2012-08-14 11:53:07 +0000 +++ src/tests/testStore.h 2012-08-28 13:00:30 +0000 @@ -6,7 +6,6 @@ #include - /* * test the store framework */ @@ -29,7 +28,6 @@ void testMaxSize(); }; - /* subclass of Store to allow testing of methods without having all the * other components live */ @@ -75,6 +73,5 @@ typedef RefCount TestStorePointer; - #endif === modified file 'src/tests/testStoreController.cc' --- src/tests/testStoreController.cc 2012-08-24 09:57:00 +0000 +++ src/tests/testStoreController.cc 2012-08-28 13:00:30 +0000 @@ -19,7 +19,6 @@ ++Config.cacheSwap.n_configured; } - void testStoreController::testStats() { === modified file 'src/tests/testStoreHashIndex.cc' --- src/tests/testStoreHashIndex.cc 2012-08-24 09:57:00 +0000 +++ src/tests/testStoreHashIndex.cc 2012-08-28 13:00:30 +0000 @@ -20,7 +20,6 @@ ++Config.cacheSwap.n_configured; } - void testStoreHashIndex::testStats() { === modified file 'src/tests/testURLScheme.cc' --- src/tests/testURLScheme.cc 2012-08-14 11:53:07 +0000 +++ src/tests/testURLScheme.cc 2012-08-28 13:00:30 +0000 @@ -15,7 +15,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION( testURLScheme ); - #if 0 /* * We should be able to make an HttpRequestMethod straight from a string. === modified file 'src/tests/testUfs.cc' --- src/tests/testUfs.cc 2012-08-14 11:53:07 +0000 +++ src/tests/testUfs.cc 2012-08-28 13:00:30 +0000 @@ -101,7 +101,6 @@ commonInit(); mem_policy = createRemovalPolicy(Config.replPolicy); - char *path=xstrdup(TESTDIR); char *config_line=xstrdup("foo 100 1 1"); === modified file 'src/tools.cc' --- src/tools.cc 2012-08-15 15:17:32 +0000 +++ src/tools.cc 2012-08-28 13:00:30 +0000 @@ -311,7 +311,6 @@ #endif } - void PrintRusage(void) { @@ -328,7 +327,6 @@ rusage_pagefaults(&rusage)); } - void death(int sig) { @@ -513,7 +511,6 @@ va_end(args); } - /* used by fatalf */ static void fatalvf(const char *fmt, va_list args) @@ -934,7 +931,6 @@ file_close(fd); } - pid_t readPidFile(void) { === modified file 'src/tunnel.cc' --- src/tunnel.cc 2012-08-15 15:17:32 +0000 +++ src/tunnel.cc 2012-08-28 13:00:30 +0000 @@ -559,7 +559,6 @@ cbdataInternalUnlock(tunnelState); } - static void tunnelConnectDone(const Comm::ConnectionPointer &conn, comm_err_t status, int xerrno, void *data) { === modified file 'src/ufsdump.cc' --- src/ufsdump.cc 2012-01-20 18:55:04 +0000 +++ src/ufsdump.cc 2012-08-28 13:00:30 +0000 @@ -189,7 +189,6 @@ for_each(*metadata, dumper); - return 0; } catch (std::runtime_error error) { std::cout << "Failed : " << error.what() << std::endl; === modified file 'src/url.cc' --- src/url.cc 2012-08-14 11:53:07 +0000 +++ src/url.cc 2012-08-28 13:00:30 +0000 @@ -626,7 +626,6 @@ return urlCanonicalClean(request); } - /* * Test if a URL is relative. * @@ -823,7 +822,6 @@ return (xtolower(h[hl]) - xtolower(d[dl])); } - /* * return true if we can serve requests for this method. */ === modified file 'src/urn.cc' --- src/urn.cc 2012-08-14 11:53:07 +0000 +++ src/urn.cc 2012-08-28 13:00:30 +0000 @@ -64,7 +64,6 @@ virtual ~UrnState(); - StoreEntry *entry; store_client *sc; StoreEntry *urlres_e; === modified file 'src/wccp.cc' --- src/wccp.cc 2012-08-14 11:53:07 +0000 +++ src/wccp.cc 2012-08-28 13:00:30 +0000 @@ -41,7 +41,6 @@ #include "event.h" #include "structs.h" - #define WCCP_PORT 2048 #define WCCP_REVISION 0 #define WCCP_ACTIVE_CACHES 32 @@ -164,7 +163,6 @@ debugs(80, DBG_IMPORTANT, "Accepting WCCPv1 messages on " << Config.Wccp.address << ", FD " << theWccpConnection << "."); - // Sadly WCCP only does IPv4 struct sockaddr_in router; @@ -181,7 +179,6 @@ local_ip = local; } - void wccpConnectionClose(void) { === modified file 'src/wccp2.cc' --- src/wccp2.cc 2012-08-14 11:53:07 +0000 +++ src/wccp2.cc 2012-08-28 13:00:30 +0000 @@ -73,11 +73,9 @@ #define WCCP2_NUMPORTS 8 #define WCCP2_PASSWORD_LEN 8 - /* WCCPv2 Pakcet format structures */ /* Defined in draft-wilson-wccp-v2-12-oct-2001.txt */ - /** \interface WCCPv2_Protocol * Generic header struct */ @@ -100,8 +98,6 @@ #define WCCP2_ASSIGN_MAP 14 #define WCCP2_COMMAND_EXTENSION 15 - - /** \interface WCCPv2_Protocol * Sect 5.5 WCCP Message Header */ @@ -120,7 +116,6 @@ #define WCCP2_REDIRECT_ASSIGN 12 #define WCCP2_REMOVAL_QUERY 13 - /** \interface WCCPv2_Protocol * Sect 5.6.1 Security Info Component * @@ -136,7 +131,6 @@ #define WCCP2_NO_SECURITY 0 #define WCCP2_MD5_SECURITY 1 - /** \interface WCCPv2_Protocol * Sect 5.6.1 Security Info Component * @@ -191,7 +185,6 @@ #define WCCP2_SERVICE_SRC_PORT_ALT_HASH 0x400 #define WCCP2_SERVICE_DST_PORT_ALT_HASH 0x800 - /* TODO the following structures need to be re-defined for correct full operation. wccp2_cache_identity_element needs to be merged as a sub-struct of wccp2_identity_info_t (identity_type); which frees up the identifty info @@ -237,7 +230,6 @@ uint32_t number_values; }; - /** \interface WCCPv2_Protocol * Sect 5.7.2 Web-Cache Identity Element */ @@ -349,8 +341,6 @@ #define WCCP2_PACKET_RETURN_METHOD_GRE WCCP2_METHOD_GRE #define WCCP2_PACKET_RETURN_METHOD_L2 WCCP2_METHOD_L2 - - /** \interface WCCPv2_Protocol * 5.7.8 Value Element */ @@ -627,7 +617,6 @@ return 1; } - /* * Check the given WCCP2 packet against the given password. */ @@ -680,7 +669,6 @@ return (memcmp(md5_digest, md5_challenge, 16) == 0); } - void wccp2Init(void) { @@ -2006,7 +1994,6 @@ } } - /* * Configuration option parsing code */ === modified file 'src/win32.cc' --- src/win32.cc 2012-08-14 11:53:07 +0000 +++ src/win32.cc 2012-08-28 13:00:30 +0000 @@ -49,7 +49,6 @@ void WIN32_ExceptionHandlerCleanup(void); static LPTOP_LEVEL_EXCEPTION_FILTER Win32_Old_ExceptionHandler = NULL; - int WIN32_pipe(int handles[2]) { int new_socket; @@ -195,7 +194,6 @@ return EXCEPTION_CONTINUE_SEARCH; } - void WIN32_ExceptionHandlerInit() { #if !defined(_DEBUG) === modified file 'test-suite/hash.c' --- test-suite/hash.c 2012-01-20 18:55:04 +0000 +++ test-suite/hash.c 2012-08-28 13:00:30 +0000 @@ -347,7 +347,6 @@ return (hid->buckets[bucket]); } - void hashFreeMemory(hash_table * hid) { @@ -357,7 +356,6 @@ free(hid); } - #if USE_HASH_DRIVER /* * hash-driver - Run with a big file as stdin to insert each line into the @@ -411,7 +409,6 @@ } printf("done walking hash table...\n"); - printf("driver finished.\n"); exit(0); } === modified file 'test-suite/pconn-banger.c' --- test-suite/pconn-banger.c 2012-01-20 18:55:04 +0000 +++ test-suite/pconn-banger.c 2012-08-28 13:00:30 +0000 @@ -95,7 +95,6 @@ return buf; } - char * mime_headers_end(const char *mime) { === modified file 'test-suite/tcp-banger2.c' --- test-suite/tcp-banger2.c 2012-01-20 18:55:04 +0000 +++ test-suite/tcp-banger2.c 2012-08-28 13:00:30 +0000 @@ -126,7 +126,6 @@ int nfds = 0; int maxfd = 0; - static void free_request(struct _request *r) { === modified file 'test-suite/tcp-banger3.c' --- test-suite/tcp-banger3.c 2012-01-20 18:55:04 +0000 +++ test-suite/tcp-banger3.c 2012-08-28 13:00:30 +0000 @@ -368,7 +368,6 @@ signal(sig, sig_child); } - int main(int argc, char *argv[]) { === modified file 'tools/cachemgr.cc' --- tools/cachemgr.cc 2012-07-20 15:31:04 +0000 +++ tools/cachemgr.cc 2012-08-28 13:00:30 +0000 @@ -119,7 +119,6 @@ } #endif - #ifndef DEFAULT_CACHEMGR_CONFIG #define DEFAULT_CACHEMGR_CONFIG "/etc/squid/cachemgr.conf" #endif @@ -325,7 +324,6 @@ printf("\n"); - if (fp != NULL) { int servers = 0; char config_line[BUFSIZ]; @@ -1068,7 +1066,6 @@ return req; } - /* Routines to support authentication */ /* === modified file 'tools/purge/socket.cc' --- tools/purge/socket.cc 2012-01-20 18:55:04 +0000 +++ tools/purge/socket.cc 2012-08-28 13:00:30 +0000 @@ -120,7 +120,6 @@ return 0; } - int commonCode( int& sockfd, bool nodelay, int sendBufferSize, int recvBufferSize ) // purpose: common code in server sockets and client sockets === modified file 'tools/squidclient.cc' --- tools/squidclient.cc 2012-07-20 15:31:04 +0000 +++ tools/squidclient.cc 2012-08-28 13:00:30 +0000 @@ -134,7 +134,6 @@ static ssize_t myread(int fd, void *buf, size_t len); static ssize_t mywrite(int fd, void *buf, size_t len); - #if HAVE_GSSAPI static int check_gss_err(OM_uint32 major_status, OM_uint32 minor_status, const char *function); static char *GSSAPI_token(const char *server);