From 38c2164f68514727140270821c569a106b705997 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 27 May 2005 14:07:29 +0000
Subject: r7023: reduced the number of warnings in building ejs and esp (This
 used to be commit ef998f9f8fb9759e5a4572acb3f9038efc019e5e)

---
 source4/web_server/esp/esp.c      | 4 ++--
 source4/web_server/esp/esp.h      | 8 ++++----
 source4/web_server/esp/espProcs.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/web_server/esp')

diff --git a/source4/web_server/esp/esp.c b/source4/web_server/esp/esp.c
index c90e4afe42..4041823093 100644
--- a/source4/web_server/esp/esp.c
+++ b/source4/web_server/esp/esp.c
@@ -46,7 +46,7 @@
  *	Master ESP control interface with the web server
  */
 
-static Esp *esp;
+static const Esp *esp;
 
 /***************************** Forward Declarations ***************************/
 
@@ -58,7 +58,7 @@ static int	buildScript(EspRequest *ep, char **jsBuf, char *input, char
  *	Called at server initialization
  */
 
-int espOpen(Esp *control)
+int espOpen(const Esp *control)
 {
 	mprAssert(control);
 
diff --git a/source4/web_server/esp/esp.h b/source4/web_server/esp/esp.h
index a6cac1e852..ff4210befa 100644
--- a/source4/web_server/esp/esp.h
+++ b/source4/web_server/esp/esp.h
@@ -81,7 +81,7 @@ typedef void* EspHandle;					/* Opaque Web server handle type */
 typedef struct EspRequest {
 	MprStr		docPath;					/* Physical path for ESP page */	
 	EjsId		eid;						/* EJS instance handle */
-	struct Esp	*esp;						/* Pointer to ESP control block */
+	const struct Esp	*esp;				/* Pointer to ESP control block */
 	EspHandle	requestHandle;				/* Per request web server handle */
 	MprStr		uri;						/* Request URI */		
 	MprVar		*variables;					/* Pointer to variables */
@@ -148,7 +148,7 @@ typedef int 		(*EspStringCFunction)(EspRequest *ep, int argc,
 /*
  *	APIs for those hosting the ESP module
  */
-extern int 			espOpen(Esp *control);
+extern int 			espOpen(const Esp *control);
 extern void			espClose(void);
 extern EspRequest	*espCreateRequest(EspHandle webServerRequestHandle, 
 						char *uri, MprVar *envObj);
@@ -175,7 +175,7 @@ extern void 		*espGetThisPtr(EspRequest *ep);
 /*
  *	Utility routines to use in C methods
  */
-extern void			espError(EspRequest *ep, const char *fmt, ...);
+extern void			espError(EspRequest *ep, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 extern int			espEvalFile(EspRequest *ep, char *path, MprVar *result, 
 						char **emsg);
 extern int			espEvalScript(EspRequest *ep, char *script, MprVar *result, 
@@ -191,7 +191,7 @@ extern void			espSetHeader(EspRequest *ep, char *header,
 extern void			espSetReturnString(EspRequest *ep, const char *str);
 extern int			espWrite(EspRequest *ep, char *buf, int size);
 extern int			espWriteString(EspRequest *ep, char *buf);
-extern int			espWriteFmt(EspRequest *ep, char *fmt, ...);
+extern int			espWriteFmt(EspRequest *ep, char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 
 /*
  *	ESP array[] variable access (set will update/create)
diff --git a/source4/web_server/esp/espProcs.c b/source4/web_server/esp/espProcs.c
index 5c99e092c9..ff1751a7ef 100644
--- a/source4/web_server/esp/espProcs.c
+++ b/source4/web_server/esp/espProcs.c
@@ -69,7 +69,7 @@ static int destroySessionProc(EspRequest *ep, int argc, char **argv)
 
 static int includeProc(EspRequest *ep, int argc, char **argv)
 {
-	Esp		*esp;
+	const Esp		*esp;
 	char	path[MPR_MAX_FNAME], dir[MPR_MAX_FNAME];
 	char	*emsg, *buf;
 	int		size, i;
-- 
cgit