From: Vlad S. <ser...@us...> - 2005-06-12 22:35:01
|
Update of /cvsroot/naviserver/modules/nschartdir In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nschartdir Modified Files: nschartdir.c Log Message: compiler warnings silence Index: nschartdir.c =================================================================== RCS file: /cvsroot/naviserver/modules/nschartdir/nschartdir.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nschartdir.c 8 Jun 2005 20:03:38 -0000 1.2 --- nschartdir.c 12 Jun 2005 22:34:22 -0000 1.3 *************** *** 195,199 **** if(now - chart->access_time > chartIdleTimeout) { Chart *next = chart->next; ! Ns_Log(Notice,"ns_chartdir: GC: inactive chart %d",chart->id); freeChart(chart,0); chart = next; --- 195,199 ---- if(now - chart->access_time > chartIdleTimeout) { Chart *next = chart->next; ! Ns_Log(Notice,"ns_chartdir: GC: inactive chart %ld",chart->id); freeChart(chart,0); chart = next; *************** *** 457,460 **** --- 457,461 ---- static int XAxisCmd(int second,Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp) { + int cmd; enum commands { cmdSetTitle, cmdSetLabels, *************** *** 463,469 **** cmdSetWidth, cmdAddMark, cmdAddZone ! } cmd; ! static char *sCmd[] = { "settitle", "setlabels", "setlabelstyle", "setindent", --- 464,470 ---- cmdSetWidth, cmdAddMark, cmdAddZone ! }; ! static const char *sCmd[] = { "settitle", "setlabels", "setlabelstyle", "setindent", *************** *** 627,630 **** --- 628,632 ---- static int YAxisCmd(int second,Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp) { + int cmd; enum commands { cmdSetTitle, cmdSetFormat, *************** *** 635,641 **** cmdAddMark, cmdAddZone, cmdSyncYAxis, cmdSetYAxisOnRight ! } cmd; ! static char *sCmd[] = { "settitle", "setformat", "setlabelstyle", "settopmargin", --- 637,643 ---- cmdAddMark, cmdAddZone, cmdSyncYAxis, cmdSetYAxisOnRight ! }; ! static const char *sCmd[] = { "settitle", "setformat", "setlabelstyle", "settopmargin", *************** *** 857,861 **** static int LayerCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp) { ! int layer, datasetID; DataSet *dataset; --- 859,863 ---- static int LayerCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp) { ! int cmd, layer, datasetID; DataSet *dataset; *************** *** 868,874 **** cmdSetBorderColor, cmdSetDataLabelStyle, cmdSetAggregateLabelStyle ! } cmd; ! static char *sCmd[] = { "create", "setlinewidth", "setdatasymbol", "dataset", --- 870,876 ---- cmdSetBorderColor, cmdSetDataLabelStyle, cmdSetAggregateLabelStyle ! }; ! static const char *sCmd[] = { "create", "setlinewidth", "setdatasymbol", "dataset", *************** *** 1290,1296 **** int fontsize = 8; int fontcolor = TextColor; - int bgcolor = Transparent; - int edgecolor = Transparent; - int border = 1; int vertical = 0; double angle = 0; --- 1292,1295 ---- *************** *** 1315,1324 **** static int PieCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp) { enum commands { cmdSetData, cmdSet3D, cmdSetPieSize ! } cmd; ! static char *sCmd[] = { "setdata", "set3d", "setpiesize", --- 1314,1324 ---- static int PieCmd(Chart *chart,int objc,Tcl_Obj *CONST objv[],Tcl_Interp *interp) { + int cmd; enum commands { cmdSetData, cmdSet3D, cmdSetPieSize ! }; ! static const char *sCmd[] = { "setdata", "set3d", "setpiesize", *************** *** 1386,1390 **** static int ChartCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]) { ! int i; Chart *chart; --- 1386,1390 ---- static int ChartCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[]) { ! int i,cmd; Chart *chart; *************** *** 1408,1414 **** cmdSave, cmdDestroy, cmdImage, cmdReturn ! } cmd; ! static char *sCmd[] = { "gc", "charts", "version", --- 1408,1414 ---- cmdSave, cmdDestroy, cmdImage, cmdReturn ! }; ! static const char *sCmd[] = { "gc", "charts", "version", |