[GRASS-SVN] r37645 - grass/branches/releasebranch_6_4/visualization/nviz/src

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-31 07:52:48 -0400 (Sun, 31 May 2009)
New Revision: 37645

Modified:
   grass/branches/releasebranch_6_4/visualization/nviz/src/nvizAppInit.c
   grass/branches/releasebranch_6_4/visualization/nviz/src/nvizMain.c
   grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c
Log:
G_debug(), whitespace gone nuts (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/visualization/nviz/src/nvizAppInit.c
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/src/nvizAppInit.c	2009-05-31 11:51:11 UTC (rev 37644)
+++ grass/branches/releasebranch_6_4/visualization/nviz/src/nvizAppInit.c	2009-05-31 11:52:48 UTC (rev 37645)
@@ -58,8 +58,7 @@
  *----------------------------------------------------------------------
  */
 
-int NVIZ_AppInit(Tcl_Interp * interp	/* Interpreter for application. */
-    )
+int NVIZ_AppInit(Tcl_Interp *interp)	/* Interpreter for application. */
 {
 
     mainWindow = Tk_MainWindow(interp);

Modified: grass/branches/releasebranch_6_4/visualization/nviz/src/nvizMain.c
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/src/nvizMain.c	2009-05-31 11:51:11 UTC (rev 37644)
+++ grass/branches/releasebranch_6_4/visualization/nviz/src/nvizMain.c	2009-05-31 11:52:48 UTC (rev 37645)
@@ -17,10 +17,10 @@
  *               License (>=v2). Read the file COPYING that comes with GRASS
  *               for details.
  *
-																																						      																			      									        *****************************************************************************//*
-																																						       * This is basically tkAppInit.c from the tk4.0 distribution except
-																																						       * that we define Tcl_AppInit in tkAppInit.c.
-																																						       */
+ *****************************************************************************//*
+ * This is basically tkAppInit.c from the tk4.0 distribution except
+ * that we define Tcl_AppInit in tkAppInit.c.
+ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -49,10 +49,10 @@
  */
 
 int main(int argc,		/* Number of command-line arguments. */
-	 char **argv		/* Values of command-line arguments. */
-    )
+	 char **argv)		/* Values of command-line arguments. */
 {
     Tcl_FindExecutable(argv[0]);
+
     if (argc > 1) {
 	if (strstr(argv[argc - 1], "-h") != NULL)
 	    sprintf(argv[argc - 1], "--h");
@@ -60,5 +60,5 @@
 
     Tk_Main(argc, argv, NVIZ_AppInit);
 
-    return 0;			/* Needed only to prevent compiler warning. */
+    exit(EXIT_SUCCESS);
 }

Modified: grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c	2009-05-31 11:51:11 UTC (rev 37644)
+++ grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c	2009-05-31 11:52:48 UTC (rev 37645)
@@ -150,6 +150,8 @@
 	exit(EXIT_FAILURE);
     /* [?!]: Exit status is zero to avoid TCL complaints */
 
+    G_debug(1, "nviz_init:parse_command()");
+
     /* please remove before GRASS 7 released */
     if (verbose->answer) {
         putenv("GRASS_VERBOSE=3");
@@ -384,6 +386,8 @@
     const char *cmd;
     int argc;
 
+    G_debug(2, "nviz_init:Ngetargs()");
+
     argv0 = Tcl_GetVar(interp, "argv0", TCL_LEAVE_ERR_MSG);
     tmp = Tcl_GetVar(interp, "argv", TCL_LEAVE_ERR_MSG);
     cmd = Tcl_GetNameOfExecutable();
@@ -509,7 +513,7 @@
     return 0;
 }
 
-int Ninit(Tcl_Interp * interp, Tk_Window w)
+int Ninit(Tcl_Interp *interp, Tk_Window w)
 {
     static Nv_data data;
 
@@ -545,8 +549,8 @@
 
 void swap_togl();
 
-int Ninitdata(Tcl_Interp * interp,	/* Current interpreter. */
-	      Nv_data * data)
+int Ninitdata(Tcl_Interp *interp,	/* Current interpreter. */
+	      Nv_data *data)
 {
     const char **argv;
     int argc;