|
 |
6b82d1b |
--- contrib/halog/halog.c.orig 2014-07-25 01:56:07.000000000 -0500
|
|
|
6b82d1b |
+++ contrib/halog/halog.c 2014-07-25 15:24:56.996876765 -0500
|
|
|
6b82d1b |
@@ -462,7 +462,7 @@ int convert_date(const char *field)
|
|
|
98262d9 |
{
|
|
|
98262d9 |
unsigned int h, m, s, ms;
|
|
|
98262d9 |
unsigned char c;
|
|
|
98262d9 |
- const char *b, *e;
|
|
|
98262d9 |
+ const char *e;
|
|
|
98262d9 |
|
|
|
98262d9 |
h = m = s = ms = 0;
|
|
|
98262d9 |
e = field;
|
|
|
6b82d1b |
@@ -477,7 +477,6 @@ int convert_date(const char *field)
|
|
|
98262d9 |
}
|
|
|
98262d9 |
|
|
|
98262d9 |
/* hour + ':' */
|
|
|
98262d9 |
- b = e;
|
|
|
98262d9 |
while (1) {
|
|
|
98262d9 |
c = *(e++) - '0';
|
|
|
98262d9 |
if (c > 9)
|
|
|
6b82d1b |
@@ -488,7 +487,6 @@ int convert_date(const char *field)
|
|
|
98262d9 |
goto out_err;
|
|
|
98262d9 |
|
|
|
98262d9 |
/* minute + ':' */
|
|
|
98262d9 |
- b = e;
|
|
|
98262d9 |
while (1) {
|
|
|
98262d9 |
c = *(e++) - '0';
|
|
|
98262d9 |
if (c > 9)
|
|
|
6b82d1b |
@@ -499,7 +497,6 @@ int convert_date(const char *field)
|
|
|
98262d9 |
goto out_err;
|
|
|
98262d9 |
|
|
|
98262d9 |
/* second + '.' or ']' */
|
|
|
98262d9 |
- b = e;
|
|
|
98262d9 |
while (1) {
|
|
|
98262d9 |
c = *(e++) - '0';
|
|
|
98262d9 |
if (c > 9)
|
|
|
6b82d1b |
@@ -512,7 +509,6 @@ int convert_date(const char *field)
|
|
|
98262d9 |
/* if there's a '.', we have milliseconds */
|
|
|
98262d9 |
if (c == (unsigned char)('.' - '0')) {
|
|
|
98262d9 |
/* millisecond second + ']' */
|
|
|
98262d9 |
- b = e;
|
|
|
98262d9 |
while (1) {
|
|
|
98262d9 |
c = *(e++) - '0';
|
|
|
98262d9 |
if (c > 9)
|
|
|
6b82d1b |
@@ -535,7 +531,7 @@ int convert_date_to_timestamp(const char
|
|
|
6b82d1b |
{
|
|
|
6b82d1b |
unsigned int d, mo, y, h, m, s;
|
|
|
6b82d1b |
unsigned char c;
|
|
|
6b82d1b |
- const char *b, *e;
|
|
|
6b82d1b |
+ const char *e;
|
|
|
6b82d1b |
time_t rawtime;
|
|
|
6b82d1b |
static struct tm * timeinfo;
|
|
|
6b82d1b |
static int last_res;
|
|
|
6b82d1b |
@@ -622,7 +618,6 @@ int convert_date_to_timestamp(const char
|
|
|
6b82d1b |
}
|
|
|
6b82d1b |
|
|
|
6b82d1b |
/* hour + ':' */
|
|
|
6b82d1b |
- b = e;
|
|
|
6b82d1b |
while (1) {
|
|
|
6b82d1b |
c = *(e++) - '0';
|
|
|
6b82d1b |
if (c > 9)
|
|
|
6b82d1b |
@@ -633,7 +628,6 @@ int convert_date_to_timestamp(const char
|
|
|
6b82d1b |
goto out_err;
|
|
|
6b82d1b |
|
|
|
6b82d1b |
/* minute + ':' */
|
|
|
6b82d1b |
- b = e;
|
|
|
6b82d1b |
while (1) {
|
|
|
6b82d1b |
c = *(e++) - '0';
|
|
|
6b82d1b |
if (c > 9)
|
|
|
6b82d1b |
@@ -644,7 +638,6 @@ int convert_date_to_timestamp(const char
|
|
|
6b82d1b |
goto out_err;
|
|
|
6b82d1b |
|
|
|
6b82d1b |
/* second + '.' or ']' */
|
|
|
6b82d1b |
- b = e;
|
|
|
6b82d1b |
while (1) {
|
|
|
6b82d1b |
c = *(e++) - '0';
|
|
|
6b82d1b |
if (c > 9)
|
|
|
6b82d1b |
@@ -686,10 +679,10 @@ void truncated_line(int linenum, const c
|
|
|
98262d9 |
|
|
|
98262d9 |
int main(int argc, char **argv)
|
|
|
98262d9 |
{
|
|
|
98262d9 |
- const char *b, *e, *p, *time_field, *accept_field, *source_field;
|
|
|
98262d9 |
+ const char *b, *p, *time_field, *accept_field, *source_field;
|
|
|
98262d9 |
const char *filter_term_code_name = NULL;
|
|
|
98262d9 |
const char *output_file = NULL;
|
|
|
98262d9 |
- int f, last, err;
|
|
|
98262d9 |
+ int f, last;
|
|
|
98262d9 |
struct timer *t = NULL;
|
|
|
98262d9 |
struct eb32_node *n;
|
|
|
98262d9 |
struct url_stat *ustat = NULL;
|
|
|
6b82d1b |
@@ -941,7 +934,7 @@ int main(int argc, char **argv)
|
|
|
98262d9 |
}
|
|
|
98262d9 |
}
|
|
|
98262d9 |
|
|
|
98262d9 |
- e = field_stop(time_field + 1);
|
|
|
98262d9 |
+ field_stop(time_field + 1);
|
|
|
98262d9 |
/* we have field TIME_FIELD in [time_field]..[e-1] */
|
|
|
98262d9 |
p = time_field;
|
|
|
98262d9 |
f = 0;
|
|
|
6b82d1b |
@@ -965,17 +958,15 @@ int main(int argc, char **argv)
|
|
|
98262d9 |
}
|
|
|
98262d9 |
}
|
|
|
98262d9 |
|
|
|
98262d9 |
- e = field_stop(time_field + 1);
|
|
|
98262d9 |
+ field_stop(time_field + 1);
|
|
|
98262d9 |
/* we have field TIME_FIELD in [time_field]..[e-1], let's check only the response time */
|
|
|
98262d9 |
|
|
|
98262d9 |
p = time_field;
|
|
|
98262d9 |
- err = 0;
|
|
|
98262d9 |
f = 0;
|
|
|
98262d9 |
while (!SEP(*p)) {
|
|
|
98262d9 |
tps = str2ic(p);
|
|
|
98262d9 |
if (tps < 0) {
|
|
|
98262d9 |
tps = -1;
|
|
|
98262d9 |
- err = 1;
|
|
|
98262d9 |
}
|
|
|
98262d9 |
if (++f == 4)
|
|
|
98262d9 |
break;
|
|
|
6b82d1b |
@@ -1701,7 +1692,7 @@ void filter_count_ip(const char *source_
|
|
|
98262d9 |
void filter_graphs(const char *accept_field, const char *time_field, struct timer **tptr)
|
|
|
98262d9 |
{
|
|
|
98262d9 |
struct timer *t2;
|
|
|
98262d9 |
- const char *e, *p;
|
|
|
98262d9 |
+ const char *p;
|
|
|
98262d9 |
int f, err, array[5];
|
|
|
98262d9 |
|
|
|
98262d9 |
if (!time_field) {
|
|
|
6b82d1b |
@@ -1712,7 +1703,7 @@ void filter_graphs(const char *accept_fi
|
|
|
98262d9 |
}
|
|
|
98262d9 |
}
|
|
|
98262d9 |
|
|
|
98262d9 |
- e = field_stop(time_field + 1);
|
|
|
98262d9 |
+ field_stop(time_field + 1);
|
|
|
98262d9 |
/* we have field TIME_FIELD in [time_field]..[e-1] */
|
|
|
98262d9 |
|
|
|
98262d9 |
p = time_field;
|