svn commit: samba r7023 - in branches/SAMBA_4_0/source/web_server:
. ejs esp
tridge at samba.org
tridge at samba.org
Fri May 27 14:07:29 GMT 2005
Author: tridge
Date: 2005-05-27 14:07:29 +0000 (Fri, 27 May 2005)
New Revision: 7023
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7023
Log:
reduced the number of warnings in building ejs and esp
Modified:
branches/SAMBA_4_0/source/web_server/calls.c
branches/SAMBA_4_0/source/web_server/ejs/ejs.c
branches/SAMBA_4_0/source/web_server/ejs/ejs.h
branches/SAMBA_4_0/source/web_server/ejs/ejsInternal.h
branches/SAMBA_4_0/source/web_server/ejs/ejsProcs.c
branches/SAMBA_4_0/source/web_server/ejs/miniMpr.h
branches/SAMBA_4_0/source/web_server/ejs/var.c
branches/SAMBA_4_0/source/web_server/esp/esp.c
branches/SAMBA_4_0/source/web_server/esp/esp.h
branches/SAMBA_4_0/source/web_server/esp/espProcs.c
Changeset:
Modified: branches/SAMBA_4_0/source/web_server/calls.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/calls.c 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/calls.c 2005-05-27 14:07:29 UTC (rev 7023)
@@ -193,6 +193,8 @@
return 0;
}
+
+
/*
setup the C functions that be called from ejs
*/
Modified: branches/SAMBA_4_0/source/web_server/ejs/ejs.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejs.c 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/ejs/ejs.c 2005-05-27 14:07:29 UTC (rev 7023)
@@ -275,7 +275,7 @@
if ((script = (char*) mprMalloc(sbuf.st_size + 1)) == NULL) {
close(fd);
- ejsError(ep, "Cant malloc %d", sbuf.st_size);
+ ejsError(ep, "Cant malloc %d", (int)sbuf.st_size);
goto error;
}
@@ -468,7 +468,9 @@
* Core error handling
*/
-void ejsErrorCore(Ejs* ep, const char *fmt, va_list args)
+static void ejsErrorCore(Ejs* ep, const char *fmt, va_list args) PRINTF_ATTRIBUTE(2, 0);
+
+static void ejsErrorCore(Ejs* ep, const char *fmt, va_list args)
{
EjsInput *ip;
char *errbuf, *msgbuf;
Modified: branches/SAMBA_4_0/source/web_server/ejs/ejs.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejs.h 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/ejs/ejs.h 2005-05-27 14:07:29 UTC (rev 7023)
@@ -109,7 +109,7 @@
extern MprVar *ejsGetReturnValue(EjsId eid);
extern int ejsGetLineNumber(EjsId eid);
extern int ejsParseArgs(int argc, char **argv, char *fmt, ...);
-extern void ejsSetErrorMsg(EjsId eid, const char* fmt, ...);
+extern void ejsSetErrorMsg(EjsId eid, const char* fmt, ...) PRINTF_ATTRIBUTE(2,3);
extern void ejsSetReturnValue(EjsId eid, MprVar value);
extern void ejsSetReturnString(EjsId eid, const char *str);
Modified: branches/SAMBA_4_0/source/web_server/ejs/ejsInternal.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejsInternal.h 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/ejs/ejsInternal.h 2005-05-27 14:07:29 UTC (rev 7023)
@@ -274,7 +274,7 @@
/*
* Error handling
*/
-extern void ejsError(Ejs *ep, const char *fmt, ...);
+extern void ejsError(Ejs *ep, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
#ifdef __cplusplus
}
Modified: branches/SAMBA_4_0/source/web_server/ejs/ejsProcs.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/ejsProcs.c 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/ejs/ejsProcs.c 2005-05-27 14:07:29 UTC (rev 7023)
@@ -544,10 +544,10 @@
static int traceProc(EjsHandle eid, int argc, char **argv)
{
if (argc == 1) {
- mprLog(0, argv[0]);
+ mprLog(0, "%s", argv[0]);
} else if (argc == 2) {
- mprLog(atoi(argv[0]), argv[1]);
+ mprLog(atoi(argv[0]), "%s", argv[1]);
} else {
ejsSetErrorMsg(eid, "Usage: trace([level], message)");
Modified: branches/SAMBA_4_0/source/web_server/ejs/miniMpr.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/miniMpr.h 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/ejs/miniMpr.h 2005-05-27 14:07:29 UTC (rev 7023)
@@ -250,10 +250,10 @@
extern void mprFree(void *ptr);
extern char *mprStrdup(const char *str);
extern int mprAllocVsprintf(char **msgbuf, int maxSize, const char *fmt,
- va_list args);
-extern int mprAllocSprintf(char **msgbuf, int maxSize, const char *fmt, ...);
+ va_list args) PRINTF_ATTRIBUTE(3,0);
+extern int mprAllocSprintf(char **msgbuf, int maxSize, const char *fmt, ...) PRINTF_ATTRIBUTE(3,4);
extern char *mprItoa(int num, char *buf, int width);
-extern void mprLog(int level, const char *fmt, ...);
+extern void mprLog(int level, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
extern void mprBreakpoint(const char *file, int line, const char *msg);
#endif /* BLD_GOAHEAD_WEBSERVER */
Modified: branches/SAMBA_4_0/source/web_server/ejs/var.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/ejs/var.c 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/ejs/var.c 2005-05-27 14:07:29 UTC (rev 7023)
@@ -1319,7 +1319,7 @@
}
v.allocatedData = 1;
v.name = mprStrdup(name);
- mprLog(7, "mprCreateObjVar %s, 0x%x\n", name, v.properties);
+ mprLog(7, "mprCreateObjVar %s, 0x%p\n", name, v.properties);
return v;
}
Modified: branches/SAMBA_4_0/source/web_server/esp/esp.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/esp/esp.c 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/esp/esp.c 2005-05-27 14:07:29 UTC (rev 7023)
@@ -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 @@
* Called at server initialization
*/
-int espOpen(Esp *control)
+int espOpen(const Esp *control)
{
mprAssert(control);
Modified: branches/SAMBA_4_0/source/web_server/esp/esp.h
===================================================================
--- branches/SAMBA_4_0/source/web_server/esp/esp.h 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/esp/esp.h 2005-05-27 14:07:29 UTC (rev 7023)
@@ -81,7 +81,7 @@
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 @@
/*
* 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 @@
/*
* 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 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)
Modified: branches/SAMBA_4_0/source/web_server/esp/espProcs.c
===================================================================
--- branches/SAMBA_4_0/source/web_server/esp/espProcs.c 2005-05-27 14:01:22 UTC (rev 7022)
+++ branches/SAMBA_4_0/source/web_server/esp/espProcs.c 2005-05-27 14:07:29 UTC (rev 7023)
@@ -69,7 +69,7 @@
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;
More information about the samba-cvs
mailing list