[naviserver-commits] modules/nsgdchart gdchart.c,1.2,1.3 nsgdchart.c,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsgdchart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsgdchart

Modified Files:
	gdchart.c nsgdchart.c 
Log Message:
compiler warnings silence


Index: nsgdchart.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/nsgdchart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsgdchart.c	8 Jun 2005 20:03:46 -0000	1.2
--- nsgdchart.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 79,83 ****
  GDCCmd(ClientData arg,Tcl_Interp * interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int i,j,k,argc;
      Tcl_Obj **argv;
      char *val;
--- 79,83 ----
  GDCCmd(ClientData arg,Tcl_Interp * interp,int objc,Tcl_Obj * CONST objv[])
  {
!     int i,j,k,argc,opt,cmd;
      Tcl_Obj **argv;
      char *val;
***************
*** 87,92 ****
  	cmdCreate,cmdSet,cmdSetData,cmdSetLabels,cmdSetColors,cmdSkipLabels,
          cmdSave,cmdDestroy
!     } cmd;
!     static char *Cmds[] = {
  	"create","set","setdata","setlabels","setcolors","skiplabels",
          "save","destroy",
--- 87,92 ----
  	cmdCreate,cmdSet,cmdSetData,cmdSetLabels,cmdSetColors,cmdSkipLabels,
          cmdSave,cmdDestroy
!     };
!     static const char *Cmds[] = {
  	"create","set","setdata","setlabels","setcolors","skiplabels",
          "save","destroy",
***************
*** 94,98 ****
      };
  
!     static char *Types[] = {
  	"line","area","bar","floatingbar","hiloclose","combolinebar","combohlcbar",
          "combolinearea","combolineline","combohlcarea","3dhiloclose",
--- 94,98 ----
      };
  
!     static const char *Types[] = {
  	"line","area","bar","floatingbar","hiloclose","combolinebar","combohlcbar",
          "combolinearea","combolineline","combohlcarea","3dhiloclose",
***************
*** 116,121 ****
          optLegend,optLegendX,optLegendY,optLegendColor,optHardWidth,optHardHeight,
          optHardXOrig,optHardYOrig,optGridOnTop
!     } opt;
!     static char *Opts[] = {
  	"type","bgcolor","plotcolor","title","titlefont","titleptsize",
          "xtitle","xtitlefont","xtitleptsize","ytitle","ytitlefont","ytitleptsize",
--- 116,121 ----
          optLegend,optLegendX,optLegendY,optLegendColor,optHardWidth,optHardHeight,
          optHardXOrig,optHardYOrig,optGridOnTop
!     };
!     static const char *Opts[] = {
  	"type","bgcolor","plotcolor","title","titlefont","titleptsize",
          "xtitle","xtitlefont","xtitleptsize","ytitle","ytitlefont","ytitleptsize",

Index: gdchart.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsgdchart/gdchart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gdchart.c	8 Jun 2005 20:03:46 -0000	1.2
--- gdchart.c	12 Jun 2005 22:34:23 -0000	1.3
***************
*** 1018,1029 ****
        /* if lowest < 0 < highest                                                  */
        for(i = -1; i <= 1; i += 2) {	/* -1,1 */
! 	if(i == -1)
  	  if(lowest >= 0.0) continue;
! 	else
  	  tmp_y = MIN(0,highest);	/*      step down to lowest */
! 	if(i == 1)
  	  if(highest <= 0.0) continue;
!        	else
        	  tmp_y = MAX(0,lowest);	/*      step up to highest */
  	do {
  	   int n,d,w;
--- 1018,1031 ----
        /* if lowest < 0 < highest                                                  */
        for(i = -1; i <= 1; i += 2) {	/* -1,1 */
! 	if(i == -1) {
  	  if(lowest >= 0.0) continue;
! 	} else {
  	  tmp_y = MIN(0,highest);	/*      step down to lowest */
!         }
! 	if(i == 1) {
  	  if(highest <= 0.0) continue;
!        	} else {
        	  tmp_y = MAX(0,lowest);	/*      step up to highest */
+         }
  	do {
  	   int n,d,w;