diff options
author | fjoe <fjoe@FreeBSD.org> | 2003-10-27 20:49:26 +0000 |
---|---|---|
committer | fjoe <fjoe@FreeBSD.org> | 2003-10-27 20:49:26 +0000 |
commit | bc814d54c550cde433812a6617f2ba8a13e53c5e (patch) | |
tree | 057e6e1bce0cd551d5c764ab8974d3376d61980d /net/rwhoisd/files | |
parent | 694aff404b7ebb88cbbe284c71eb697029af67e4 (diff) | |
download | FreeBSD-ports-bc814d54c550cde433812a6617f2ba8a13e53c5e.zip FreeBSD-ports-bc814d54c550cde433812a6617f2ba8a13e53c5e.tar.gz |
Fix build on -CURRENT.
Use DOCSDIR.
Bump PORTREVISION.
Diffstat (limited to 'net/rwhoisd/files')
-rw-r--r-- | net/rwhoisd/files/patch-common-client_msgs.c | 35 | ||||
-rw-r--r-- | net/rwhoisd/files/patch-common-client_msgs.h | 11 | ||||
-rw-r--r-- | net/rwhoisd/files/patch-common-common.h | 11 | ||||
-rw-r--r-- | net/rwhoisd/files/patch-common-log.c | 38 | ||||
-rw-r--r-- | net/rwhoisd/files/patch-common-log.h | 23 | ||||
-rw-r--r-- | net/rwhoisd/files/patch-common-rw_log.c | 38 | ||||
-rw-r--r-- | net/rwhoisd/files/patch-server-notify.c | 31 | ||||
-rw-r--r-- | net/rwhoisd/files/patch-server-notify.h | 0 |
8 files changed, 187 insertions, 0 deletions
diff --git a/net/rwhoisd/files/patch-common-client_msgs.c b/net/rwhoisd/files/patch-common-client_msgs.c new file mode 100644 index 0000000..77a8d9a --- /dev/null +++ b/net/rwhoisd/files/patch-common-client_msgs.c @@ -0,0 +1,35 @@ +--- common/client_msgs.c.orig Tue Oct 28 02:24:02 2003 ++++ common/client_msgs.c Tue Oct 28 02:25:00 2003 +@@ -145,22 +145,16 @@ + printf ("%%ok\n"); + } + +-void print_response(va_alist) +- va_dcl ++void print_response(int resp_no, char *format, ...) + { + va_list list; + int i; +- int resp_no; +- char *format; + FILE *fp; + +- va_start(list); ++ va_start(list, format); + + fp = get_out_fp(); + +- resp_no = va_arg(list, int); +- format = va_arg(list, char *); +- + for (i = 0; i < N_RESP; i++) + { + if (resp[i].resp_no == resp_no) +@@ -179,6 +173,7 @@ + } + + vfprintf(fp, format, list); ++ va_end(list); + + fprintf(fp, "\n"); + } diff --git a/net/rwhoisd/files/patch-common-client_msgs.h b/net/rwhoisd/files/patch-common-client_msgs.h new file mode 100644 index 0000000..625697e --- /dev/null +++ b/net/rwhoisd/files/patch-common-client_msgs.h @@ -0,0 +1,11 @@ +--- common/client_msgs.h.orig Tue Oct 28 02:25:14 2003 ++++ common/client_msgs.h Tue Oct 28 02:25:30 2003 +@@ -85,7 +85,7 @@ + + void print_error PROTO((int err_no, char *str)); + +-void print_response PROTO(()); ++void print_response PROTO((int resp_no, char *format, ...)); + + void print_ok PROTO((void)); + diff --git a/net/rwhoisd/files/patch-common-common.h b/net/rwhoisd/files/patch-common-common.h new file mode 100644 index 0000000..84f7d11 --- /dev/null +++ b/net/rwhoisd/files/patch-common-common.h @@ -0,0 +1,11 @@ +--- common/common.h.orig Tue Oct 28 02:23:23 2003 ++++ common/common.h Tue Oct 28 02:23:33 2003 +@@ -56,7 +56,7 @@ + # undef _VA_ALIGN + # undef __va_stack_arg + # endif +-#include <varargs.h> ++#include <stdarg.h> + #endif /* HAVE_VPRINTF */ + + /* this should probably be #ifdef USG */ diff --git a/net/rwhoisd/files/patch-common-log.c b/net/rwhoisd/files/patch-common-log.c new file mode 100644 index 0000000..c4da8e6 --- /dev/null +++ b/net/rwhoisd/files/patch-common-log.c @@ -0,0 +1,38 @@ +--- common/log.c.orig Tue Oct 28 02:26:55 2003 ++++ common/log.c Tue Oct 28 02:28:25 2003 +@@ -139,15 +139,12 @@ + /* log_error: prints a error message to the console. This is intended + for server side errors only. */ + void +-log_error(va_alist) +- va_dcl ++log_error(char *format, ...) + { + va_list list; +- char *format; + char err_buf[MAX_LINE]; + +- va_start(list); +- format = va_arg(list, char *); ++ va_start(list, format); + + #ifdef HAVE_VSNPRINTF + vsnprintf(err_buf, sizeof(err_buf), format, list); +@@ -164,15 +161,12 @@ + /* log_warning: prints a warning message to the console. This is intended + for server side warnings only. */ + void +-log_warning(va_alist) +- va_dcl ++log_warning(char *format, ...) + { + va_list list; +- char *format; + char err_buf[MAX_LINE]; + +- va_start(list); +- format = va_arg(list, char *); ++ va_start(list, format); + + #ifdef HAVE_VSNPRINTF + vsnprintf(err_buf, sizeof(err_buf), format, list); diff --git a/net/rwhoisd/files/patch-common-log.h b/net/rwhoisd/files/patch-common-log.h new file mode 100644 index 0000000..1c105a1 --- /dev/null +++ b/net/rwhoisd/files/patch-common-log.h @@ -0,0 +1,23 @@ +--- common/log.h.orig Tue Oct 28 02:25:55 2003 ++++ common/log.h Tue Oct 28 02:29:55 2003 +@@ -95,8 +95,8 @@ + /* old prototypes for backward compatibility */ + + #define l_strerror strerror +-void log_error PROTO(()); +-void log_warning PROTO(()); ++void log_error PROTO((char *format, ...)); ++void log_warning PROTO((char *format, ...)); + char *get_client_hostname PROTO((int sock)); + char *timestamp PROTO(()); + +@@ -106,7 +106,8 @@ + (L_LOG_EMERG, L_LOG_ALERT, etc. [see internal_log_level in + types.h) and SECTION is one of (NETWORK, QUERY, CONFIG, etc [see + log_section in types.h) */ +-void log PROTO(()); ++#define log Log ++void log PROTO((internal_log_levels level, int section, char *format, ...)); + + void setup_logging PROTO((void)); + diff --git a/net/rwhoisd/files/patch-common-rw_log.c b/net/rwhoisd/files/patch-common-rw_log.c new file mode 100644 index 0000000..3807b13 --- /dev/null +++ b/net/rwhoisd/files/patch-common-rw_log.c @@ -0,0 +1,38 @@ +--- common/rw_log.c.orig Tue Oct 28 02:28:43 2003 ++++ common/rw_log.c Tue Oct 28 02:30:14 2003 +@@ -17,13 +17,10 @@ + #include "types.h" + + void +-log(va_alist) +- va_dcl ++log(internal_log_levels level, int section, char *format, ...) + { + va_list ap; +- internal_log_levels level; + FILE *fp; +- char *format; + char *filename; + char *hostname; + char message[MAX_LINE]; +@@ -31,13 +28,9 @@ + char *section_name; + int fd; + int use_syslog; +- int section; + int syslog_level; + +- va_start(ap); +- level = (internal_log_levels) va_arg(ap, int); +- section = (int) va_arg(ap, int); +- format = va_arg(ap, char*); ++ va_start(ap, format); + + /* verbosity sets the level at which we ignore log messages */ + if (level > get_verbosity()) +@@ -142,4 +135,5 @@ + + fclose(fp); + } ++ va_end(ap); + } diff --git a/net/rwhoisd/files/patch-server-notify.c b/net/rwhoisd/files/patch-server-notify.c new file mode 100644 index 0000000..e4e71a9 --- /dev/null +++ b/net/rwhoisd/files/patch-server-notify.c @@ -0,0 +1,31 @@ +--- server/notify.c.orig Tue Oct 28 02:30:38 2003 ++++ server/notify.c Tue Oct 28 02:31:26 2003 +@@ -75,18 +75,13 @@ + + /* log notify information */ + int +-log_entry(va_alist) +- va_dcl ++log_entry(char *filename, char *format, ...) + { + va_list ap; + FILE *fp; +- char *format; +- char *filename; + char *hostname; + +- va_start(ap); +- filename = va_arg (ap, char*); +- format = va_arg(ap, char*); ++ va_start(ap, format); + + /* lock the file */ + fp = get_file_lock(filename, "a", 60); +@@ -103,6 +98,7 @@ + fprintf(fp, " [%-15s] PID: %-8d", hostname, (int) getpid()); + vfprintf(fp, format, ap); + fprintf(fp, "\n"); ++ va_end(ap); + + release_file_lock(filename, fp); + diff --git a/net/rwhoisd/files/patch-server-notify.h b/net/rwhoisd/files/patch-server-notify.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/net/rwhoisd/files/patch-server-notify.h |