Menu
▾
▴
naviserver-commits — Commit notices
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(32) |
Mar
(56) |
Apr
(92) |
May
(39) |
Jun
(226) |
Jul
(98) |
Aug
(66) |
Sep
|
Oct
(153) |
Nov
(43) |
Dec
(42) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(97) |
Feb
(141) |
Mar
(147) |
Apr
(80) |
May
(51) |
Jun
(93) |
Jul
(88) |
Aug
(50) |
Sep
(179) |
Oct
(48) |
Nov
(82) |
Dec
(71) |
| 2007 |
Jan
(42) |
Feb
(46) |
Mar
(123) |
Apr
(21) |
May
(139) |
Jun
(59) |
Jul
(34) |
Aug
(57) |
Sep
(47) |
Oct
(137) |
Nov
(49) |
Dec
(12) |
| 2008 |
Jan
(10) |
Feb
(8) |
Mar
(63) |
Apr
(17) |
May
(34) |
Jun
(38) |
Jul
(16) |
Aug
(62) |
Sep
(9) |
Oct
(121) |
Nov
(38) |
Dec
(4) |
| 2009 |
Jan
|
Feb
(11) |
Mar
(9) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(4) |
Apr
(10) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(1) |
Feb
(1) |
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
(12) |
| 2012 |
Jan
(26) |
Feb
(1) |
Mar
(15) |
Apr
(1) |
May
(1) |
Jun
(7) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
(52) |
Nov
(8) |
Dec
(25) |
| 2013 |
Jan
(35) |
Feb
(14) |
Mar
(10) |
Apr
(10) |
May
(29) |
Jun
(16) |
Jul
(5) |
Aug
(8) |
Sep
(8) |
Oct
(6) |
Nov
(1) |
Dec
(3) |
| 2014 |
Jan
(16) |
Feb
(13) |
Mar
(5) |
Apr
(9) |
May
(21) |
Jun
(6) |
Jul
(5) |
Aug
(2) |
Sep
(59) |
Oct
(115) |
Nov
(122) |
Dec
(45) |
| 2015 |
Jan
(31) |
Feb
(32) |
Mar
(19) |
Apr
(25) |
May
(3) |
Jun
(4) |
Jul
(18) |
Aug
(3) |
Sep
(23) |
Oct
(11) |
Nov
(17) |
Dec
(12) |
| 2016 |
Jan
(20) |
Feb
(27) |
Mar
(20) |
Apr
(40) |
May
(35) |
Jun
(48) |
Jul
(44) |
Aug
(51) |
Sep
(18) |
Oct
(42) |
Nov
(39) |
Dec
(29) |
| 2017 |
Jan
(37) |
Feb
(34) |
Mar
(20) |
Apr
(37) |
May
(10) |
Jun
(2) |
Jul
(14) |
Aug
(15) |
Sep
(25) |
Oct
(29) |
Nov
(15) |
Dec
(29) |
| 2018 |
Jan
(5) |
Feb
(15) |
Mar
(6) |
Apr
(20) |
May
(39) |
Jun
(39) |
Jul
(17) |
Aug
(20) |
Sep
(10) |
Oct
(17) |
Nov
(20) |
Dec
(8) |
| 2019 |
Jan
(28) |
Feb
(21) |
Mar
(13) |
Apr
(44) |
May
(44) |
Jun
(28) |
Jul
(51) |
Aug
(30) |
Sep
(7) |
Oct
(20) |
Nov
(8) |
Dec
(21) |
| 2020 |
Jan
(27) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Stephen D. <sd...@us...> - 2005-06-10 20:53:28
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23631/nsd Modified Files: conn.c nsd.h pathname.c rollfile.c server.c set.c tclinit.c tcljob.c tclsock.c Log Message: Use CONST declarations to silence compiler. Index: tclinit.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tclinit.c 10 Jun 2005 17:58:40 -0000 1.5 --- tclinit.c 10 Jun 2005 20:53:13 -0000 1.6 *************** *** 387,391 **** Tcl_Interp * ! Ns_TclAllocateInterp(char *server) { Tcl_HashEntry *hPtr; --- 387,391 ---- Tcl_Interp * ! Ns_TclAllocateInterp(CONST char *server) { Tcl_HashEntry *hPtr; Index: server.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** server.c 10 Jun 2005 17:58:39 -0000 1.4 --- server.c 10 Jun 2005 20:53:13 -0000 1.5 *************** *** 68,72 **** NsServer * ! NsGetServer(char *server) { Tcl_HashEntry *hPtr; --- 68,72 ---- NsServer * ! NsGetServer(CONST char *server) { Tcl_HashEntry *hPtr; Index: conn.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** conn.c 10 Jun 2005 17:58:38 -0000 1.14 --- conn.c 10 Jun 2005 20:53:13 -0000 1.15 *************** *** 1028,1033 **** } if (connPtr->encoding != NULL) { ! Tcl_SetResult(interp, Tcl_GetEncodingName(connPtr->encoding), ! TCL_STATIC); } break; --- 1028,1032 ---- } if (connPtr->encoding != NULL) { ! Tcl_SetStringObj(result, Tcl_GetEncodingName(connPtr->encoding), -1); } break; *************** *** 1054,1059 **** } if (connPtr->urlEncoding != NULL) { ! Tcl_SetResult(interp, Tcl_GetEncodingName(connPtr->urlEncoding), ! TCL_STATIC); } break; --- 1053,1057 ---- } if (connPtr->urlEncoding != NULL) { ! Tcl_SetStringObj(result, Tcl_GetEncodingName(connPtr->urlEncoding), -1); } break; *************** *** 1268,1272 **** } Tcl_RegisterChannel(interp, chan); ! Tcl_SetResult(interp, Tcl_GetChannelName(chan), TCL_STATIC); } --- 1266,1270 ---- } Tcl_RegisterChannel(interp, chan); ! Tcl_SetStringObj(result, Tcl_GetChannelName(chan), -1); } Index: tcljob.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tcljob.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcljob.c 10 Jun 2005 17:58:40 -0000 1.4 --- tcljob.c 10 Jun 2005 20:53:13 -0000 1.5 *************** *** 126,130 **** typedef struct Job { struct Job *nextPtr; ! char *server; JobStates state; int code; --- 126,130 ---- typedef struct Job { struct Job *nextPtr; ! CONST char *server; JobStates state; int code; *************** *** 834,839 **** Tcl_Obj *jobList, *jobFieldList; ! char *jobId, *jobState, *jobCode, *jobType; ! char *jobResults, *jobScript, *jobReq; double delta; --- 834,839 ---- Tcl_Obj *jobList, *jobFieldList; ! CONST char *jobId, *jobState, *jobCode, *jobType, *jobReq; ! char *jobResults, *jobScript; double delta; *************** *** 928,932 **** */ Tcl_Obj *queueList, *queueFieldList; ! char *queueReq; /* Create a Tcl List to hold the list of jobs. */ --- 928,932 ---- */ Tcl_Obj *queueList, *queueFieldList; ! CONST char *queueReq; /* Create a Tcl List to hold the list of jobs. */ *************** *** 1002,1006 **** Tcl_Obj *tpFieldList; ! char *tpReq; /* Create a Tcl List to hold the list of thread fields. */ --- 1002,1006 ---- Tcl_Obj *tpFieldList; ! CONST char *tpReq; /* Create a Tcl List to hold the list of thread fields. */ Index: rollfile.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/rollfile.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rollfile.c 10 Jun 2005 17:58:39 -0000 1.2 --- rollfile.c 10 Jun 2005 20:53:13 -0000 1.3 *************** *** 47,55 **** */ ! static int AppendFile(Ns_DString *dsPtr, char *dir, char *tail); static int CmpFile(const void *p1, const void *p2); ! static int Rename(char *from, char *to); ! static int Exists(char *file); ! static int Unlink(char *file); --- 47,55 ---- */ ! static int AppendFile(Ns_DString *dsPtr, CONST char *dir, CONST char *tail); static int CmpFile(const void *p1, const void *p2); ! static int Rename(CONST char *from, CONST char *to); ! static int Exists(CONST char *file); ! static int Unlink(CONST char *file); *************** *** 78,82 **** int ! Ns_RollFile(char *file, int max) { char *first, *next, *dot; --- 78,82 ---- int ! Ns_RollFile(CONST char *file, int max) { char *first, *next, *dot; *************** *** 148,152 **** int ! Ns_RollFileByDate(char *file, int max) { return Ns_PurgeFiles(file, max); --- 148,152 ---- int ! Ns_RollFileByDate(CONST char *file, int max) { return Ns_PurgeFiles(file, max); *************** *** 154,158 **** int ! Ns_PurgeFiles(char *file, int max) { char *slash, *tail; --- 154,158 ---- int ! Ns_PurgeFiles(CONST char *file, int max) { char *slash, *tail; *************** *** 242,246 **** static int ! AppendFile(Ns_DString *dsPtr, char *dir, char *tail) { File *fPtr; --- 242,246 ---- static int ! AppendFile(Ns_DString *dsPtr, CONST char *dir, CONST char *tail) { File *fPtr; *************** *** 309,313 **** static int ! Unlink(char *file) { int err; --- 309,313 ---- static int ! Unlink(CONST char *file) { int err; *************** *** 322,326 **** static int ! Rename(char *from, char *to) { int err; --- 322,326 ---- static int ! Rename(CONST char *from, CONST char *to) { int err; *************** *** 335,339 **** static int ! Exists(char *file) { int exists; --- 335,339 ---- static int ! Exists(CONST char *file) { int exists; Index: nsd.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** nsd.h 16 May 2005 01:25:02 -0000 1.13 --- nsd.h 10 Jun 2005 20:53:13 -0000 1.14 *************** *** 829,833 **** extern void NsFreeRequest(Request *reqPtr); ! extern NsServer *NsGetServer(char *server); extern NsServer *NsGetInitServer(void); extern NsInterp *NsGetInterp(Tcl_Interp *interp); --- 829,833 ---- extern void NsFreeRequest(Request *reqPtr); ! extern NsServer *NsGetServer(CONST char *server); extern NsServer *NsGetInitServer(void); extern NsInterp *NsGetInterp(Tcl_Interp *interp); Index: pathname.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/pathname.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pathname.c 10 Jun 2005 17:58:39 -0000 1.3 --- pathname.c 10 Jun 2005 20:53:13 -0000 1.4 *************** *** 69,73 **** int ! Ns_PathIsAbsolute(char *path) { #ifdef _WIN32 --- 69,73 ---- int ! Ns_PathIsAbsolute(CONST char *path) { #ifdef _WIN32 *************** *** 100,104 **** char * ! Ns_NormalizePath(Ns_DString *dsPtr, char *path) { char end; --- 100,104 ---- char * ! Ns_NormalizePath(Ns_DString *dsPtr, CONST char *path) { char end; *************** *** 228,234 **** char * ! Ns_HashPath(Ns_DString *dest, char *string, int levels) { ! char *p = string; int i; --- 228,234 ---- char * ! Ns_HashPath(Ns_DString *dest, CONST char *string, int levels) { ! CONST char *p = string; int i; *************** *** 333,337 **** char * ! Ns_ServerPath(Ns_DString *dest, char *server, ...) { NsServer *servPtr; --- 333,337 ---- char * ! Ns_ServerPath(Ns_DString *dest, CONST char *server, ...) { NsServer *servPtr; *************** *** 369,373 **** char * ! Ns_PagePath(Ns_DString *dest, char *server, ...) { NsServer *servPtr; --- 369,373 ---- char * ! Ns_PagePath(Ns_DString *dest, CONST char *server, ...) { NsServer *servPtr; *************** *** 407,411 **** char * ! Ns_ModulePath(Ns_DString *dest, char *server, char *module, ...) { va_list ap; --- 407,411 ---- char * ! Ns_ModulePath(Ns_DString *dest, CONST char *server, CONST char *module, ...) { va_list ap; Index: set.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/set.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** set.c 10 Jun 2005 17:58:39 -0000 1.2 --- set.c 10 Jun 2005 20:53:13 -0000 1.3 *************** *** 57,61 **** void ! Ns_SetUpdate(Ns_Set *set, char *key, char *value) { Ns_SetDeleteKey(set, key); --- 57,61 ---- void ! Ns_SetUpdate(Ns_Set *set, CONST char *key, CONST char *value) { Ns_SetDeleteKey(set, key); *************** *** 81,85 **** Ns_Set * ! Ns_SetCreate(char *name) { Ns_Set *setPtr; --- 81,85 ---- Ns_Set * ! Ns_SetCreate(CONST char *name) { Ns_Set *setPtr; *************** *** 144,148 **** int ! Ns_SetPut(Ns_Set *set, char *key, char *value) { int index; --- 144,148 ---- int ! Ns_SetPut(Ns_Set *set, CONST char *key, CONST char *value) { int index; *************** *** 181,185 **** int ! Ns_SetUniqueCmp(Ns_Set *set, char *key, int (*cmp) (char *s1, char *s2)) { int i; --- 181,186 ---- int ! Ns_SetUniqueCmp(Ns_Set *set, CONST char *key, ! int (*cmp) (CONST char *s1, CONST char *s2)) { int i; *************** *** 221,225 **** int ! Ns_SetFindCmp(Ns_Set *set, char *key, int (*cmp) (char *s1, char *s2)) { int i; --- 222,227 ---- int ! Ns_SetFindCmp(Ns_Set *set, CONST char *key, ! int (*cmp) (CONST char *s1, CONST char *s2)) { int i; *************** *** 257,261 **** char * ! Ns_SetGetCmp(Ns_Set *set, char *key, int (*cmp) (char *s1, char *s2)) { int i; --- 259,264 ---- char * ! Ns_SetGetCmp(Ns_Set *set, CONST char *key, ! int (*cmp) (CONST char *s1, CONST char *s2)) { int i; *************** *** 286,292 **** int ! Ns_SetUnique(Ns_Set *set, char *key) { ! return Ns_SetUniqueCmp(set, key, (int (*) (char *, char *)) strcmp); } --- 289,296 ---- int ! Ns_SetUnique(Ns_Set *set, CONST char *key) { ! return Ns_SetUniqueCmp(set, key, ! (int (*) (CONST char *, CONST char *)) strcmp); } *************** *** 309,315 **** int ! Ns_SetIUnique(Ns_Set *set, char *key) { ! return Ns_SetUniqueCmp(set, key, (int (*) (char *, char *)) strcasecmp); } --- 313,320 ---- int ! Ns_SetIUnique(Ns_Set *set, CONST char *key) { ! return Ns_SetUniqueCmp(set, key, ! (int (*) (CONST char *, CONST char *)) strcasecmp); } *************** *** 332,338 **** int ! Ns_SetFind(Ns_Set *set, char *key) { ! return Ns_SetFindCmp(set, key, (int (*) (char *, char *)) strcmp); } --- 337,344 ---- int ! Ns_SetFind(Ns_Set *set, CONST char *key) { ! return Ns_SetFindCmp(set, key, ! (int (*) (CONST char *, CONST char *)) strcmp); } *************** *** 355,361 **** int ! Ns_SetIFind(Ns_Set *set, char *key) { ! return Ns_SetFindCmp(set, key, (int (*) (char *, char *)) strcasecmp); } --- 361,368 ---- int ! Ns_SetIFind(Ns_Set *set, CONST char *key) { ! return Ns_SetFindCmp(set, key, ! (int (*) (CONST char *, CONST char *)) strcasecmp); } *************** *** 378,384 **** char * ! Ns_SetGet(Ns_Set *set, char *key) { ! return Ns_SetGetCmp(set, key, (int (*) (char *, char *)) strcmp); } --- 385,392 ---- char * ! Ns_SetGet(Ns_Set *set, CONST char *key) { ! return Ns_SetGetCmp(set, key, ! (int (*) (CONST char *, CONST char *)) strcmp); } *************** *** 401,407 **** char * ! Ns_SetIGet(Ns_Set *set, char *key) { ! return Ns_SetGetCmp(set, key, (int (*) (char *, char *)) strcasecmp); } --- 409,416 ---- char * ! Ns_SetIGet(Ns_Set *set, CONST char *key) { ! return Ns_SetGetCmp(set, key, ! (int (*) (CONST char *, CONST char *)) strcasecmp); } *************** *** 488,492 **** void ! Ns_SetPutValue(Ns_Set *set, int index, char *value) { if ((index != -1) && (index < set->size)) { --- 497,501 ---- void ! Ns_SetPutValue(Ns_Set *set, int index, CONST char *value) { if ((index != -1) && (index < set->size)) { *************** *** 514,518 **** void ! Ns_SetDeleteKey(Ns_Set *set, char *key) { Ns_SetDelete(set, Ns_SetFind(set, key)); --- 523,527 ---- void ! Ns_SetDeleteKey(Ns_Set *set, CONST char *key) { Ns_SetDelete(set, Ns_SetFind(set, key)); *************** *** 537,541 **** void ! Ns_SetIDeleteKey(Ns_Set *set, char *key) { Ns_SetDelete(set, Ns_SetIFind(set, key)); --- 546,550 ---- void ! Ns_SetIDeleteKey(Ns_Set *set, CONST char *key) { Ns_SetDelete(set, Ns_SetIFind(set, key)); *************** *** 561,565 **** Ns_Set * ! Ns_SetListFind(Ns_Set **sets, char *name) { while (*sets != NULL) { --- 570,574 ---- Ns_Set * ! Ns_SetListFind(Ns_Set **sets, CONST char *name) { while (*sets != NULL) { Index: tclsock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclsock.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclsock.c 10 Jun 2005 17:58:41 -0000 1.3 --- tclsock.c 10 Jun 2005 20:53:13 -0000 1.4 *************** *** 486,490 **** if (sock == INVALID_SOCKET) { ! char *why = Tcl_GetErrno() ? Tcl_PosixError(interp) : "reason unknown"; Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't connect to \"", host, ":", --- 486,490 ---- if (sock == INVALID_SOCKET) { ! CONST char *why = Tcl_GetErrno() ? Tcl_PosixError(interp) : "reason unknown"; Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't connect to \"", host, ":", |
|
From: Stephen D. <sd...@us...> - 2005-06-10 19:18:23
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2849/include Modified Files: ns.h nsthread.h Log Message: Add a variety of NS_GNUC_* annotations. Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ns.h 10 Jun 2005 14:30:39 -0000 1.22 --- ns.h 10 Jun 2005 19:18:06 -0000 1.23 *************** *** 570,574 **** */ ! NS_EXTERN int Ns_Compress(char *buf, int len, Tcl_DString *outPtr, int level); NS_EXTERN int Ns_CompressGzip(char *buf, int len, Tcl_DString *outPtr, int level); --- 570,575 ---- */ ! NS_EXTERN int Ns_Compress(char *buf, int len, Tcl_DString *outPtr, int level) ! NS_GNUC_DEPRECATED; NS_EXTERN int Ns_CompressGzip(char *buf, int len, Tcl_DString *outPtr, int level); *************** *** 635,639 **** NS_EXTERN char *Ns_ConnPeer(Ns_Conn *conn); NS_EXTERN int Ns_ConnPeerPort(Ns_Conn *conn); ! NS_EXTERN char *Ns_ConnLocation(Ns_Conn *conn); NS_EXTERN char *Ns_ConnLocationAppend(Ns_Conn *conn, Ns_DString *dest); NS_EXTERN char *Ns_ConnHost(Ns_Conn *conn); --- 636,640 ---- NS_EXTERN char *Ns_ConnPeer(Ns_Conn *conn); NS_EXTERN int Ns_ConnPeerPort(Ns_Conn *conn); ! NS_EXTERN char *Ns_ConnLocation(Ns_Conn *conn) NS_GNUC_DEPRECATED; NS_EXTERN char *Ns_ConnLocationAppend(Ns_Conn *conn, Ns_DString *dest); NS_EXTERN char *Ns_ConnHost(Ns_Conn *conn); *************** *** 646,650 **** NS_EXTERN void Ns_ConnSetUrlEncoding(Ns_Conn *conn, Tcl_Encoding encoding); NS_EXTERN int Ns_SetConnLocationProc(Ns_ConnLocationProc *proc, void *arg); ! NS_EXTERN void Ns_SetLocationProc(char *server, Ns_LocationProc *proc); /* depreciated */ /* --- 647,651 ---- NS_EXTERN void Ns_ConnSetUrlEncoding(Ns_Conn *conn, Tcl_Encoding encoding); NS_EXTERN int Ns_SetConnLocationProc(Ns_ConnLocationProc *proc, void *arg); ! NS_EXTERN void Ns_SetLocationProc(char *server, Ns_LocationProc *proc) NS_GNUC_DEPRECATED; /* *************** *** 687,691 **** NS_EXTERN char *Ns_DStringVarAppend(Ns_DString *dsPtr, ...); NS_EXTERN char *Ns_DStringExport(Ns_DString *dsPtr); ! NS_EXTERN char *Ns_DStringPrintf(Ns_DString *dsPtr, char *fmt,...); NS_EXTERN char *Ns_DStringVPrintf(Ns_DString *dsPtr, char *fmt, va_list ap); NS_EXTERN char *Ns_DStringAppendArg(Ns_DString *dsPtr, char *string); --- 688,693 ---- NS_EXTERN char *Ns_DStringVarAppend(Ns_DString *dsPtr, ...); NS_EXTERN char *Ns_DStringExport(Ns_DString *dsPtr); ! NS_EXTERN char *Ns_DStringPrintf(Ns_DString *dsPtr, char *fmt, ...) ! NS_GNUC_PRINTF(2, 3); NS_EXTERN char *Ns_DStringVPrintf(Ns_DString *dsPtr, char *fmt, va_list ap); NS_EXTERN char *Ns_DStringAppendArg(Ns_DString *dsPtr, char *string); *************** *** 711,715 **** */ ! NS_EXTERN char *Ns_PageRoot(char *server); NS_EXTERN void Ns_SetUrlToFileProc(char *server, Ns_UrlToFileProc *procPtr); NS_EXTERN int Ns_UrlToFile(Ns_DString *dsPtr, char *server, char *url); --- 713,717 ---- */ ! NS_EXTERN char *Ns_PageRoot(char *server) NS_GNUC_DEPRECATED; NS_EXTERN void Ns_SetUrlToFileProc(char *server, Ns_UrlToFileProc *procPtr); NS_EXTERN int Ns_UrlToFile(Ns_DString *dsPtr, char *server, char *url); *************** *** 868,873 **** NS_EXTERN char *Ns_InfoErrorLog(void); NS_EXTERN int Ns_LogRoll(void); ! NS_EXTERN void Ns_Log(Ns_LogSeverity severity, char *fmt, ...); ! NS_EXTERN void Ns_Fatal(char *fmt, ...); NS_EXTERN char *Ns_LogTime(char *timeBuf); NS_EXTERN char *Ns_LogTime2(char *timeBuf, int gmt); --- 870,875 ---- NS_EXTERN char *Ns_InfoErrorLog(void); NS_EXTERN int Ns_LogRoll(void); ! NS_EXTERN void Ns_Log(Ns_LogSeverity severity, char *fmt, ...) NS_GNUC_PRINTF(2, 3); ! NS_EXTERN void Ns_Fatal(char *fmt, ...) NS_GNUC_PRINTF(1, 2) NS_GNUC_NORETURN; NS_EXTERN char *Ns_LogTime(char *timeBuf); NS_EXTERN char *Ns_LogTime2(char *timeBuf, int gmt); *************** *** 1013,1018 **** NS_EXTERN void Ns_ConnSetLastModifiedHeader(Ns_Conn *conn, time_t *mtime); NS_EXTERN void Ns_ConnSetExpiresHeader(Ns_Conn *conn, char *expires); ! NS_EXTERN int Ns_ConnPrintfHeader(Ns_Conn *conn, char *fmt,...); ! NS_EXTERN int Ns_ConnResetReturn(Ns_Conn *conn); NS_EXTERN int Ns_ConnReturnAdminNotice(Ns_Conn *conn, int status, char *title, char *notice); --- 1015,1020 ---- NS_EXTERN void Ns_ConnSetLastModifiedHeader(Ns_Conn *conn, time_t *mtime); NS_EXTERN void Ns_ConnSetExpiresHeader(Ns_Conn *conn, char *expires); ! NS_EXTERN int Ns_ConnPrintfHeader(Ns_Conn *conn, char *fmt, ...) NS_GNUC_PRINTF(2, 3); ! NS_EXTERN int Ns_ConnResetReturn(Ns_Conn *conn) NS_GNUC_DEPRECATED; NS_EXTERN int Ns_ConnReturnAdminNotice(Ns_Conn *conn, int status, char *title, char *notice); *************** *** 1127,1131 **** NS_EXTERN int Ns_SockWait(SOCKET sock, int what, int timeout); ! NS_EXTERN SOCKET Ns_BindSock(struct sockaddr_in *psa); NS_EXTERN SOCKET Ns_SockBind(struct sockaddr_in *psa); NS_EXTERN SOCKET Ns_SockListen(char *address, int port); --- 1129,1133 ---- NS_EXTERN int Ns_SockWait(SOCKET sock, int what, int timeout); ! NS_EXTERN SOCKET Ns_BindSock(struct sockaddr_in *psa) NS_GNUC_DEPRECATED; NS_EXTERN SOCKET Ns_SockBind(struct sockaddr_in *psa); NS_EXTERN SOCKET Ns_SockListen(char *address, int port); *************** *** 1210,1214 **** NS_EXTERN int Ns_TclInit(Tcl_Interp *interp); ! NS_EXTERN void Ns_TclPrintfResult(Tcl_Interp *interp, char *fmt, ...); NS_EXTERN int Nsd_Init(Tcl_Interp *interp); NS_EXTERN int Ns_TclInitInterps(char *server, Ns_TclInterpInitProc *proc, void *arg); --- 1212,1216 ---- NS_EXTERN int Ns_TclInit(Tcl_Interp *interp); ! NS_EXTERN void Ns_TclPrintfResult(Tcl_Interp *interp, char *fmt, ...) NS_GNUC_PRINTF(2, 3); NS_EXTERN int Nsd_Init(Tcl_Interp *interp); NS_EXTERN int Ns_TclInitInterps(char *server, Ns_TclInterpInitProc *proc, void *arg); *************** *** 1273,1283 **** NS_EXTERN char *Ns_UrlQueryDecode(Ns_DString *dsPtr, char *str, Tcl_Encoding enc); NS_EXTERN char *Ns_EncodeUrlWithEncoding(Ns_DString *dsPtr, char *string, ! Tcl_Encoding encoding); NS_EXTERN char *Ns_DecodeUrlWithEncoding(Ns_DString *dsPtr, char *string, ! Tcl_Encoding encoding); NS_EXTERN char *Ns_EncodeUrlCharset(Ns_DString *dsPtr, char *string, ! char *charset); NS_EXTERN char *Ns_DecodeUrlCharset(Ns_DString *dsPtr, char *string, ! char *charset); /* --- 1275,1285 ---- NS_EXTERN char *Ns_UrlQueryDecode(Ns_DString *dsPtr, char *str, Tcl_Encoding enc); NS_EXTERN char *Ns_EncodeUrlWithEncoding(Ns_DString *dsPtr, char *string, ! Tcl_Encoding encoding) NS_GNUC_DEPRECATED; NS_EXTERN char *Ns_DecodeUrlWithEncoding(Ns_DString *dsPtr, char *string, ! Tcl_Encoding encoding) NS_GNUC_DEPRECATED; NS_EXTERN char *Ns_EncodeUrlCharset(Ns_DString *dsPtr, char *string, ! char *charset) NS_GNUC_DEPRECATED; NS_EXTERN char *Ns_DecodeUrlCharset(Ns_DString *dsPtr, char *string, ! char *charset) NS_GNUC_DEPRECATED; /* Index: nsthread.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/nsthread.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** nsthread.h 10 Jun 2005 07:29:19 -0000 1.4 --- nsthread.h 10 Jun 2005 19:18:07 -0000 1.5 *************** *** 198,207 **** */ ! NS_EXTERN void *ns_malloc(size_t size); ! NS_EXTERN void *ns_calloc(size_t num, size_t size); NS_EXTERN void ns_free(void *buf); NS_EXTERN void *ns_realloc(void *buf, size_t size); ! NS_EXTERN char *ns_strdup(const char *string); ! NS_EXTERN char *ns_strcopy(const char *string); /* --- 198,207 ---- */ ! NS_EXTERN void *ns_malloc(size_t size) NS_GNUC_MALLOC; ! NS_EXTERN void *ns_calloc(size_t num, size_t size) NS_GNUC_MALLOC; NS_EXTERN void ns_free(void *buf); NS_EXTERN void *ns_realloc(void *buf, size_t size); ! NS_EXTERN char *ns_strdup(const char *string) NS_GNUC_MALLOC; ! NS_EXTERN char *ns_strcopy(const char *string) NS_GNUC_MALLOC; /* |
|
From: Stephen D. <sd...@us...> - 2005-06-10 19:18:23
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2849 Modified Files: ChangeLog Log Message: Add a variety of NS_GNUC_* annotations. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** ChangeLog 10 Jun 2005 17:58:36 -0000 1.103 --- ChangeLog 10 Jun 2005 19:18:04 -0000 1.104 *************** *** 42,45 **** --- 42,48 ---- 2005-06-10 Stephen Deasey <sd...@us...> + * include/ns.h: + * include/nsthread.h: Add a variety of NS_GNUC_* annotations. + * *.c: Use NS_RCSD() macro to quieten compiler. |
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nsd Modified Files: adpcmds.c adpeval.c adpparse.c adprequest.c auth.c binder.c cache.c callbacks.c cls.c compress.c config.c conn.c connio.c cookies.c crypt.c dns.c driver.c dsprintf.c dstring.c encoding.c exec.c fastpath.c fd.c filter.c form.c httptime.c index.c info.c init.c lisp.c listen.c log.c main.c mimetypes.c modload.c nsconf.c nsmain.c nsthread.c nswin32.c op.c pathname.c pidfile.c proc.c queue.c quotehtml.c random.c request.c return.c rollfile.c sched.c server.c set.c sock.c sockcallback.c str.c tclatclose.c tclcallbacks.c tclcmds.c tclconf.c tclenv.c tclfile.c tclhttp.c tclimg.c tclinit.c tcljob.c tclmisc.c tclobj.c tclobjv.c tclrequest.c tclresp.c tclsched.c tclset.c tclshare.c tclsock.c tclthread.c tclvar.c tclxkeylist.c unix.c url.c urlencode.c urlopen.c urlspace.c uuencode.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: tclmisc.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclmisc.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tclmisc.c 16 May 2005 00:53:01 -0000 1.6 --- tclmisc.c 10 Jun 2005 17:58:40 -0000 1.7 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Local functions defined in this file --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Local functions defined in this file Index: config.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/config.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config.c 16 Feb 2005 08:39:48 -0000 1.1.1.1 --- config.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,40 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define ISSLASH(c) ((c) == '/' || (c) == '\\') --- 34,41 ---- */ #include "nsd.h" + + NS_RCSID("@(#) $Header$"); + #define ISSLASH(c) ((c) == '/' || (c) == '\\') Index: tclinit.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclinit.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tclinit.c 16 May 2005 00:53:01 -0000 1.4 --- tclinit.c 10 Jun 2005 17:58:40 -0000 1.5 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following structure maintains interp callback traces. --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure maintains interp callback traces. Index: tclcallbacks.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclcallbacks.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tclcallbacks.c 26 Mar 2005 16:40:40 -0000 1.1 --- tclcallbacks.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 36,45 **** */ - static const char *RCSID = - "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - - #include "ns.h" typedef void *(AtProc)(Ns_Callback *, void *); --- 36,43 ---- */ #include "ns.h" + NS_RCSID("@(#) $Header$"); + typedef void *(AtProc)(Ns_Callback *, void *); Index: op.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/op.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** op.c 28 Mar 2005 17:02:08 -0000 1.2 --- op.c 10 Jun 2005 17:58:39 -0000 1.3 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following structure defines a request procedure including user --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a request procedure including user Index: tclobjv.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclobjv.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tclobjv.c 8 Jun 2005 20:27:12 -0000 1.8 --- tclobjv.c 10 Jun 2005 17:58:40 -0000 1.9 *************** *** 29,37 **** */ - static const char *RCSID = - "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "ns.h" #define VALUE_SUPPLIED ((void *) NS_TRUE) --- 29,36 ---- */ #include "ns.h" + NS_RCSID("@(#) $Header$"); + #define VALUE_SUPPLIED ((void *) NS_TRUE) Index: cache.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/cache.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cache.c 16 Feb 2005 08:40:26 -0000 1.1.1.1 --- cache.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" struct Cache; --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + struct Cache; Index: tclobj.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclobj.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclobj.c 9 Apr 2005 14:28:41 -0000 1.3 --- tclobj.c 10 Jun 2005 17:58:40 -0000 1.4 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Prototypes for procedures defined later in this file: --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Prototypes for procedures defined later in this file: Index: nsmain.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** nsmain.c 16 May 2005 01:25:02 -0000 1.11 --- nsmain.c 10 Jun 2005 17:58:39 -0000 1.12 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #ifndef _WIN32 # ifdef LOG_DEBUG --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #ifndef _WIN32 # ifdef LOG_DEBUG Index: tclsock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclsock.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tclsock.c 16 Feb 2005 15:05:46 -0000 1.2 --- tclsock.c 10 Jun 2005 17:58:41 -0000 1.3 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following structure is used for a socket callback. --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure is used for a socket callback. Index: auth.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/auth.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** auth.c 16 Feb 2005 08:39:43 -0000 1.1.1.1 --- auth.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following proc is used for simple user authorization. It --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following proc is used for simple user authorization. It Index: filter.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/filter.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** filter.c 28 Mar 2005 17:02:07 -0000 1.2 --- filter.c 10 Jun 2005 17:58:38 -0000 1.3 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following stuctures maintain connection filters --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following stuctures maintain connection filters Index: tclenv.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclenv.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclenv.c 16 Feb 2005 08:40:30 -0000 1.1.1.1 --- tclenv.c 10 Jun 2005 17:58:40 -0000 1.2 *************** *** 35,41 **** */ ! static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" static int PutEnv(Tcl_Interp *interp, char *name, char *value); --- 35,42 ---- */ ! #include "nsd.h" ! ! NS_RCSID("@(#) $Header$"); static int PutEnv(Tcl_Interp *interp, char *name, char *value); Index: tclset.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclset.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tclset.c 16 May 2005 00:53:01 -0000 1.2 --- tclset.c 10 Jun 2005 17:58:40 -0000 1.3 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following represent the valid combinations of --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following represent the valid combinations of Index: sock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/sock.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sock.c 16 May 2005 00:53:01 -0000 1.2 --- sock.c 10 Jun 2005 17:58:39 -0000 1.3 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #ifndef INADDR_NONE #define INADDR_NONE -1 --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #ifndef INADDR_NONE #define INADDR_NONE -1 Index: cookies.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/cookies.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cookies.c 26 Mar 2005 15:53:06 -0000 1.1 --- cookies.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 35,44 **** */ - static const char *RCSID = - "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: tclthread.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclthread.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclthread.c 16 Feb 2005 08:39:40 -0000 1.1.1.1 --- tclthread.c 10 Jun 2005 17:58:41 -0000 1.2 *************** *** 35,40 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #ifdef NS_NOCOMPAT #undef NS_NOCOMPAT --- 35,38 ---- *************** *** 42,45 **** --- 40,46 ---- #include "nsd.h" + NS_RCSID("@(#) $Header$"); + + typedef struct ThreadArg { int detached; Index: tclcmds.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclcmds.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tclcmds.c 10 Jun 2005 16:56:49 -0000 1.12 --- tclcmds.c 10 Jun 2005 17:58:39 -0000 1.13 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Tcl object and string commands. --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Tcl object and string commands. Index: fd.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/fd.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fd.c 16 Feb 2005 08:39:20 -0000 1.1.1.1 --- fd.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,39 **** * Manipulate file descriptors of open files. */ - - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; #include "nsd.h" --- 34,37 ---- *************** *** 42,45 **** --- 40,45 ---- #endif + NS_RCSID("@(#) $Header$"); + /* * The following structure maitains and open temp fd. Index: nsconf.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nsconf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nsconf.c 18 Apr 2005 12:52:35 -0000 1.2 --- nsconf.c 10 Jun 2005 17:58:39 -0000 1.3 *************** *** 34,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #include "nsconf.h" static int GetInt(char *key, int def); static int GetBool(char *key, int def); --- 34,46 ---- */ #include "nsd.h" #include "nsconf.h" + NS_RCSID("@(#) $Header$"); + + /* + * Local functions defined in this file. + */ + static int GetInt(char *key, int def); static int GetBool(char *key, int def); Index: nsthread.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nsthread.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nsthread.c 16 Feb 2005 08:40:12 -0000 1.1.1.1 --- nsthread.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: mimetypes.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/mimetypes.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mimetypes.c 28 Feb 2005 04:34:20 -0000 1.2 --- mimetypes.c 10 Jun 2005 17:58:39 -0000 1.3 *************** *** 35,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define TYPE_DEFAULT "*/*" --- 35,42 ---- */ #include "nsd.h" + + NS_RCSID("@(#) $Header$"); + #define TYPE_DEFAULT "*/*" Index: unix.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/unix.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** unix.c 10 Jun 2005 07:03:27 -0000 1.7 --- unix.c 10 Jun 2005 17:58:41 -0000 1.8 *************** *** 35,44 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #include <pwd.h> #include <grp.h> /* --- 35,44 ---- */ #include "nsd.h" #include <pwd.h> #include <grp.h> + NS_RCSID("@(#) $Header$"); + /* Index: index.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/index.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.c 16 Feb 2005 08:40:28 -0000 1.1.1.1 --- index.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Local functions defined in this file --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Local functions defined in this file Index: sched.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/sched.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sched.c 16 Feb 2005 08:39:35 -0000 1.1.1.1 --- sched.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 28,33 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - /* * sched.c -- --- 28,31 ---- *************** *** 48,51 **** --- 46,51 ---- #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a scheduled event. Index: adprequest.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/adprequest.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** adprequest.c 16 Feb 2005 08:39:58 -0000 1.1.1.1 --- adprequest.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" static int AdpFlush(NsInterp *itPtr, int stream); --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + static int AdpFlush(NsInterp *itPtr, int stream); Index: request.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/request.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** request.c 28 Feb 2005 05:04:17 -0000 1.2 --- request.c 10 Jun 2005 17:58:39 -0000 1.3 *************** *** 36,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define HTTP "HTTP/" --- 36,43 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #define HTTP "HTTP/" Index: cls.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/cls.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cls.c 16 Feb 2005 08:39:24 -0000 1.1.1.1 --- cls.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Static functions defined in this file. --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Static functions defined in this file. Index: adpcmds.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/adpcmds.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** adpcmds.c 16 Feb 2005 08:40:22 -0000 1.1.1.1 --- adpcmds.c 10 Jun 2005 17:58:37 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" static int ReturnObjCmd(NsInterp *itPtr, int objc, Tcl_Obj **objv, int exception); --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + static int ReturnObjCmd(NsInterp *itPtr, int objc, Tcl_Obj **objv, int exception); Index: url.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/url.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** url.c 16 Feb 2005 08:39:30 -0000 1.1.1.1 --- url.c 10 Jun 2005 17:58:41 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: connio.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/connio.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** connio.c 16 Feb 2005 08:39:49 -0000 1.1.1.1 --- connio.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 35,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define IOBUFSZ 2048 --- 35,42 ---- */ #include "nsd.h" + + NS_RCSID("@(#) $Header$"); + #define IOBUFSZ 2048 Index: tclsched.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclsched.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclsched.c 26 Mar 2005 16:40:40 -0000 1.3 --- tclsched.c 10 Jun 2005 17:58:40 -0000 1.4 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: pidfile.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/pidfile.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pidfile.c 16 Feb 2005 08:40:13 -0000 1.1.1.1 --- pidfile.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" static char *GetFile(char *procname); --- 35,46 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + + /* + * Local functions defined in this file. + */ + static char *GetFile(char *procname); Index: binder.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/binder.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** binder.c 10 Jun 2005 17:23:21 -0000 1.7 --- binder.c 10 Jun 2005 17:58:38 -0000 1.8 *************** *** 35,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #include <sys/un.h> /* --- 35,42 ---- */ #include "nsd.h" #include <sys/un.h> + NS_RCSID("@(#) $Header$"); /* Index: str.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/str.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** str.c 16 Feb 2005 08:39:29 -0000 1.1.1.1 --- str.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: queue.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/queue.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** queue.c 16 Feb 2005 08:39:31 -0000 1.1.1.1 --- queue.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following structure is allocated for each new thread. The --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure is allocated for each new thread. The Index: modload.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/modload.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** modload.c 16 Feb 2005 08:39:59 -0000 1.1.1.1 --- modload.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #if defined(USE_DLSHL) #include <dl.h> --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #if defined(USE_DLSHL) #include <dl.h> Index: tclvar.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclvar.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclvar.c 16 Feb 2005 08:40:37 -0000 1.1.1.1 --- tclvar.c 10 Jun 2005 17:58:41 -0000 1.2 *************** *** 36,40 **** #include "nsd.h" ! static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; /* --- 36,40 ---- #include "nsd.h" ! NS_RCSID("@(#) $Header$"); /* Index: tclatclose.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclatclose.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclatclose.c 16 Feb 2005 08:39:45 -0000 1.1.1.1 --- tclatclose.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following structure maintains script to execute when the --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure maintains script to execute when the Index: nswin32.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nswin32.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** nswin32.c 10 Jun 2005 07:29:51 -0000 1.3 --- nswin32.c 10 Jun 2005 17:58:39 -0000 1.4 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" static Ns_Mutex lock; static Ns_Cond cond; --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + static Ns_Mutex lock; static Ns_Cond cond; Index: quotehtml.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/quotehtml.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** quotehtml.c 16 Feb 2005 08:40:27 -0000 1.1.1.1 --- quotehtml.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: init.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/init.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** init.c 10 Jun 2005 14:28:36 -0000 1.3 --- init.c 10 Jun 2005 17:58:39 -0000 1.4 *************** *** 31,41 **** * init.c -- * ! * AOLserver libnsd entry. */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 31,41 ---- * init.c -- * ! * NaviServer libnsd entry. */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: tclfile.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclfile.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tclfile.c 17 Feb 2005 09:43:39 -0000 1.2 --- tclfile.c 10 Jun 2005 17:58:40 -0000 1.3 *************** *** 35,40 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #ifdef _WIN32 --- 35,38 ---- *************** *** 44,47 **** --- 42,48 ---- #endif + NS_RCSID("@(#) $Header$"); + + /* * Structure handling one registered channel for the [ns_chan] command Index: conn.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** conn.c 16 May 2005 00:53:01 -0000 1.13 --- conn.c 10 Jun 2005 17:58:38 -0000 1.14 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" static int GetChan(Tcl_Interp *interp, char *id, Tcl_Channel *chanPtr); static int GetIndices(Tcl_Interp *interp, Conn *connPtr, Tcl_Obj **objv, --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + static int GetChan(Tcl_Interp *interp, char *id, Tcl_Channel *chanPtr); static int GetIndices(Tcl_Interp *interp, Conn *connPtr, Tcl_Obj **objv, Index: dns.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/dns.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dns.c 9 Apr 2005 09:21:21 -0000 1.3 --- dns.c 10 Jun 2005 17:58:38 -0000 1.4 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #ifndef INADDR_NONE #define INADDR_NONE (-1) --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #ifndef INADDR_NONE #define INADDR_NONE (-1) Index: rollfile.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/rollfile.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rollfile.c 16 Feb 2005 08:40:27 -0000 1.1.1.1 --- rollfile.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 33,41 **** * Routines to roll files. */ - - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; #include "nsd.h" typedef struct File { time_t mtime; --- 33,41 ---- * Routines to roll files. */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + typedef struct File { time_t mtime; *************** *** 43,46 **** --- 43,50 ---- } File; + /* + * Local functions defined in this file. + */ + static int AppendFile(Ns_DString *dsPtr, char *dir, char *tail); static int CmpFile(const void *p1, const void *p2); Index: tcljob.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tcljob.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcljob.c 16 May 2005 00:53:01 -0000 1.3 --- tcljob.c 10 Jun 2005 17:58:40 -0000 1.4 *************** *** 81,88 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Default Max Threads --- 81,88 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Default Max Threads Index: proc.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/proc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** proc.c 12 Apr 2005 06:21:23 -0000 1.5 --- proc.c 10 Jun 2005 17:58:39 -0000 1.6 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: httptime.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/httptime.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** httptime.c 21 Apr 2005 20:26:37 -0000 1.2 --- httptime.c 10 Jun 2005 17:58:38 -0000 1.3 *************** *** 30,34 **** /* ! * time.c -- * * Manipulate times and dates; this is strongly influenced --- 30,34 ---- /* ! * httptime.c -- * * Manipulate times and dates; this is strongly influenced *************** *** 36,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Local functions defined in this file --- 36,43 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Local functions defined in this file Index: tclhttp.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclhttp.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclhttp.c 16 Feb 2005 08:40:03 -0000 1.1.1.1 --- tclhttp.c 10 Jun 2005 17:58:40 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following structure and flags maintains the state of a --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure and flags maintains the state of a Index: tclresp.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclresp.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tclresp.c 10 Jun 2005 16:56:49 -0000 1.6 --- tclresp.c 10 Jun 2005 17:58:40 -0000 1.7 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: exec.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/exec.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** exec.c 16 Feb 2005 08:39:51 -0000 1.1.1.1 --- exec.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #ifdef _WIN32 #include <process.h> --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #ifdef _WIN32 #include <process.h> Index: return.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/return.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** return.c 12 Apr 2005 06:21:23 -0000 1.3 --- return.c 10 Jun 2005 17:58:39 -0000 1.4 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define MAX_RECURSION 3 /* Max return direct recursion limit. */ --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #define MAX_RECURSION 3 /* Max return direct recursion limit. */ Index: server.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** server.c 12 Apr 2005 06:21:23 -0000 1.3 --- server.c 10 Jun 2005 17:58:39 -0000 1.4 *************** *** 34,46 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* ! * Static variables defined in this file. */ static void CreatePool(NsServer *servPtr, char *pool); static NsServer *initServPtr; /* Holds currently initializing server. */ --- 34,51 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* ! * Local functions defined in this file. */ static void CreatePool(NsServer *servPtr, char *pool); + + /* + * Static variables defined in this file. + */ + static NsServer *initServPtr; /* Holds currently initializing server. */ Index: compress.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/compress.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** compress.c 16 Feb 2005 08:39:41 -0000 1.1.1.1 --- compress.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "ns.h" #ifdef HAVE_ZLIB_H #include <zlib.h> --- 34,41 ---- */ #include "ns.h" + NS_RCSID("@(#) $Header$"); + #ifdef HAVE_ZLIB_H #include <zlib.h> Index: tclrequest.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclrequest.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclrequest.c 27 Mar 2005 19:24:04 -0000 1.3 --- tclrequest.c 10 Jun 2005 17:58:40 -0000 1.4 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: listen.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/listen.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** listen.c 16 Feb 2005 08:39:22 -0000 1.1.1.1 --- listen.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 36,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * This the context used by the socket callback. --- 36,43 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * This the context used by the socket callback. Index: lisp.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/lisp.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lisp.c 16 Feb 2005 08:40:09 -0000 1.1.1.1 --- lisp.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: main.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/main.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.c 16 Feb 2005 08:40:09 -0000 1.1.1.1 --- main.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "ns.h" static Ns_ServerInitProc ServerInit; --- 35,42 ---- */ #include "ns.h" + NS_RCSID("@(#) $Header$"); + static Ns_ServerInitProc ServerInit; Index: form.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/form.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** form.c 28 Feb 2005 05:04:16 -0000 1.2 --- form.c 10 Jun 2005 17:58:38 -0000 1.3 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" static void ParseQuery(char *form, Ns_Set *set, Tcl_Encoding encoding); static void ParseMultiInput(Conn *connPtr, char *start, char *end); --- 34,46 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + + + /* + * Local functions defined in this file. + */ + static void ParseQuery(char *form, Ns_Set *set, Tcl_Encoding encoding); static void ParseMultiInput(Conn *connPtr, char *start, char *end); Index: uuencode.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/uuencode.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uuencode.c 2 Apr 2005 20:29:46 -0000 1.2 --- uuencode.c 10 Jun 2005 17:58:41 -0000 1.3 *************** *** 32,43 **** * * Uuencoding and decoding routines which map 8-bit binary bytes ! * into 6-bit ascii characters. * */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following array specify the output ascii character for each --- 32,43 ---- * * Uuencoding and decoding routines which map 8-bit binary bytes ! * into 6-bit ascii characters. * */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following array specify the output ascii character for each Index: encoding.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/encoding.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** encoding.c 16 Feb 2005 08:39:22 -0000 1.1.1.1 --- encoding.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define DEFAULT_CHARSET_CONFIG "OutputCharset" --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #define DEFAULT_CHARSET_CONFIG "OutputCharset" Index: callbacks.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/callbacks.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** callbacks.c 16 Feb 2005 08:39:56 -0000 1.1.1.1 --- callbacks.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 37,44 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * This structure is used as nodes in a linked list of callbacks. --- 37,44 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * This structure is used as nodes in a linked list of callbacks. Index: info.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/info.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** info.c 16 May 2005 01:25:02 -0000 1.5 --- info.c 10 Jun 2005 17:58:39 -0000 1.6 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" extern void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + extern void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); Index: urlspace.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/urlspace.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** urlspace.c 28 Mar 2005 17:02:08 -0000 1.2 --- urlspace.c 10 Jun 2005 17:58:41 -0000 1.3 *************** *** 39,46 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Size of stack to keep track of server/method/url/... node path --- 39,46 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Size of stack to keep track of server/method/url/... node path Index: tclshare.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclshare.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclshare.c 16 Feb 2005 08:40:10 -0000 1.1.1.1 --- tclshare.c 10 Jun 2005 17:58:41 -0000 1.2 *************** *** 34,38 **** */ ! #include "nsd.h" /* --- 34,40 ---- */ ! #include "nsd.h" ! ! NS_RCSID("@(#) $Header$"); /* Index: adpeval.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/adpeval.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** adpeval.c 16 May 2005 00:53:01 -0000 1.2 --- adpeval.c 10 Jun 2005 17:58:38 -0000 1.3 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following structure defines a shared page in the ADP cache. The --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a shared page in the ADP cache. The Index: pathname.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/pathname.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pathname.c 12 Apr 2005 06:21:23 -0000 1.2 --- pathname.c 10 Jun 2005 17:58:39 -0000 1.3 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define isslash(c) ((c) == '/' || (c) == '\\') --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #define isslash(c) ((c) == '/' || (c) == '\\') Index: fastpath.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/fastpath.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fastpath.c 12 Apr 2005 06:21:23 -0000 1.2 --- fastpath.c 10 Jun 2005 17:58:38 -0000 1.3 *************** *** 35,40 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #ifndef _WIN32 --- 35,38 ---- *************** *** 42,45 **** --- 40,45 ---- #endif + NS_RCSID("@(#) $Header$"); + /* * The following constants are defined for this file Index: tclimg.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclimg.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclimg.c 16 Feb 2005 08:40:31 -0000 1.1.1.1 --- tclimg.c 10 Jun 2005 17:58:40 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Local functions defined in this file --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Local functions defined in this file Index: set.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/set.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** set.c 16 Feb 2005 08:39:29 -0000 1.1.1.1 --- set.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: dsprintf.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/dsprintf.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dsprintf.c 16 Feb 2005 08:39:23 -0000 1.1.1.1 --- dsprintf.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 38,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - /* $NetBSD: vfprintf.c,v 1.35 2000/12/30 04:13:25 itojun Exp $ */ --- 38,41 ---- *************** *** 83,86 **** --- 81,86 ---- #define u_quad_t ns_uint64 + NS_RCSID("@(#) $Header$"); + /* 11-bit exponent (VAX G floating point) is 308 decimal digits */ #define MAXEXP 308 Index: adpparse.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/adpparse.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** adpparse.c 16 Feb 2005 08:39:39 -0000 1.1.1.1 --- adpparse.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define SERV_STREAM 1 #define SERV_RUNAT 2 --- 34,41 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + #define SERV_STREAM 1 #define SERV_RUNAT 2 Index: random.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/random.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** random.c 16 Feb 2005 08:39:51 -0000 1.1.1.1 --- random.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Local functions defined in this file --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Local functions defined in this file Index: dstring.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/dstring.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dstring.c 16 Feb 2005 08:39:38 -0000 1.1.1.1 --- dstring.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 36,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 36,43 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: log.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/log.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** log.c 16 Feb 2005 08:39:26 -0000 1.1.1.1 --- log.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following struct maintains per-thread --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following struct maintains per-thread Index: tclconf.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclconf.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tclconf.c 16 Feb 2005 08:39:50 -0000 1.1.1.1 --- tclconf.c 10 Jun 2005 17:58:40 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* Index: driver.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** driver.c 10 Jun 2005 17:23:21 -0000 1.8 --- driver.c 10 Jun 2005 17:58:38 -0000 1.9 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * Defines for SockRead return code. --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * Defines for SockRead return code. Index: urlopen.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/urlopen.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** urlopen.c 16 May 2005 00:53:01 -0000 1.2 --- urlopen.c 10 Jun 2005 17:58:41 -0000 1.3 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" #define BUFSIZE 2048 --- 34,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + + #define BUFSIZE 2048 Index: crypt.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/crypt.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** crypt.c 16 Feb 2005 08:39:24 -0000 1.1.1.1 --- crypt.c 10 Jun 2005 17:58:38 -0000 1.2 *************** *** 28,36 **** */ - - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * This program implements the Proposed Federal Information Processing Data --- 28,35 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * This program implements the Proposed Federal Information Processing Data Index: urlencode.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/urlencode.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** urlencode.c 11 May 2005 05:54:42 -0000 1.3 --- urlencode.c 10 Jun 2005 17:58:41 -0000 1.4 *************** *** 28,32 **** */ - /* * urlencode.c -- --- 28,31 ---- *************** *** 35,49 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" - static char *UrlEncode(Ns_DString *dsPtr, char *string, - Tcl_Encoding encoding, int part); - static char *UrlDecode(Ns_DString *dsPtr, char *string, - Tcl_Encoding encoding, int part); - /* * The following structure defines the encoding attributes --- 34,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); /* * The following structure defines the encoding attributes *************** *** 58,61 **** --- 51,67 ---- /* + * Local functions defined in this file. + */ + + static char *UrlEncode(Ns_DString *dsPtr, char *string, + Tcl_Encoding encoding, int part); + static char *UrlDecode(Ns_DString *dsPtr, char *string, + Tcl_Encoding encoding, int part); + + /* + * Local variables defined in this file. + */ + + /* * The following table is used for encoding and decoding the * segments of a URI query component. Index: tclxkeylist.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclxkeylist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tclxkeylist.c 10 Jun 2005 06:47:25 -0000 1.4 --- tclxkeylist.c 10 Jun 2005 17:58:41 -0000 1.5 *************** *** 1,15 **** /* - * tclxkeylist.c -- - * - * Keyed list support, modified from the original - * Tcl8.x based TclX and Tcl source. - * - */ - - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - - #include "nsd.h" - - /* * tclXkeylist.c -- * --- 1,3 ---- *************** *** 29,32 **** --- 17,32 ---- */ + /* + * tclxkeylist.c -- + * + * Keyed list support, modified from the original + * Tcl8.x based TclX and Tcl source. + * + */ + + #include "nsd.h" + + NS_RCSID("@(#) $Header$"); + /*---------------------------------------------------------------------------*/ Index: sockcallback.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/sockcallback.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sockcallback.c 16 Feb 2005 08:40:30 -0000 1.1.1.1 --- sockcallback.c 10 Jun 2005 17:58:39 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "nsd.h" /* * The following defines a socket being monitored. --- 35,42 ---- */ #include "nsd.h" + NS_RCSID("@(#) $Header$"); + /* * The following defines a socket being monitored. |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:23
|
Update of /cvsroot/naviserver/naviserver/nsdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nsdb Modified Files: dbdrv.c dbinit.c dbtcl.c dbutil.c nsdb.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: dbdrv.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsdb/dbdrv.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dbdrv.c 16 Feb 2005 15:05:46 -0000 1.2 --- dbdrv.c 10 Jun 2005 17:58:41 -0000 1.3 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "db.h" /* * The following typedefs define the functions provided by --- 35,42 ---- */ #include "db.h" + NS_RCSID("@(#) $Header$"); + /* * The following typedefs define the functions provided by Index: dbinit.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsdb/dbinit.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dbinit.c 16 Feb 2005 08:40:47 -0000 1.1.1.1 --- dbinit.c 10 Jun 2005 17:58:41 -0000 1.2 *************** *** 36,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "db.h" /* * The following structure defines a database pool. --- 36,43 ---- */ #include "db.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a database pool. Index: dbutil.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsdb/dbutil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dbutil.c 16 Feb 2005 08:40:48 -0000 1.1.1.1 --- dbutil.c 10 Jun 2005 17:58:42 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "db.h" /* * The following constants are defined for this file. --- 35,42 ---- */ #include "db.h" + NS_RCSID("@(#) $Header$"); + /* * The following constants are defined for this file. Index: nsdb.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsdb/nsdb.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nsdb.c 16 Feb 2005 08:40:48 -0000 1.1.1.1 --- nsdb.c 10 Jun 2005 17:58:42 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "db.h" int Ns_ModuleVersion = 1; --- 34,41 ---- */ #include "db.h" + NS_RCSID("@(#) $Header$"); + int Ns_ModuleVersion = 1; Index: dbtcl.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsdb/dbtcl.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dbtcl.c 16 Feb 2005 08:40:46 -0000 1.1.1.1 --- dbtcl.c 10 Jun 2005 17:58:42 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "db.h" /* * The following structure maintains per-interp data. --- 35,42 ---- */ #include "db.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure maintains per-interp data. |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:16
|
Update of /cvsroot/naviserver/naviserver/nscp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nscp Modified Files: nscp.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: nscp.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nscp/nscp.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** nscp.c 16 May 2005 01:25:01 -0000 1.3 --- nscp.c 10 Jun 2005 17:58:37 -0000 1.4 *************** *** 31,43 **** * nscp.c -- * ! * Simple control port module for AOLserver which allows ! * one to telnet to a specified port, login, and issue ! * Tcl commands. */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "ns.h" /* * The following structure is allocated each instance of --- 31,43 ---- * nscp.c -- * ! * Simple control port module for AOLserver which allows ! * one to telnet to a specified port, login, and issue ! * Tcl commands. */ #include "ns.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure is allocated each instance of |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:16
|
Update of /cvsroot/naviserver/naviserver/nscgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nscgi Modified Files: nscgi.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: nscgi.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nscgi/nscgi.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nscgi.c 16 Feb 2005 08:40:54 -0000 1.1.1.1 --- nscgi.c 10 Jun 2005 17:58:37 -0000 1.2 *************** *** 28,34 **** */ - - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "ns.h" #include <sys/stat.h> --- 28,31 ---- *************** *** 36,39 **** --- 33,38 ---- #include <stdlib.h> /* environ */ + NS_RCSID("@(#) $Header$"); + #define BUFSIZE 4096 #define NDSTRINGS 5 |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:15
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218 Modified Files: ChangeLog Log Message: Use NS_RCSD() macro to quieten compiler. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** ChangeLog 10 Jun 2005 17:23:20 -0000 1.102 --- ChangeLog 10 Jun 2005 17:58:36 -0000 1.103 *************** *** 42,45 **** --- 42,47 ---- 2005-06-10 Stephen Deasey <sd...@us...> + * *.c: Use NS_RCSD() macro to quieten compiler. + * NEWS: Add latest news and remove news which belongs to other modules. |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:12
|
Update of /cvsroot/naviserver/naviserver/nsthread In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nsthread Modified Files: compat.c cslock.c error.c fork.c master.c memory.c mutex.c nsthreadtest.c pthread.c reentrant.c rwlock.c sema.c signal.c thread.c time.c tls.c winthread.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: time.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/time.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** time.c 16 Feb 2005 08:41:15 -0000 1.1.1.1 --- time.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* --- 35,42 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* Index: thread.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/thread.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** thread.c 16 Feb 2005 08:41:16 -0000 1.1.1.1 --- thread.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* * The following constants define the default and minimum stack --- 35,42 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* * The following constants define the default and minimum stack Index: master.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/master.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** master.c 16 Feb 2005 08:41:14 -0000 1.1.1.1 --- master.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" static Ns_Cs master; static int initialized; --- 34,41 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + static Ns_Cs master; static int initialized; Index: nsthreadtest.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/nsthreadtest.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nsthreadtest.c 16 May 2005 00:53:01 -0000 1.2 --- nsthreadtest.c 10 Jun 2005 17:58:59 -0000 1.3 *************** *** 38,41 **** --- 38,43 ---- #include "nsthread.h" + NS_RCSID("@(#) $Header$"); + /* * Special direct include of pthread.h for compatibility tests. *************** *** 49,55 **** #endif - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - - extern void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); --- 51,54 ---- Index: fork.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/fork.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fork.c 16 Feb 2005 08:41:14 -0000 1.1.1.1 --- fork.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* --- 35,42 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* Index: error.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/error.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** error.c 16 Feb 2005 08:41:13 -0000 1.1.1.1 --- error.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* --- 35,42 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* Index: rwlock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/rwlock.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rwlock.c 16 Feb 2005 08:41:16 -0000 1.1.1.1 --- rwlock.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 46,53 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* * The following structure defines a read/write lock including a mutex --- 46,53 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a read/write lock including a mutex Index: pthread.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/pthread.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pthread.c 16 Feb 2005 08:41:11 -0000 1.1.1.1 --- pthread.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 38,42 **** --- 38,50 ---- #include <pthread.h> + NS_RCSID("@(#) $Header$"); + + /* + * Local functions defined in this file. + */ + static pthread_cond_t *GetCond(Ns_Cond *cond); + static void CleanupTls(void *arg); + static void *ThreadMain(void *arg); /* *************** *** 46,51 **** static pthread_key_t key; - static void CleanupTls(void *arg); - static void *ThreadMain(void *arg); --- 54,57 ---- Index: tls.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/tls.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tls.c 16 Feb 2005 08:41:11 -0000 1.1.1.1 --- tls.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 36,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* * The following global variable specifies the maximum TLS id. Modifying --- 36,43 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* * The following global variable specifies the maximum TLS id. Modifying Index: winthread.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/winthread.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** winthread.c 16 Feb 2005 08:41:13 -0000 1.1.1.1 --- winthread.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 38,41 **** --- 38,43 ---- #include <io.h> + NS_RCSID("@(#) $Header$"); + /* * The following structure maintains the Win32-specific state of a Index: signal.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/signal.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** signal.c 16 Feb 2005 08:41:12 -0000 1.1.1.1 --- signal.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 35,42 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* --- 35,42 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* Index: mutex.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/mutex.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mutex.c 16 Feb 2005 08:41:15 -0000 1.1.1.1 --- mutex.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* * The following structure defines a mutex with --- 34,41 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a mutex with Index: reentrant.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/reentrant.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** reentrant.c 16 Feb 2005 08:41:14 -0000 1.1.1.1 --- reentrant.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 36,43 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* * The following structure maintains state for the --- 36,43 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure maintains state for the Index: compat.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/compat.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** compat.c 16 Feb 2005 08:41:14 -0000 1.1.1.1 --- compat.c 10 Jun 2005 17:58:58 -0000 1.2 *************** *** 35,40 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #ifdef NS_NOCOMPAT #undef NS_NOCOMPAT --- 35,38 ---- *************** *** 42,45 **** --- 40,45 ---- #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* Index: memory.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/memory.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** memory.c 16 Feb 2005 08:41:17 -0000 1.1.1.1 --- memory.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* --- 34,41 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* Index: cslock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/cslock.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cslock.c 16 Feb 2005 08:41:10 -0000 1.1.1.1 --- cslock.c 10 Jun 2005 17:58:58 -0000 1.2 *************** *** 45,52 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* * The following structure defines a critcal section including a mutex, --- 45,52 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a critcal section including a mutex, Index: sema.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsthread/sema.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sema.c 16 Feb 2005 08:41:15 -0000 1.1.1.1 --- sema.c 10 Jun 2005 17:58:59 -0000 1.2 *************** *** 38,45 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "thread.h" /* * The following structure defines a counting semaphore using a lock --- 38,45 ---- */ #include "thread.h" + NS_RCSID("@(#) $Header$"); + /* * The following structure defines a counting semaphore using a lock |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:08
|
Update of /cvsroot/naviserver/naviserver/nssock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nssock Modified Files: nssock.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: nssock.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nssock/nssock.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nssock.c 16 Feb 2005 08:41:09 -0000 1.1.1.1 --- nssock.c 10 Jun 2005 17:58:58 -0000 1.2 *************** *** 37,46 **** #include "ns.h" static Ns_DriverProc SockProc; static int SockRecv(SOCKET sock, struct iovec *bufs, int nbufs); static int SockSend(SOCKET sock, struct iovec *bufs, int nbufs); - int Ns_ModuleVersion = 1; - /* --- 37,52 ---- #include "ns.h" + NS_RCSID("@(#) $Header$"); + + int Ns_ModuleVersion = 1; + + /* + * Local functions defined in this file. + */ + static Ns_DriverProc SockProc; static int SockRecv(SOCKET sock, struct iovec *bufs, int nbufs); static int SockSend(SOCKET sock, struct iovec *bufs, int nbufs); /* |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:08
|
Update of /cvsroot/naviserver/naviserver/nsperm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nsperm Modified Files: nsperm.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: nsperm.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsperm/nsperm.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nsperm.c 16 Feb 2005 08:41:09 -0000 1.1.1.1 --- nsperm.c 10 Jun 2005 17:58:57 -0000 1.2 *************** *** 34,41 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - #include "ns.h" #ifndef INADDR_NONE #define INADDR_NONE (-1) --- 34,41 ---- */ #include "ns.h" + NS_RCSID("@(#) $Header$"); + #ifndef INADDR_NONE #define INADDR_NONE (-1) |
|
From: Stephen D. <sd...@us...> - 2005-06-10 17:59:08
|
Update of /cvsroot/naviserver/naviserver/nslog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27218/nslog Modified Files: nslog.c Log Message: Use NS_RCSD() macro to quieten compiler. Index: nslog.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nslog/nslog.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** nslog.c 8 Mar 2005 20:15:55 -0000 1.5 --- nslog.c 10 Jun 2005 17:58:42 -0000 1.6 *************** *** 29,34 **** */ - static const char *RCSID = "@(#) $Header$, compiled: " __DATE__ " " __TIME__; - /* * nslog.c -- --- 29,32 ---- *************** *** 101,104 **** --- 99,104 ---- #include <ctype.h> /* isspace */ + NS_RCSID("@(#) $Header$"); + #define LOG_COMBINED 1 #define LOG_FMTTIME 2 |
|
From: Vlad S. <ser...@us...> - 2005-06-10 17:23:31
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8742/nsd Modified Files: binder.c driver.c Log Message: Use Ns_PathIsAbsolute for determining valid pathname Index: driver.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** driver.c 21 May 2005 14:17:05 -0000 1.7 --- driver.c 10 Jun 2005 17:23:21 -0000 1.8 *************** *** 336,345 **** /* * Determine the port and then set the HTTP location string either * as specified in the config file or constructed from the * hostname and port. */ - - drvPtr->bindaddr = bindaddr; drvPtr->address = ns_strdup(address); if (!Ns_ConfigGetInt(path, "port", &drvPtr->port)) { --- 336,352 ---- /* + * Check if bind address represent valid pathname and if so + * switch driver to Unix domain sockets mode + */ + drvPtr->bindaddr = bindaddr; + if (drvPtr->bindaddr && Ns_PathIsAbsolute(drvPtr->bindaddr)) { + drvPtr->opts |= NS_DRIVER_UNIX; + } + + /* * Determine the port and then set the HTTP location string either * as specified in the config file or constructed from the * hostname and port. */ drvPtr->address = ns_strdup(address); if (!Ns_ConfigGetInt(path, "port", &drvPtr->port)) { *************** *** 434,440 **** drvPtr = firstDrvPtr; while (drvPtr != NULL) { - if (drvPtr->bindaddr && drvPtr->bindaddr[0] == '/') { - drvPtr->opts |= NS_DRIVER_UNIX; - } if (drvPtr->opts & NS_DRIVER_UDP) { drvPtr->sock = Ns_SockListenUdp(drvPtr->bindaddr, drvPtr->port); --- 441,444 ---- Index: binder.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/binder.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** binder.c 10 Jun 2005 14:39:26 -0000 1.6 --- binder.c 10 Jun 2005 17:23:21 -0000 1.7 *************** *** 637,641 **** } ! if (*line == '/') { hPtr = Tcl_CreateHashEntry(&preboundUnix, (char *) line, &new); if (!new) { --- 637,641 ---- } ! if (Ns_PathIsAbsolute(line)) { hPtr = Tcl_CreateHashEntry(&preboundUnix, (char *) line, &new); if (!new) { |
|
From: Vlad S. <ser...@us...> - 2005-06-10 17:23:31
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8742 Modified Files: ChangeLog Log Message: Use Ns_PathIsAbsolute for determining valid pathname Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** ChangeLog 10 Jun 2005 16:56:48 -0000 1.101 --- ChangeLog 10 Jun 2005 17:23:20 -0000 1.102 *************** *** 1,4 **** --- 1,8 ---- 2005-06-10 Vlad Seryakov <ser...@us...> + * nsd/driver.c: + * nsd/binder.c: Determine path using Ns_PathIsAbsolute for Unix + domain sockets + * nsd/tclresp.c: removed ns_returnbinary command. Added -binary flag to ns_return. |
|
From: Vlad S. <ser...@us...> - 2005-06-10 16:57:04
|
Update of /cvsroot/naviserver/naviserver/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27866/tests Modified Files: tclresp.test Log Message: removed ns_returnbinary. added -binary flag to ns_return Index: tclresp.test =================================================================== RCS file: /cvsroot/naviserver/naviserver/tests/tclresp.test,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclresp.test 10 Jun 2005 13:53:19 -0000 1.3 --- tclresp.test 10 Jun 2005 16:56:49 -0000 1.4 *************** *** 26,30 **** test tclresp-1.2.1 {basic syntax} -body { ns_return ! } -returnCodes error -result {wrong # args: should be "ns_return status type string"} test tclresp-1.2.2 {basic syntax} -body { --- 26,30 ---- test tclresp-1.2.1 {basic syntax} -body { ns_return ! } -returnCodes error -result {wrong # args: should be "ns_return ?-binary? status type string"} test tclresp-1.2.2 {basic syntax} -body { |
|
From: Vlad S. <ser...@us...> - 2005-06-10 16:57:03
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27866/nsd Modified Files: tclcmds.c tclresp.c Log Message: removed ns_returnbinary. added -binary flag to ns_return Index: tclcmds.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclcmds.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tclcmds.c 8 Jun 2005 20:13:12 -0000 1.11 --- tclcmds.c 10 Jun 2005 16:56:49 -0000 1.12 *************** *** 142,146 **** NsTclReturnNoticeObjCmd, NsTclReturnObjCmd, - NsTclReturnBinaryObjCmd, NsTclReturnRedirectObjCmd, NsTclReturnUnauthorizedObjCmd, --- 142,145 ---- *************** *** 481,485 **** {"ns_returnunauthorized", NULL, NsTclReturnUnauthorizedObjCmd}, {"ns_returnnotfound", NULL, NsTclReturnNotFoundObjCmd}, - {"ns_returnbinary", NULL, NsTclReturnBinaryObjCmd}, /* --- 480,483 ---- Index: tclresp.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclresp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tclresp.c 8 Jun 2005 20:27:12 -0000 1.5 --- tclresp.c 10 Jun 2005 16:56:49 -0000 1.6 *************** *** 170,229 **** { Ns_Conn *conn; ! int status, result; ! if (objc != 4) { ! Tcl_WrongNumArgs(interp, 1, objv, "status type string"); return TCL_ERROR; } ! if (GetConn(arg, interp, &conn) != TCL_OK) { ! return TCL_ERROR; } ! if (Tcl_GetIntFromObj(interp, objv[1], &status) != TCL_OK) { return TCL_ERROR; } ! result = Ns_ConnReturnCharData(conn, status, Tcl_GetString(objv[3]), -1, ! Tcl_GetString(objv[2])); ! ! return Result(interp, result); ! } ! ! ! /* ! *---------------------------------------------------------------------- ! * ! * NsTclReturnBinaryObjCmd -- ! * ! * Implements ns_returnbinary. Send complete response to client with ! * given string as body. ! * ! * Results: ! * Tcl result. ! * ! * Side effects: ! * Connection will be closed. ! * ! *---------------------------------------------------------------------- ! */ ! ! int ! NsTclReturnBinaryObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) ! { ! Ns_Conn *conn; ! unsigned char *data; ! int len, status, result; ! ! if (objc != 4) { ! Tcl_WrongNumArgs(interp, 1, objv, "status type data"); ! return TCL_ERROR; } if (GetConn(arg, interp, &conn) != TCL_OK) { return TCL_ERROR; } ! if (Tcl_GetIntFromObj(interp, objv[1], &status) != TCL_OK) { ! return TCL_ERROR; } - data = Tcl_GetByteArrayFromObj(objv[3], &len); - result = Ns_ConnReturnData(conn, status, data, len, Tcl_GetString(objv[2])); - return Result(interp, result); } --- 170,205 ---- { Ns_Conn *conn; ! unsigned char *data = 0, *type = 0; ! int result, param = 1, status = 0, len = 0, binary = 0; ! if (objc != 4 && objc != 5) { ! Tcl_WrongNumArgs(interp, 1, objv, "?-binary? status type string"); return TCL_ERROR; } ! if (objc == 5) { ! if(strcmp(Tcl_GetString(objv[param]),"-binary")) { ! Tcl_WrongNumArgs(interp, 1, objv, "?-binary? status type string"); ! return TCL_ERROR; ! } ! binary = 1; ! param++; } ! if (Tcl_GetIntFromObj(interp, objv[param], &status) != TCL_OK) { return TCL_ERROR; } ! type = Tcl_GetString(objv[param+1]); ! if (binary != 0) { ! data = Tcl_GetByteArrayFromObj(objv[param+2], &len); ! } else { ! data = Tcl_GetStringFromObj(objv[param+2], &len); } if (GetConn(arg, interp, &conn) != TCL_OK) { return TCL_ERROR; } ! if(binary != 0) { ! result = Ns_ConnReturnData(conn, status, data, len, type); ! } else { ! result = Ns_ConnReturnCharData(conn, status, data, len, type); } return Result(interp, result); } |
|
From: Vlad S. <ser...@us...> - 2005-06-10 16:57:02
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27866 Modified Files: ChangeLog Log Message: removed ns_returnbinary. added -binary flag to ns_return Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** ChangeLog 10 Jun 2005 15:05:21 -0000 1.100 --- ChangeLog 10 Jun 2005 16:56:48 -0000 1.101 *************** *** 1,2 **** --- 1,7 ---- + 2005-06-10 Vlad Seryakov <ser...@us...> + + * nsd/tclresp.c: removed ns_returnbinary command. Added -binary + flag to ns_return. + 2005-06-10 Zoran Vasiljevic <vas...@us...> |
|
From: Zoran V. <vas...@us...> - 2005-06-10 15:05:40
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2818 Modified Files: ChangeLog Log Message: See file. Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** ChangeLog 10 Jun 2005 14:09:17 -0000 1.99 --- ChangeLog 10 Jun 2005 15:05:21 -0000 1.100 *************** *** 1,2 **** --- 1,17 ---- + 2005-06-10 Zoran Vasiljevic <vas...@us...> + + * include/ns.h Ns_SockBindUdp(), Ns_SockBindRaw() and Ns_SockBindUnix() + are now exported. + + * nsd/init.c: NsInitBinder is also done for Windows as for Unix. + + * nsd/binder.c: Attempt to unify usage and call-conventions on various + Ns_SockListenXXX and Ns_SockBindXXX calls for various protocols + (tcp, udp, raw, unix). + Also, parts not needed for windows build (pre-binding) are ifdef'ed out. + Still open: handling of Unix-domain sockets on Windows. It might compile + but will definitely not work because of the address parsing issues + (windows files do not begin with slash). This has to be sorted out. + 2005-06-10 Vlad Seryakov <ser...@us...> |
|
From: Zoran V. <vas...@us...> - 2005-06-10 14:39:42
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18089 Modified Files: binder.c Log Message: Attempt to unify usage and call-conventions on various Ns_SockListenXXX and Ns_SockBindXXX calls for various protocols (tcp, udp, raw, unix). Also, parts not needed for windows build (pre-binding) are ifdef'ed out. Still open: handling of Unix-domain sockets on Windows. It might compile but will definitely not work because of the address parsing issues (windows files do not begin with slash). Index: binder.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/binder.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** binder.c 10 Jun 2005 14:09:18 -0000 1.5 --- binder.c 10 Jun 2005 14:39:26 -0000 1.6 *************** *** 39,50 **** #include "nsd.h" #include <sys/un.h> - /* - * Locals defined in this file - */ ! #ifndef _WIN32 ! static void PreBind(char *line); ! #endif static Tcl_HashTable preboundTcp; --- 39,47 ---- #include "nsd.h" #include <sys/un.h> ! /* ! * Local variables defined in this file ! */ static Tcl_HashTable preboundTcp; *************** *** 54,57 **** --- 51,58 ---- static Ns_Mutex lock; + #ifndef _WIN32 + static void PreBind(char *line); + #endif + /* *************** *** 60,65 **** * Ns_SockListenEx -- * ! * Create a new socket bound to the specified port and listening ! * for new connections. * * Results: --- 61,66 ---- * Ns_SockListenEx -- * ! * Create a new TCP socket bound to the specified port and ! * listening for new connections. * * Results: *************** *** 75,103 **** Ns_SockListenEx(char *address, int port, int backlog) { ! int err, sock = -1; struct sockaddr_in sa; - Tcl_HashEntry *hPtr; ! if (Ns_GetSockAddr(&sa, address, port) != NS_OK) { ! return -1; ! } ! Ns_MutexLock(&lock); ! hPtr = Tcl_FindHashEntry(&preboundTcp, (char *) &sa); ! if (hPtr != NULL) { ! sock = (int) Tcl_GetHashValue(hPtr); ! Tcl_DeleteHashEntry(hPtr); ! } ! Ns_MutexUnlock(&lock); ! if (hPtr == NULL) { ! sock = Ns_SockBind(&sa); ! } ! if (sock != -1 && listen(sock, backlog) != 0) { ! err = errno; ! close(sock); ! errno = err; ! sock = -1; } ! return sock; } --- 76,106 ---- Ns_SockListenEx(char *address, int port, int backlog) { ! int sock = -1; struct sockaddr_in sa; ! if (Ns_GetSockAddr(&sa, address, port) == NS_OK) { ! Tcl_HashEntry *hPtr; ! Ns_MutexLock(&lock); ! hPtr = Tcl_FindHashEntry(&preboundTcp, (char *) &sa); ! if (hPtr != NULL) { ! sock = (int) Tcl_GetHashValue(hPtr); ! Tcl_DeleteHashEntry(hPtr); ! } ! Ns_MutexUnlock(&lock); ! if (hPtr == NULL) { ! /* Not prebound, bind now */ ! sock = Ns_SockBind(&sa); ! } ! if (sock >= 0 && listen(sock, backlog) == -1) { ! /* Can't listen; close the opened socket */ ! int err = errno; ! close(sock); ! errno = err; ! sock = -1; ! Ns_SetSockErrno(err); ! } } ! return (SOCKET)sock; } *************** *** 106,112 **** *---------------------------------------------------------------------- * ! * Ns_SockBindUdp -- * ! * Create a UDP socket and bind it to the passed-in address. * * Results: --- 109,115 ---- *---------------------------------------------------------------------- * ! * Ns_SockListenUdp -- * ! * Listen on the UDP socket for the given IP address and port. * * Results: *************** *** 114,118 **** * * Side effects: ! * None. * *---------------------------------------------------------------------- --- 117,121 ---- * * Side effects: ! * May create a new socket if none prebound. * *---------------------------------------------------------------------- *************** *** 120,139 **** SOCKET ! Ns_SockBindUdp(struct sockaddr_in *saPtr) { ! int sock, err, n = 1; ! ! sock = socket(AF_INET,SOCK_DGRAM, 0); ! if (sock < 0 ! || setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) < 0 ! || bind(sock,(struct sockaddr *)saPtr, sizeof(struct sockaddr_in)) < 0) { ! err = errno; ! close(sock); ! Ns_SetSockErrno(err); ! sock = -1; ! } ! return sock; } --- 123,147 ---- SOCKET ! Ns_SockListenUdp(char *address, int port) { ! int sock = -1; ! struct sockaddr_in sa; ! if (Ns_GetSockAddr(&sa, address, port) == NS_OK) { ! Tcl_HashEntry *hPtr; ! Ns_MutexLock(&lock); ! hPtr = Tcl_FindHashEntry(&preboundUdp, (char *) &sa); ! if (hPtr != NULL) { ! sock = (int) Tcl_GetHashValue(hPtr); ! Tcl_DeleteHashEntry(hPtr); ! } ! Ns_MutexUnlock(&lock); ! if (hPtr == NULL) { ! /* Not prebound, bind now */ ! sock = Ns_SockBindUdp(&sa); ! } ! } ! return (SOCKET)sock; } *************** *** 142,148 **** *---------------------------------------------------------------------- * ! * Ns_SockRaw -- * ! * Helper routine for creating a raw socket * * Results: --- 150,156 ---- *---------------------------------------------------------------------- * ! * Ns_SockListenRaw -- * ! * Listen on the raw socket addressed by the given protocol. * * Results: *************** *** 150,154 **** * * Side effects: ! * None. * *---------------------------------------------------------------------- --- 158,162 ---- * * Side effects: ! * May create a new socket if none prebound. * *---------------------------------------------------------------------- *************** *** 156,173 **** SOCKET ! Ns_SockRaw(int proto) { ! int sock, err; ! ! sock = socket(AF_INET,SOCK_RAW, proto); ! if (sock < 0) { ! err = errno; ! close(sock); ! Ns_SetSockErrno(err); ! sock = -1; ! } ! return sock; } --- 164,190 ---- SOCKET ! Ns_SockListenRaw(int proto) { ! int sock = -1; ! Tcl_HashEntry *hPtr; ! Tcl_HashSearch search; ! Ns_MutexLock(&lock); ! hPtr = Tcl_FirstHashEntry(&preboundRaw, &search); ! while (hPtr != NULL) { ! if (proto == (int)Tcl_GetHashValue(hPtr)) { ! sock = (int)Tcl_GetHashKey(&preboundRaw, hPtr); ! Tcl_DeleteHashEntry(hPtr); ! break; ! } ! hPtr = Tcl_NextHashEntry(&search); ! } ! Ns_MutexUnlock(&lock); ! if (hPtr == NULL) { ! /* Not prebound, bind now */ ! sock = Ns_SockBindRaw(proto); ! } ! return (SOCKET)sock; } *************** *** 176,183 **** *---------------------------------------------------------------------- * ! * Ns_SockListenUdp -- * ! * Create a new UDP socket bound to the specified port and ! * listening for new connections. * * Results: --- 193,199 ---- *---------------------------------------------------------------------- * ! * Ns_SockListenUnix -- * ! * Listen on the Unix-domain socket addressed by the given path. * * Results: *************** *** 185,189 **** * * Side effects: ! * None. * *---------------------------------------------------------------------- --- 201,205 ---- * * Side effects: ! * May create a new socket if none prebound. * *---------------------------------------------------------------------- *************** *** 191,215 **** SOCKET ! Ns_SockListenUdp(char *address, int port) { int sock = -1; - struct sockaddr_in sa; Tcl_HashEntry *hPtr; - if (Ns_GetSockAddr(&sa, address, port) != NS_OK) { - return -1; - } Ns_MutexLock(&lock); ! hPtr = Tcl_FindHashEntry(&preboundUdp, (char *) &sa); ! if (hPtr != NULL) { ! sock = (int) Tcl_GetHashValue(hPtr); ! Tcl_DeleteHashEntry(hPtr); } Ns_MutexUnlock(&lock); if (hPtr == NULL) { ! sock = Ns_SockBindUdp(&sa); } ! return sock; } --- 207,233 ---- SOCKET ! Ns_SockListenUnix(char *path) { int sock = -1; Tcl_HashEntry *hPtr; + Tcl_HashSearch search; Ns_MutexLock(&lock); ! hPtr = Tcl_FirstHashEntry(&preboundUnix, &search); ! while (hPtr != NULL) { ! if (!strcmp(path, (char*)Tcl_GetHashValue(hPtr))) { ! sock = (int)Tcl_GetHashKey(&preboundRaw, hPtr); ! Tcl_DeleteHashEntry(hPtr); ! break; ! } ! hPtr = Tcl_NextHashEntry(&search); } Ns_MutexUnlock(&lock); if (hPtr == NULL) { ! /* Not prebound, bind now */ ! sock = Ns_SockBindUnix(path); } ! return (SOCKET)sock; } *************** *** 218,224 **** *---------------------------------------------------------------------- * ! * Ns_SockListenRaw -- * ! * Create a new RAW socket * * Results: --- 236,242 ---- *---------------------------------------------------------------------- * ! * Ns_SockBindUdp -- * ! * Create a UDP socket and bind it to the passed-in address. * * Results: *************** *** 232,257 **** SOCKET ! Ns_SockListenRaw(int proto) { ! int sock = -1; ! Tcl_HashEntry *hPtr; ! Tcl_HashSearch search; ! Ns_MutexLock(&lock); ! hPtr = Tcl_FirstHashEntry(&preboundRaw, &search); ! while (hPtr != NULL) { ! if (proto == (int)Tcl_GetHashValue(hPtr)) { ! sock = (int)Tcl_GetHashKey(&preboundRaw, hPtr); ! Tcl_DeleteHashEntry(hPtr); ! break; ! } ! hPtr = Tcl_NextHashEntry(&search); ! } ! Ns_MutexUnlock(&lock); ! if (hPtr == NULL) { ! sock = Ns_SockRaw(proto); ! } ! return sock; } --- 250,269 ---- SOCKET ! Ns_SockBindUdp(struct sockaddr_in *saPtr) { ! int sock = -1, n = 1; ! ! sock = socket(AF_INET,SOCK_DGRAM, 0); ! if (sock == -1 ! || setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&n,sizeof(n)) == -1 ! || bind(sock,(struct sockaddr*)saPtr,sizeof(struct sockaddr_in)) == -1) { ! int err = errno; ! close(sock); ! sock = -1; ! Ns_SetSockErrno(err); ! } ! return (SOCKET)sock; } *************** *** 262,266 **** * Ns_SockBindUnix -- * ! * Helper routine for creating a listening UNIX domain socket. * * Results: --- 274,279 ---- * Ns_SockBindUnix -- * ! * Create a Unix-domain socket and bind it to the passed-in ! * file path. * * Results: *************** *** 276,297 **** Ns_SockBindUnix(char *path) { ! int sock, err; ! struct sockaddr_un addr; ! ! memset(&addr, 0, sizeof(addr)); ! addr.sun_family = AF_UNIX; ! strncpy(addr.sun_path,path, sizeof(addr.sun_path) - 1); ! unlink(path); ! ! sock = socket(AF_UNIX,SOCK_STREAM, 0); ! if (sock < 0 ! || bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) { ! err = errno; ! close(sock); ! Ns_SetSockErrno(err); ! sock = -1; ! } ! ! return sock; } --- 289,311 ---- Ns_SockBindUnix(char *path) { ! int sock = -1; ! struct sockaddr_un addr; ! ! memset(&addr, 0, sizeof(addr)); ! addr.sun_family = AF_UNIX; ! strncpy(addr.sun_path,path, sizeof(addr.sun_path) - 1); ! unlink(path); ! ! sock = socket(AF_UNIX,SOCK_STREAM, 0); ! ! if (sock == -1 ! || bind(sock, (struct sockaddr *) &addr, sizeof(addr)) == -1) { ! int err = errno; ! close(sock); ! sock = -1; ! Ns_SetSockErrno(err); ! } ! ! return (SOCKET)sock; } *************** *** 300,307 **** *---------------------------------------------------------------------- * ! * Ns_SockListenUnix -- * ! * Create a new Unix domain socket bound to the specified path and ! * listening for new connections. * * Results: --- 314,322 ---- *---------------------------------------------------------------------- * ! * Ns_SockBindRaw -- * ! * Create a raw socket. It does not bind, hence the call name ! * is not entirely correct but is on-pair with other types of ! * sockets (udp, tcp, unix). * * Results: *************** *** 315,335 **** SOCKET ! Ns_SockListenUnix(char *path) { ! int sock = -1; ! Tcl_HashEntry *hPtr; ! Ns_MutexLock(&lock); ! hPtr = Tcl_FindHashEntry(&preboundUnix, path); ! if (hPtr != NULL) { ! sock = (int)Tcl_GetHashKey(&preboundUnix, hPtr); ! Tcl_DeleteHashEntry(hPtr); ! } ! Ns_MutexUnlock(&lock); ! if (hPtr == NULL) { ! sock = Ns_SockBindUnix(path); ! } ! return sock; } --- 330,346 ---- SOCKET ! Ns_SockBindRaw(int proto) { ! int sock = -1; ! ! sock = socket(AF_INET,SOCK_RAW, proto); ! if (sock == -1) { ! int err = errno; ! close(sock); ! Ns_SetSockErrno(err); ! } ! return (SOCKET)sock; } *************** *** 340,344 **** * NsInitBinder -- * ! * Initialize the pre-bind table. * * Results: --- 351,355 ---- * NsInitBinder -- * ! * Initialize the pre-bind tables. * * Results: *************** *** 368,372 **** * NsPreBind -- * ! * Pre-bind any requested ports, called from Ns_Main at startup. * * Results: --- 379,383 ---- * NsPreBind -- * ! * Pre-bind any requested ports (called from Ns_Main at startup). * * Results: *************** *** 382,396 **** NsPreBind(char *args, char *file) { - char line[1024]; - FILE *fp; - if (args != NULL) { PreBind(args); } ! if (file != NULL && (fp = fopen(file, "r")) != NULL) { ! while (fgets(line, sizeof(line), fp) != NULL) { ! PreBind(line); } - fclose(fp); } } --- 393,409 ---- NsPreBind(char *args, char *file) { if (args != NULL) { PreBind(args); } ! if (file != NULL) { ! FILE *fp; ! fp = fopen(file, "r"); ! if (fp != NULL) { ! char line[1024]; ! while (fgets(line, sizeof(line), fp) != NULL) { ! PreBind(line); ! } ! fclose(fp); } } } *************** *** 402,406 **** * NsClosePreBound -- * ! * Close any remaining pre-bound sockets. * * Results: --- 415,419 ---- * NsClosePreBound -- * ! * Close remaining pre-bound sockets not consumed by anybody. * * Results: *************** *** 408,412 **** * * Side effects: ! * Pre-bound sockets closed. * *---------------------------------------------------------------------- --- 421,425 ---- * * Side effects: ! * Pre-bind hash-tables are cleaned and re-initialized. * *---------------------------------------------------------------------- *************** *** 424,427 **** --- 437,444 ---- Ns_MutexLock(&lock); + /* + * Close TCP sockets + */ + hPtr = Tcl_FirstHashEntry(&preboundTcp, &search); while (hPtr != NULL) { *************** *** 430,435 **** port = htons(saPtr->sin_port); sock = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused TCP: %s:%d = %d", addr, port, sock); close(sock); hPtr = Tcl_NextHashEntry(&search); } --- 447,454 ---- port = htons(saPtr->sin_port); sock = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused TCP socket: %s:%d = %d", ! addr, port, sock); close(sock); + Tcl_DeleteHashEntry(hPtr); hPtr = Tcl_NextHashEntry(&search); } *************** *** 437,440 **** --- 456,463 ---- Tcl_InitHashTable(&preboundTcp, sizeof(struct sockaddr_in)/sizeof(int)); + /* + * Close UDP sockets + */ + hPtr = Tcl_FirstHashEntry(&preboundUdp, &search); while (hPtr != NULL) { *************** *** 443,448 **** port = htons(saPtr->sin_port); sock = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused UDP: %s:%d = %d", addr, port, sock); close(sock); hPtr = Tcl_NextHashEntry(&search); } --- 466,473 ---- port = htons(saPtr->sin_port); sock = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused UDP socket: %s:%d = %d", ! addr, port, sock); close(sock); + Tcl_DeleteHashEntry(hPtr); hPtr = Tcl_NextHashEntry(&search); } *************** *** 450,459 **** Tcl_InitHashTable(&preboundUdp, sizeof(struct sockaddr_in)/sizeof(int)); hPtr = Tcl_FirstHashEntry(&preboundRaw, &search); while (hPtr != NULL) { sock = (int)Tcl_GetHashKey(&preboundRaw, hPtr); port = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused RAW: %d = %d", port, sock); close(sock); hPtr = Tcl_NextHashEntry(&search); } --- 475,490 ---- Tcl_InitHashTable(&preboundUdp, sizeof(struct sockaddr_in)/sizeof(int)); + /* + * Close raw sockets + */ + hPtr = Tcl_FirstHashEntry(&preboundRaw, &search); while (hPtr != NULL) { sock = (int)Tcl_GetHashKey(&preboundRaw, hPtr); port = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused raw socket: %d = %d", ! port, sock); close(sock); + Tcl_DeleteHashEntry(hPtr); hPtr = Tcl_NextHashEntry(&search); } *************** *** 461,470 **** Tcl_InitHashTable(&preboundRaw, TCL_ONE_WORD_KEYS); hPtr = Tcl_FirstHashEntry(&preboundUnix, &search); while (hPtr != NULL) { addr = (char *) Tcl_GetHashKey(&preboundUnix, hPtr); sock = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused Unix: %s = %d", addr, sock); close(sock); hPtr = Tcl_NextHashEntry(&search); } --- 492,507 ---- Tcl_InitHashTable(&preboundRaw, TCL_ONE_WORD_KEYS); + /* + * Close Unix-domain sockets + */ + hPtr = Tcl_FirstHashEntry(&preboundUnix, &search); while (hPtr != NULL) { addr = (char *) Tcl_GetHashKey(&preboundUnix, hPtr); sock = (int)Tcl_GetHashValue(hPtr); ! Ns_Log(Warning, "prebind: closed unused Unix-domain socket: %s = %d", ! addr, sock); close(sock); + Tcl_DeleteHashEntry(hPtr); hPtr = Tcl_NextHashEntry(&search); } *************** *** 493,497 **** * Side effects: * Sockets are left in bound state for later listen ! * in Ns_SockListen. * *---------------------------------------------------------------------- --- 530,534 ---- * Side effects: * Sockets are left in bound state for later listen ! * in Ns_SockListenXXX. * *---------------------------------------------------------------------- *************** *** 584,588 **** } while(count--) { ! sock = Ns_SockRaw(IPPROTO_ICMP); if (sock == -1) { Ns_Log(Error, "prebind: icmp: %s",strerror(errno)); --- 621,625 ---- } while(count--) { ! sock = Ns_SockBindRaw(IPPROTO_ICMP); if (sock == -1) { Ns_Log(Error, "prebind: icmp: %s",strerror(errno)); *************** *** 590,594 **** } hPtr = Tcl_CreateHashEntry(&preboundRaw, (char *) sock, &new); ! if(!new) { Ns_Log(Error, "prebind: icmp: duplicate entry"); close(sock); --- 627,631 ---- } hPtr = Tcl_CreateHashEntry(&preboundRaw, (char *) sock, &new); ! if (!new) { Ns_Log(Error, "prebind: icmp: duplicate entry"); close(sock); *************** *** 606,610 **** continue; } ! sock = Ns_SockListenUnix(line); if (sock == -1) { Ns_Log(Error, "prebind: unix: %s: %s", proto, strerror(errno)); --- 643,647 ---- continue; } ! sock = Ns_SockBindUnix(line); if (sock == -1) { Ns_Log(Error, "prebind: unix: %s: %s", proto, strerror(errno)); |
|
From: Zoran V. <vas...@us...> - 2005-06-10 14:30:50
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14126/include Modified Files: ns.h Log Message: Ns_SockBindUdp(), Ns_SockBindRaw() and Ns_SockBindUnix() are now exported from binder.c Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ns.h 10 Jun 2005 14:09:17 -0000 1.21 --- ns.h 10 Jun 2005 14:30:39 -0000 1.22 *************** *** 1114,1118 **** --- 1114,1120 ---- NS_EXTERN SOCKET Ns_SockListenRaw(int proto); NS_EXTERN SOCKET Ns_SockListenUnix(char *path); + NS_EXTERN SOCKET Ns_SockBindUdp(struct sockaddr_in *saPtr); + NS_EXTERN SOCKET Ns_SockBindRaw(int proto); NS_EXTERN SOCKET Ns_SockBindUnix(char *path); |
|
From: Zoran V. <vas...@us...> - 2005-06-10 14:28:48
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13121/nsd Modified Files: init.c Log Message: NsInitBinder is also done for Windows as for Unix. Index: init.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/init.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** init.c 16 Feb 2005 15:59:42 -0000 1.2 --- init.c 10 Jun 2005 14:28:36 -0000 1.3 *************** *** 1,7 **** /* ! * The contents of this file are subject to the AOLserver Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at ! * http://aolserver.com/. * * Software distributed under the License is distributed on an "AS IS" --- 1,7 ---- /* ! * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at ! * http://mozilla.org/. * * Software distributed under the License is distributed on an "AS IS" *************** *** 44,55 **** * NsdInit -- * ! * Library entry point for libnsd. This routine calls various ! * data structure initialization functions throughout the core. * * Results: ! None. * * Side effects: ! * None. * *---------------------------------------------------------------------- --- 44,55 ---- * NsdInit -- * ! * Library entry point for libnsd. This routine calls various ! * data structure initialization functions throughout the core. * * Results: ! * None. * * Side effects: ! * Numerous. * *---------------------------------------------------------------------- *************** *** 62,69 **** if (!once) { ! once = 1; ! #ifndef _WIN32 NsInitBinder(); - #endif NsInitLog(); NsInitCache(); --- 62,67 ---- if (!once) { ! once = 1; NsInitBinder(); NsInitLog(); NsInitCache(); |
|
From: Vlad S. <ser...@us...> - 2005-06-10 14:09:28
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3586/include Modified Files: ns.h Log Message: make Ns_SockListenUnix use prebound sockets Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ns.h 8 Jun 2005 20:27:12 -0000 1.20 --- ns.h 10 Jun 2005 14:09:17 -0000 1.21 *************** *** 1115,1118 **** --- 1115,1119 ---- NS_EXTERN SOCKET Ns_SockListenUnix(char *path); NS_EXTERN SOCKET Ns_SockBindUdp(struct sockaddr_in *saPtr); + NS_EXTERN SOCKET Ns_SockBindUnix(char *path); /* |
|
From: Vlad S. <ser...@us...> - 2005-06-10 14:09:27
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3586/nsd Modified Files: binder.c Log Message: make Ns_SockListenUnix use prebound sockets Index: binder.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/binder.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** binder.c 10 Jun 2005 10:12:36 -0000 1.4 --- binder.c 10 Jun 2005 14:09:18 -0000 1.5 *************** *** 260,264 **** *---------------------------------------------------------------------- * ! * Ns_SockListenUnix -- * * Helper routine for creating a listening UNIX domain socket. --- 260,264 ---- *---------------------------------------------------------------------- * ! * Ns_SockBindUnix -- * * Helper routine for creating a listening UNIX domain socket. *************** *** 274,278 **** SOCKET ! Ns_SockListenUnix(char *path) { int sock, err; --- 274,278 ---- SOCKET ! Ns_SockBindUnix(char *path) { int sock, err; *************** *** 300,303 **** --- 300,341 ---- *---------------------------------------------------------------------- * + * Ns_SockListenUnix -- + * + * Create a new Unix domain socket bound to the specified path and + * listening for new connections. + * + * Results: + * Socket descriptor or -1 on error. + * + * Side effects: + * None. + * + *---------------------------------------------------------------------- + */ + + SOCKET + Ns_SockListenUnix(char *path) + { + int sock = -1; + Tcl_HashEntry *hPtr; + + Ns_MutexLock(&lock); + hPtr = Tcl_FindHashEntry(&preboundUnix, path); + if (hPtr != NULL) { + sock = (int)Tcl_GetHashKey(&preboundUnix, hPtr); + Tcl_DeleteHashEntry(hPtr); + } + Ns_MutexUnlock(&lock); + if (hPtr == NULL) { + sock = Ns_SockBindUnix(path); + } + + return sock; + } + + + /* + *---------------------------------------------------------------------- + * * NsInitBinder -- * |
|
From: Vlad S. <ser...@us...> - 2005-06-10 14:09:26
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3586 Modified Files: ChangeLog Log Message: make Ns_SockListenUnix use prebound sockets Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** ChangeLog 10 Jun 2005 13:53:19 -0000 1.98 --- ChangeLog 10 Jun 2005 14:09:17 -0000 1.99 *************** *** 1,7 **** 2005-06-10 Vlad Seryakov <ser...@us...> ! tests/tclresp.test: updated to reflect parameters change for ns_respond, new -binary flag 2005-06-10 Zoran Vasiljevic <vas...@us...> --- 1,10 ---- 2005-06-10 Vlad Seryakov <ser...@us...> ! * tests/tclresp.test: updated to reflect parameters change for ns_respond, new -binary flag + * nsd/binder.c: make Ns_SockListenUnix to use prebound + sockets if available. + 2005-06-10 Zoran Vasiljevic <vas...@us...> |
|
From: Vlad S. <ser...@us...> - 2005-06-10 13:53:30
|
Update of /cvsroot/naviserver/naviserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28795 Modified Files: ChangeLog Log Message: updated to deal with -binary flag Index: ChangeLog =================================================================== RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** ChangeLog 10 Jun 2005 07:44:59 -0000 1.97 --- ChangeLog 10 Jun 2005 13:53:19 -0000 1.98 *************** *** 1,2 **** --- 1,7 ---- + 2005-06-10 Vlad Seryakov <ser...@us...> + + tests/tclresp.test: updated to reflect parameters change + for ns_respond, new -binary flag + 2005-06-10 Zoran Vasiljevic <vas...@us...> |
