Menu
▾
▴
[naviserver-commits] naviserver/nsd adpeval.c,1.1.1.1,1.2 conn.c,1.12,1.13 driver.c,1.3,1.4 info.c,1.3,1.4 sock.c,1.1.1.1,1.2 tclinit.c,1.3,1.4 tcljob.c,1.2,1.3 tclmisc.c,1.5,1.6 tclset.c,1.1.1.1,1.2 urlopen.c,1.1.1.1,1.2
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11783/nsd Modified Files: adpeval.c conn.c driver.c info.c sock.c tclinit.c tcljob.c tclmisc.c tclset.c urlopen.c Log Message: Silence some compiler warnings. Index: tclmisc.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tclmisc.c 4 May 2005 12:43:43 -0000 1.5 --- tclmisc.c 16 May 2005 00:53:01 -0000 1.6 *************** *** 367,371 **** } string = Tcl_GetStringFromObj(objv[1], &nbytes); ! result = ns_malloc(1 + (4 * nbytes) / 2); Ns_HtuuEncode((unsigned char *) string, (size_t)nbytes, result); Tcl_SetResult(interp, result, (Tcl_FreeProc *) ns_free); --- 367,371 ---- } string = Tcl_GetStringFromObj(objv[1], &nbytes); ! result = ns_malloc((size_t) 1 + (4 * nbytes) / 2); Ns_HtuuEncode((unsigned char *) string, (size_t)nbytes, result); Tcl_SetResult(interp, result, (Tcl_FreeProc *) ns_free); *************** *** 1065,1069 **** str = Tcl_GetStringFromObj(objv[1],&strLen); SHAInit(&ctx); ! SHAUpdate(&ctx, str, strLen); SHAFinal(digest, &ctx); --- 1065,1069 ---- str = Tcl_GetStringFromObj(objv[1],&strLen); SHAInit(&ctx); ! SHAUpdate(&ctx, str, (unsigned int) strLen); SHAFinal(digest, &ctx); Index: tclinit.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclinit.c 3 Apr 2005 06:38:01 -0000 1.3 --- tclinit.c 16 May 2005 00:53:01 -0000 1.4 *************** *** 922,926 **** int length, result; int status; - Tcl_Obj *objPtr; if (objc < 2) { --- 922,925 ---- *************** *** 1054,1058 **** NULL ); } - Tcl_DecrRefCount(objPtr); result = TCL_ERROR; } else { --- 1053,1056 ---- Index: conn.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** conn.c 18 Apr 2005 16:02:25 -0000 1.12 --- conn.c 16 May 2005 00:53:01 -0000 1.13 *************** *** 912,917 **** { NsInterp *itPtr = arg; ! Ns_Conn *conn; ! Conn *connPtr; Ns_Set *form; Ns_Request *request; --- 912,917 ---- { NsInterp *itPtr = arg; ! Ns_Conn *conn = itPtr->conn; ! Conn *connPtr = (Conn *) conn; Ns_Set *form; Ns_Request *request; *************** *** 956,960 **** result = Tcl_GetObjResult(interp); - connPtr = (Conn *) conn = itPtr->conn; /* --- 956,959 ---- Index: sock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/sock.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sock.c 16 Feb 2005 08:40:13 -0000 1.1.1.1 --- sock.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 68,72 **** int ! Ns_SockRecv(SOCKET sock, void *buf, int toread, int timeout) { int nread; --- 68,72 ---- int ! Ns_SockRecv(SOCKET sock, void *buf, size_t toread, int timeout) { int nread; *************** *** 100,104 **** int ! Ns_SockSend(SOCKET sock, void *buf, int towrite, int timeout) { int nwrote; --- 100,104 ---- int ! Ns_SockSend(SOCKET sock, void *buf, size_t towrite, int timeout) { int nwrote; Index: tcljob.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tcljob.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcljob.c 15 May 2005 07:47:21 -0000 1.2 --- tcljob.c 16 May 2005 00:53:01 -0000 1.3 *************** *** 987,991 **** Ns_Time currentTime; Ns_GetTime(¤tTime); ! snprintf(buf, 100, "queue_id_%x_%x", tp.nextQueueId++, currentTime.sec); Tcl_SetResult(interp, buf, TCL_VOLATILE); } --- 987,992 ---- Ns_Time currentTime; Ns_GetTime(¤tTime); ! snprintf(buf, 100, "queue_id_%lx_%lx", ! tp.nextQueueId++, (unsigned long) currentTime.sec); Tcl_SetResult(interp, buf, TCL_VOLATILE); } Index: info.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/info.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** info.c 12 Apr 2005 06:21:23 -0000 1.3 --- info.c 16 May 2005 00:53:01 -0000 1.4 *************** *** 38,42 **** --- 38,49 ---- #include "nsd.h" + + extern void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); extern char *nsBuildDate; + + /* + * Static variables defined in this file. + */ + static Ns_ThreadArgProc ThreadArgProc; Index: urlopen.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/urlopen.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** urlopen.c 16 Feb 2005 08:39:36 -0000 1.1.1.1 --- urlopen.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 122,126 **** Stream stream; Ns_Request *request; ! int status, tosend, n; status = NS_ERROR; --- 122,127 ---- Stream stream; Ns_Request *request; ! int status, n; ! unsigned int tosend; status = NS_ERROR; Index: tclset.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclset.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclset.c 16 Feb 2005 08:40:35 -0000 1.1.1.1 --- tclset.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 58,62 **** static int NoServer(Tcl_Interp *interp); - static int BadArgs(Tcl_Interp *interp, char **argv, char *args); static int LookupSet(NsInterp *itPtr, char *id, int delete, Ns_Set **setPtr); static int LookupObjSet(NsInterp *itPtr, Tcl_Obj *idPtr, int delete, --- 58,61 ---- *************** *** 780,809 **** } - - /* - *---------------------------------------------------------------------- - * - * BadArgs -- - * - * Complain that the wrong # args were recieved. - * - * Results: - * TCL result. - * - * Side effects: - * Error message appended to interp result. - * - *---------------------------------------------------------------------- - */ - - static int - BadArgs(Tcl_Interp *interp, char **argv, char *args) - { - Tcl_AppendResult(interp, "wrong # of args: should be \"", - argv[0], " ", argv[1], " ", args, "\"", NULL); - - return TCL_ERROR; - } - static int NoServer(Tcl_Interp *interp) --- 779,782 ---- Index: adpeval.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/adpeval.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** adpeval.c 16 Feb 2005 08:40:24 -0000 1.1.1.1 --- adpeval.c 16 May 2005 00:53:01 -0000 1.2 *************** *** 544,550 **** keyPtr = (FileKey *) Tcl_GetHashKey(&servPtr->adp.pages, hPtr); Tcl_AppendElement(interp, pagePtr->file); ! sprintf(buf, "dev %ld ino %ld mtime %ld refcnt %d evals %d size %ld blocks %d scripts %d", ! keyPtr->dev, keyPtr->ino, pagePtr->mtime, pagePtr->refcnt, ! pagePtr->evals, pagePtr->size, pagePtr->code.nblocks, pagePtr->code.nscripts); Tcl_AppendElement(interp, buf); --- 544,550 ---- keyPtr = (FileKey *) Tcl_GetHashKey(&servPtr->adp.pages, hPtr); Tcl_AppendElement(interp, pagePtr->file); ! sprintf(buf, "dev %ld ino %ld mtime %lu refcnt %d evals %d size %ld blocks %d scripts %d", ! (long) keyPtr->dev, (long) keyPtr->ino, (unsigned long) pagePtr->mtime, pagePtr->refcnt, ! pagePtr->evals, (long) pagePtr->size, pagePtr->code.nblocks, pagePtr->code.nscripts); Tcl_AppendElement(interp, buf); Index: driver.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** driver.c 3 Apr 2005 06:38:01 -0000 1.3 --- driver.c 16 May 2005 00:53:01 -0000 1.4 *************** *** 1089,1093 **** ServerMap *mapPtr = NULL; Tcl_HashEntry *hPtr; ! char *host; int status = 1; --- 1089,1093 ---- ServerMap *mapPtr = NULL; Tcl_HashEntry *hPtr; ! char *host = NULL; int status = 1; *************** *** 1321,1325 **** } ! (*sockPtr->drvPtr->proc)(DriverClose, sockPtr, NULL, 0); --nactive; --- 1321,1325 ---- } ! (*sockPtr->drvPtr->proc)(DriverClose, (Ns_Sock *) sockPtr, NULL, 0); --nactive; |
