Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16894/nsd
Modified Files:
info.c nsd.h nsmain.c
Log Message:
Remove redundant Ns_InfoLabel(). Use Ns_InfoTag() instead.
Index: info.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/info.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** info.c 16 May 2005 00:53:01 -0000 1.4
--- info.c 16 May 2005 01:25:02 -0000 1.5
***************
*** 439,468 ****
*----------------------------------------------------------------------
*
- * Ns_InfoLabel --
- *
- * Returns version information about this build.
- *
- * Results:
- * A string version name.
- *
- * Side effects:
- * None.
- *
- *----------------------------------------------------------------------
- */
-
- char *
- Ns_InfoLabel(void)
- {
- return NSD_LABEL;
- }
-
-
- /*
- *----------------------------------------------------------------------
- *
* Ns_InfoTag --
*
! * Returns CVS tag of this build (can be meaningless).
*
* Results:
--- 439,445 ----
*----------------------------------------------------------------------
*
* Ns_InfoTag --
*
! * Returns CVS tag of this build (meaningless without "cvs export").
*
* Results:
***************
*** 506,510 ****
static CONST char *opts[] = {
"address", "argv0", "boottime", "builddate", "callbacks",
! "config", "home", "hostname", "label", "locks", "log",
"major", "minor", "name", "nsd", "pageroot", "patchlevel",
"pid", "platform", "pools", "scheduled", "server", "servers",
--- 483,487 ----
static CONST char *opts[] = {
"address", "argv0", "boottime", "builddate", "callbacks",
! "config", "home", "hostname", "locks", "log",
"major", "minor", "name", "nsd", "pageroot", "patchlevel",
"pid", "platform", "pools", "scheduled", "server", "servers",
***************
*** 514,518 ****
enum {
IAddressIdx, IArgv0Idx, IBoottimeIdx, IBuilddateIdx, ICallbacksIdx,
! IConfigIdx, IHomeIdx, hostINameIdx, ILabelIdx, ILocksIdx, ILogIdx,
IMajorIdx, IMinorIdx, INameIdx, INsdIdx, IPageRootIdx, IPatchLevelIdx,
IPidIdx, IPlatformIdx, IPoolsIdx, IScheduledIdx, IServerIdx, IServersIdx,
--- 491,495 ----
enum {
IAddressIdx, IArgv0Idx, IBoottimeIdx, IBuilddateIdx, ICallbacksIdx,
! IConfigIdx, IHomeIdx, hostINameIdx, ILocksIdx, ILogIdx,
IMajorIdx, IMinorIdx, INameIdx, INsdIdx, IPageRootIdx, IPatchLevelIdx,
IPidIdx, IPlatformIdx, IPoolsIdx, IScheduledIdx, IServerIdx, IServersIdx,
***************
*** 652,659 ****
break;
- case ILabelIdx:
- Tcl_SetResult(interp, Ns_InfoLabel(), TCL_STATIC);
- break;
-
case IBuilddateIdx:
Tcl_SetResult(interp, Ns_InfoBuildDate(), TCL_STATIC);
--- 629,632 ----
Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** nsd.h 18 Apr 2005 13:04:14 -0000 1.12
--- nsd.h 16 May 2005 01:25:02 -0000 1.13
***************
*** 115,121 ****
#define NSD_NAME "NaviServer"
! #define NSD_VERSION NS_PATCH_LEVEL
! #define NSD_LABEL "naviserver4_0"
#define NSD_TAG "$Name$"
#define NS_CONFIG_PARAMETERS "ns/parameters"
#define NS_CONFIG_THREADS "ns/threads"
--- 115,121 ----
#define NSD_NAME "NaviServer"
! #define NSD_VERSION NS_PATCH_LEVEL
#define NSD_TAG "$Name$"
+
#define NS_CONFIG_PARAMETERS "ns/parameters"
#define NS_CONFIG_THREADS "ns/threads"
Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** nsmain.c 30 Apr 2005 09:22:42 -0000 1.10
--- nsmain.c 16 May 2005 01:25:02 -0000 1.11
***************
*** 297,301 ****
}
if (mode == 'V') {
! printf("NaviServer/%s (%s)\n", NSD_VERSION, Ns_InfoLabel());
printf(" CVS Tag: %s\n", Ns_InfoTag());
printf(" Built: %s\n", Ns_InfoBuildDate());
--- 297,301 ----
}
if (mode == 'V') {
! printf("NaviServer/%s\n", NSD_VERSION);
printf(" CVS Tag: %s\n", Ns_InfoTag());
printf(" Built: %s\n", Ns_InfoBuildDate());
|
