diff options
author | Kurt Jaeger <pi@FreeBSD.org> | 2018-12-18 22:03:42 +0000 |
---|---|---|
committer | Kurt Jaeger <pi@FreeBSD.org> | 2018-12-18 22:03:42 +0000 |
commit | 5a372742d069fd02bea22043b27eca0954a96b92 (patch) | |
tree | 03c5b1f8b1514ee8938205b420281efd001aac26 /sysutils/apachetop/files | |
parent | 0dd280ec5bfb13ca20bab7e2934dccaa83641ad8 (diff) | |
download | ports-5a372742d069fd02bea22043b27eca0954a96b92.tar.gz ports-5a372742d069fd02bea22043b27eca0954a96b92.zip |
sysutils/apachetop: update 0.12.6 -> 0.18.4
- moved to github
- Fix compile
- Fix mis-spelled word
PR: 227865
Submitted by: ndowens@yahoo.com
Reported by: Thomas-Henning von Kamptz <tomsoft@mac.com>
Reviewed by: koobs, danfe
Approved by: Lukasz Wasikowski <lukasz@wasikowski.net> (maintainer)
Notes
Notes:
svn path=/head/; revision=487774
Diffstat (limited to 'sysutils/apachetop/files')
-rw-r--r-- | sysutils/apachetop/files/patch-apachetop.h | 11 | ||||
-rw-r--r-- | sysutils/apachetop/files/patch-resolver.h | 13 | ||||
-rw-r--r-- | sysutils/apachetop/files/patch-src_apachetop.cc | 20 | ||||
-rw-r--r-- | sysutils/apachetop/files/patch-src_display.cc | 20 | ||||
-rw-r--r-- | sysutils/apachetop/files/patch-src_hits__circle.cc | 11 | ||||
-rw-r--r-- | sysutils/apachetop/files/patch-src_inlines.cc | 37 | ||||
-rw-r--r-- | sysutils/apachetop/files/patch-src_log.cc | 65 | ||||
-rw-r--r-- | sysutils/apachetop/files/patch-src_ohtbl.cc | 38 |
8 files changed, 85 insertions, 130 deletions
diff --git a/sysutils/apachetop/files/patch-apachetop.h b/sysutils/apachetop/files/patch-apachetop.h deleted file mode 100644 index 3c4cb0249a10..000000000000 --- a/sysutils/apachetop/files/patch-apachetop.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/apachetop.h.orig Tue Dec 30 01:03:05 2003 -+++ src/apachetop.h Tue Dec 30 01:03:32 2003 -@@ -190,7 +190,7 @@ - #define DEBUG_OUTPUT "/tmp/atop.debug" - - #ifndef DEFAULT_LOGFILE --# define DEFAULT_LOGFILE "/var/httpd/apache_log" -+# define DEFAULT_LOGFILE "/var/log/httpd-access.log" - #endif - #define DEFAULT_CIRCLE_SIZE 30 - #define DEFAULT_CIRCLE_MODE TIMED_CIRCLE diff --git a/sysutils/apachetop/files/patch-resolver.h b/sysutils/apachetop/files/patch-resolver.h deleted file mode 100644 index a37a98fd3dd5..000000000000 --- a/sysutils/apachetop/files/patch-resolver.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/resolver.h.orig 2005-10-15 18:10:01.000000000 +0200 -+++ src/resolver.h 2008-11-20 16:14:31.000000000 +0100 -@@ -10,8 +10,8 @@ - class Resolver - { - public: -- Resolver::Resolver(void); -- Resolver::~Resolver(void); -+ Resolver(void); -+ ~Resolver(void); - int add_request(char *request, enum resolver_action act); - - diff --git a/sysutils/apachetop/files/patch-src_apachetop.cc b/sysutils/apachetop/files/patch-src_apachetop.cc deleted file mode 100644 index 626794173b20..000000000000 --- a/sysutils/apachetop/files/patch-src_apachetop.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/apachetop.cc.orig 2005-10-15 16:23:31 UTC -+++ src/apachetop.cc -@@ -271,7 +271,7 @@ int main(int argc, char *argv[]) - hm->create(cf.circle_size); - /* }}} */ - -- memset(&gstats, (char) NULL, sizeof(gstats)); -+ memset(&gstats, 0, sizeof(gstats)); - gstats.start = time(NULL); - - signal(SIGINT, &catchsig); -@@ -465,7 +465,7 @@ int main(int argc, char *argv[]) - continue; - } - -- *nextline = (char) NULL; -+ *nextline = '\0'; - ++nextline; - - /* which parser? */ diff --git a/sysutils/apachetop/files/patch-src_display.cc b/sysutils/apachetop/files/patch-src_display.cc deleted file mode 100644 index 78b32790f3c1..000000000000 --- a/sysutils/apachetop/files/patch-src_display.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/display.cc.orig 2005-10-15 16:10:01 UTC -+++ src/display.cc -@@ -1191,7 +1191,7 @@ void display_histogram() - - /* compose a row of hashes */ - memset(line, ' ', hist_width); -- line[hist_width] = (char)NULL; -+ line[hist_width] = '\0'; - for(j = 0 ; j < hist_width ; ++j) - { - if (bar_height[j] > y_scale) -@@ -1203,7 +1203,7 @@ void display_histogram() - } - - memset(horiz_line, '-', hist_width); -- horiz_line[hist_width] = (char)NULL; -+ horiz_line[hist_width] = '\0'; - mvprintw(HISTOGRAM_START + hist_height, 2, "0+%*s", - hist_width, horiz_line); - diff --git a/sysutils/apachetop/files/patch-src_hits__circle.cc b/sysutils/apachetop/files/patch-src_hits__circle.cc deleted file mode 100644 index ac6d48e90ef3..000000000000 --- a/sysutils/apachetop/files/patch-src_hits__circle.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/hits_circle.cc.orig 2018-02-04 09:36:17 UTC -+++ src/hits_circle.cc -@@ -24,7 +24,7 @@ int Hits_Circle::create(unsigned int passed_size) - } - - reqcount = bytecount = 0; -- memset(rc_summary, (char) NULL, sizeof(rc_summary)); -+ memset(rc_summary, 0, sizeof(rc_summary)); - - return 0; - } diff --git a/sysutils/apachetop/files/patch-src_inlines.cc b/sysutils/apachetop/files/patch-src_inlines.cc new file mode 100644 index 000000000000..de6746fd2c0b --- /dev/null +++ b/sysutils/apachetop/files/patch-src_inlines.cc @@ -0,0 +1,37 @@ +--- src/inlines.cc.orig 2018-08-28 11:21:23 UTC ++++ src/inlines.cc +@@ -4,10 +4,10 @@ + #define ONE_EIGHTH 4 + #define HIGH_BITS (~((unsigned int)(~0) >> ONE_EIGHTH)) + +-inline unsigned int StringHash(register const char *str) ++inline unsigned int StringHash( const char *str) + { +- register unsigned int val; +- register unsigned int i; ++ unsigned int val; ++ unsigned int i; + + for (val = 0; *str; str++) + { +@@ -19,9 +19,9 @@ inline unsigned int StringHash(register const char *st + return val; + } + +-inline unsigned int QuickHash(register const char *str) ++inline unsigned int QuickHash( const char *str) + { +- register unsigned int val, tmp; ++ unsigned int val, tmp; + + for(val = 0 ; *str ; str++) + { +@@ -32,7 +32,7 @@ inline unsigned int QuickHash(register const char *str + return val; + } + +-inline unsigned long TTHash(register const char *str) ++inline unsigned long TTHash( const char *str) + { + unsigned long hash = 5381; + int c; diff --git a/sysutils/apachetop/files/patch-src_log.cc b/sysutils/apachetop/files/patch-src_log.cc index 37a984b25c7c..795b32961f5b 100644 --- a/sysutils/apachetop/files/patch-src_log.cc +++ b/sysutils/apachetop/files/patch-src_log.cc @@ -1,56 +1,11 @@ ---- src/log.cc.orig 2018-02-04 09:36:17 UTC +--- src/log.cc.orig 2018-08-28 11:26:42 UTC +++ src/log.cc -@@ -37,7 +37,7 @@ int CommonLogParser::parse(char *logline, struct logbi - if (!bufcp) - return -1; - -- *bufcp = (char) NULL; -+ *bufcp = '\0'; - ++bufcp; - - /* quickly figure out if this is an IP or a host. We do this by -@@ -172,7 +172,7 @@ int CommonLogParser::parse(char *logline, struct logbi - /* find the end of referrer and null it */ - if (!(bufcp = strchr(bufsp, '"'))) - return -1; -- *bufcp = (char) NULL; -+ *bufcp = '\0'; - - /* unless they want to keep it, skip over the protocol, ie http:// */ - if ((cf.preserve_ref_protocol == 0) && (bufcp = strstr(bufsp, "://"))) -@@ -230,7 +230,7 @@ char *LogParser::processURL(char **buf) /* {{{ */ - return NULL; - - /* null the space in front of it */ -- *endptr = (char) NULL; -+ *endptr = '\0'; - - /* TODO maybe we can use the protocol someday.. */ - -@@ -258,7 +258,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{ - char *bufcp, *endptr, *workptr; - - endptr = *url + *length; -- *endptr = (char) NULL; -+ *endptr = '\0'; - - /* do we want to keep the query string? */ - if (!cf.keep_querystring) -@@ -273,7 +273,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{ - if (workptr < endptr) - { - /* we're ok */ -- *workptr = (char) NULL; -+ *workptr = '\0'; - bufcp = workptr+1; - } - } -@@ -308,7 +308,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{ - if (workptr == endptr) - bufcp = workptr; - } -- *bufcp = (char) NULL; -+ *bufcp = '\0'; - } - - +@@ -72,7 +72,7 @@ int CommonLogParser::parse(char *logline, struct logbi + /* fire off a query with adns */ + b->dns_query = new adns_query; + adns_submit(adns, ptr, adns_r_a, +- (adns_queryflags) NULL, NULL, b->dns_query); ++ (adns_queryflags) 0, 0, b->dns_query); + + b->ip_pos = im->insert(RESOLVING_STRING); + b->ip_hash = TTHash(RESOLVING_STRING); diff --git a/sysutils/apachetop/files/patch-src_ohtbl.cc b/sysutils/apachetop/files/patch-src_ohtbl.cc new file mode 100644 index 000000000000..da8877a4e9b5 --- /dev/null +++ b/sysutils/apachetop/files/patch-src_ohtbl.cc @@ -0,0 +1,38 @@ +--- src/ohtbl.cc.orig 2018-08-28 11:24:15 UTC ++++ src/ohtbl.cc +@@ -13,7 +13,7 @@ static int primes[] = {101, 241, 499, 1009, 2003, 3001 + + int OAHash::getNextPrime(int size) + { +- register int *prime; ++ int *prime; + for (prime = &primes[0] ; *prime ; prime++) + if (*prime > size) + return *prime; +@@ -51,7 +51,7 @@ void OAHash::destroy(void) + + void *OAHash::insert(char *key, void *data) + { +- register unsigned int p, i; ++ unsigned int p, i; + void *d; + + // Do not exceed the number of positions in the table. +@@ -81,7 +81,7 @@ void *OAHash::insert(char *key, void *data) + + int OAHash::remove(char *key) + { +- register unsigned int p, i; ++ unsigned int p, i; + + for (i = 0; i < positions; ++i) + { +@@ -108,7 +108,7 @@ int OAHash::remove(char *key) + + void *OAHash::lookup(char *key) + { +- register unsigned int p, i; ++ unsigned int p, i; + + for (i = 0; i < positions; ++i) + { |