Index: mod_nsd/adp.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/adp.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/adp.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/adp.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -82,7 +82,7 @@
 static Ns_OpProc AdpProc;
 #endif
 static void (DelAdpData)(void *);
-static void ParsePage(Ns_DString *, char *page);
+/*static void ParsePage(Ns_DString *, char *page);*/
 static int  ParseFile(Tcl_Interp *, char *file, size_t size, Ns_DString *);
 static void PushFrame(Frame *framePtr, char *file, int argc, char **argv);
 static void PopFrame(Frame *framePtr);
@@ -91,7 +91,7 @@
 		     char *procs);
 static Ns_TclInterpInitProc EnableCmds;
 #endif
-static void TextChunk(Ns_DString *dsPtr, char *text);
+/*static void TextChunk(Ns_DString *dsPtr, char *text);*/
 static void SetMimeType(AdpData *adPtr, char *mimeType);
 
 /*
@@ -271,7 +271,7 @@
     path = Ns_ConfigPath(nsServer, NULL, "adp", "parsers", NULL);
 
     NsAdpFancyInit(nsServer, path);
-    Ns_AdpRegisterParser("adp", ParsePage);
+/*    Ns_AdpRegisterParser("adp", ParsePage);*/
 
     if (path != NULL) {
 	setPtr = Ns_ConfigGetSection(path);
@@ -1618,6 +1618,7 @@
 }
 
 
+#if 0
 /*
  *----------------------------------------------------------------------
  *
@@ -1664,6 +1665,7 @@
     Ns_DStringNAppend(dsPtr, "t", 1);
     Ns_DStringNAppend(dsPtr, text, strlen(text)+1);
 }
+#endif
 
 
 /*
Index: mod_nsd/adpfancy.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/adpfancy.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/adpfancy.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/adpfancy.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -912,7 +912,6 @@
 ReadToken(char *in, Ns_DString *tagPtr)
 {
     char c;
-    int quoting = 0;
 
     if ((c = *in++) == '\0') {
 	return NULL;
Index: mod_nsd/dbinit.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/dbinit.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/dbinit.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/dbinit.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -112,7 +112,7 @@
 static Pool    *GetPool(char *pool);
 static void     ReturnHandle(Handle * handle);
 static void	CheckPool(Pool *poolPtr);
-static Ns_Callback CheckPools;
+/*static Ns_Callback CheckPools;*/
 static int      IsStale(Handle *);
 static int	Connect(Handle *);
 static Pool    *CreatePool(char *pool, char *path, char *driver);
@@ -971,6 +971,7 @@
  *----------------------------------------------------------------------
  */
 
+#if 0
 static void
 CheckPools(void *ignored)
 {
@@ -985,6 +986,7 @@
 	hPtr = Tcl_NextHashEntry(&search);
     }
 }
+#endif
 
 
 /*
Index: mod_nsd/dbutil.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/dbutil.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/dbutil.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/dbutil.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -34,8 +34,6 @@
  *	Utility db routines.
  */
 
-static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__;
-
 #include "nsd.h"
 
 /*
@@ -306,8 +304,8 @@
 void
 Ns_DbSetException(Ns_DbHandle *handle, char *code, char *msg)
 {
-    assert(handle != NULL);
-    assert(code != NULL);
+    assert(handle != 0);
+    assert(code != 0);
     assert(strlen(code) <= 5);
 
     strcpy(handle->cExceptionCode, code);
Index: mod_nsd/nssha1.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/nssha1.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/nssha1.c	17 Apr 2001 04:20:12 -0000	1.1
+++ mod_nsd/nssha1.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -54,8 +54,6 @@
  *
  */
 
-static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__;
-
 #include "ns.h"
 
 #include <string.h>
@@ -138,8 +136,10 @@
     return NS_OK;
 }
 
+#if 0
 typedef unsigned int u_int32_t;
 typedef unsigned char u_int8_t;
