svn commit: r311767 - head/www/websh/files

[Pietro Cerutti]

Author: gahr
Date: Wed Feb  6 13:37:56 2013
New Revision: 311767
URL: http://svnweb.freebsd.org/changeset/ports/311767

Log:
  - Fix build with -Werror and clang
    Reported upstream as:
    https://issues.apache.org/bugzilla/show_bug.cgi?id=54531

Added:
  head/www/websh/files/patch-generic_interpool.c   (contents, props changed)
  head/www/websh/files/patch-generic_logtosyslog.c   (contents, props changed)
  head/www/websh/files/patch-generic_url.c   (contents, props changed)

Added: head/www/websh/files/patch-generic_interpool.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/websh/files/patch-generic_interpool.c	Wed Feb  6 13:37:56 2013	(r311767)
@@ -0,0 +1,11 @@
+--- ../generic/interpool.c.orig	2013-02-05 13:59:15.000000000 +0100
++++ ../generic/interpool.c	2013-02-05 14:00:59.000000000 +0100
+@@ -573,7 +573,7 @@
+ 			  Tcl_GetStringResult(conf->mainInterp));
+ #else /* APACHE2 */
+ 	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0,
+-			 conf->server, Tcl_GetStringResult(conf->mainInterp));
++			 conf->server, "%s", Tcl_GetStringResult(conf->mainInterp));
+ #endif /* APACHE2 */
+ 	    return 0;
+ 	}

Added: head/www/websh/files/patch-generic_logtosyslog.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/websh/files/patch-generic_logtosyslog.c	Wed Feb  6 13:37:56 2013	(r311767)
@@ -0,0 +1,11 @@
+--- ../generic/logtosyslog.c.orig	2013-02-05 13:55:15.000000000 +0100
++++ ../generic/logtosyslog.c	2013-02-05 13:55:39.000000000 +0100
+@@ -113,7 +113,7 @@
+     /* ----------------------------------------------------------------------
+      * gonna call syslogName msg
+      * ------------------------------------------------------------------- */
+-    syslog((int) (*logToSyslogData), msg);
++    syslog((int) (*logToSyslogData), "%s", msg);
+ 
+     return TCL_OK;
+ }

Added: head/www/websh/files/patch-generic_url.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/websh/files/patch-generic_url.c	Wed Feb  6 13:37:56 2013	(r311767)
@@ -0,0 +1,34 @@
+--- ../generic/url.c.orig	2013-02-05 13:56:35.000000000 +0100
++++ ../generic/url.c	2013-02-05 13:58:36.000000000 +0100
+@@ -61,7 +61,10 @@
+     PORT,
+     SCRIPTNAME,
+     PATHINFO,
+-    QUERYSTRING
++    QUERYSTRING,
++    URLCFGRESET,
++    URLCFGURLFORMAT,
++    URLCFGEND 
+ };
+ 
+ 
+@@ -362,7 +365,7 @@
+     Tcl_Obj *tmp = NULL;
+     int errCnt = 0;
+ 
+-    if ((urlData == NULL))
++    if (urlData == NULL)
+ 	return NULL;
+ 
+     errCnt = 0;
+@@ -840,10 +843,6 @@
+ {
+ 
+ 
+-#define URLCFGRESET (enum urlElement)QUERYSTRING+1
+-#define URLCFGURLFORMAT (enum urlElement)QUERYSTRING+2
+-#define URLCFGEND (enum urlElement)QUERYSTRING+3
+-
+     UrlData *urlData = NULL;
+     /* note: this could be dynamic, but 20 is enough ... */
+     char *params[20];