+#endif
 
 /*** FROM sha.h: ***/
 
@@ -535,8 +535,8 @@
     }
 
     SHAInit(&ctx);
-    SHAUpdate(&ctx, argv[1], strlen(argv[1]));
-    SHAFinal(digest, &ctx);
+    SHAUpdate(&ctx, (unsigned char*)argv[1], strlen(argv[1]));
+    SHAFinal((unsigned char*)digest, &ctx);
 
     for (i = 0; i < 20; ++i) {
 	digestChars[i * 2] = hexChars[(unsigned char)(digest[i]) >> 4];
Index: mod_nsd/nsv.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/nsv.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/nsv.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/nsv.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -39,7 +39,7 @@
 }
 
 static void mm_free_func (void *cookie, void *ptr) {
-    return mm_free ((MM*)cookie, ptr);
+    mm_free ((MM*)cookie, ptr);
 }
 
 /*
@@ -158,7 +158,7 @@
 static int ns_rwlock (ClientData ignored, Tcl_Interp *interp,
 		      int argc, char **argv)
 {
-    int lock_idx, cmd;
+    int lock_idx, cmd = 0;
     int badargs = 0;
     char *endptr;
 
@@ -365,7 +365,7 @@
     mm_hash_elt *elt;
     int created;
     char *arg = NULL;
-    int rc;
+    int rc = 0;
 
     /* Do some basic arg checks */
     
@@ -485,7 +485,7 @@
 static int
 nsv_array(ClientData dummy, Tcl_Interp *interp, int argc, char **argv)
 {
-    char *pattern, **largv;
+    char *pattern = 0, **largv;
     int i, created_p, cmd, largc, status = TCL_OK;
     mm_hash_table *hash;
     mm_hash_elt *elt;
@@ -590,7 +590,7 @@
     case 'g':
     case 'n':
 	mm_hash_iter_init(hash, &search);
-	while (elt = mm_hash_iter_next(hash, &search)) {
+	while ((elt = mm_hash_iter_next(hash, &search))) {
 	    if (pattern == NULL || Tcl_StringMatch(elt->key, pattern)) {
 		Tcl_AppendElement(interp, elt->key);
 		if (cmd == 'g') {
Index: mod_nsd/quotehtml.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/quotehtml.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/quotehtml.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/quotehtml.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -34,8 +34,6 @@
  *	Take text and make it safe for HTML. 
  */
 
-static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__;
-
 #include "nsd.h"
 
 
Index: mod_nsd/str.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/str.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/str.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/str.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -88,7 +88,7 @@
 char *
 Ns_StrTrimLeft(char *string)
 {
-    assert(string != NULL);
+    assert(string != 0);
 
     while (isspace(UCHAR(*string))) {
         ++string;
@@ -121,7 +121,7 @@
 {
     int len;
 
-    assert(string != NULL);
+    assert(string != 0);
 
     len = strlen(string);
     while ((len-- >= 0) &&
Index: mod_nsd/tclfile.c
===================================================================
RCS file: /usr/local/cvsroot/mod_nsd/tclfile.c,v
diff -u -r1.1 -r1.2
--- mod_nsd/tclfile.c	13 Apr 2001 21:09:32 -0000	1.1
+++ mod_nsd/tclfile.c	5 Jun 2001 12:07:12 -0000	1.2
@@ -48,6 +48,8 @@
 #include <utime.h>
 #endif
 
+extern char *ap_default_type(request_rec *);
+
 /*
  *==========================================================================
  * API functions
@@ -606,7 +608,7 @@
     
     rr = ap_sub_req_lookup_file (argv[1], Tcl_request_rec);
     
-    if ((type = rr->content_type) == NULL)
+    if ((type = (char*)rr->content_type) == NULL)
 	type = ap_default_type (rr);
     
     Tcl_SetResult(interp, type, TCL_VOLATILE);