[GRASS-SVN] r32322 - in grass/branches/develbranch_6: include lib/ogsf

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-26 17:04:11 -0400 (Sat, 26 Jul 2008)
New Revision: 32322

Modified:
   grass/branches/develbranch_6/include/ogsf_proto.h
   grass/branches/develbranch_6/lib/ogsf/Gv3.c
   grass/branches/develbranch_6/lib/ogsf/gv.c
Log:
ogsflib: don't track memory by default (merged from trunk, r32316 + r32321)

Modified: grass/branches/develbranch_6/include/ogsf_proto.h
===================================================================
--- grass/branches/develbranch_6/include/ogsf_proto.h	2008-07-26 21:00:45 UTC (rev 32321)
+++ grass/branches/develbranch_6/include/ogsf_proto.h	2008-07-26 21:04:11 UTC (rev 32322)
@@ -327,9 +327,7 @@
 
 /* From Gv3.c */
 geoline *Gv_load_vect(const char *, int *);
-void add_Vectmem(int);
 void sub_Vectmem(int);
-void show_Vectmem(void);
 
 /* From gk.c */
 Keylist *gk_copy_key(Keylist *);

Modified: grass/branches/develbranch_6/lib/ogsf/Gv3.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/Gv3.c	2008-07-26 21:00:45 UTC (rev 32321)
+++ grass/branches/develbranch_6/lib/ogsf/Gv3.c	2008-07-26 21:04:11 UTC (rev 32322)
@@ -23,7 +23,9 @@
 #include <grass/glocale.h>
 #include <grass/gstypes.h>
 
+/*
 #define TRAK_MEM
+*/
 
 #ifdef TRAK_MEM
 static int Tot_mem = 0;
@@ -256,48 +258,18 @@
     return(top);
 }
 
-/*!
-  \brief Tracking memory
-
-  \param plus plus number
+/*! 
+  \brief Tracking memory 
+  
+  \param minus mimus number 
 */
-void add_Vectmem(int plus)
-{
-#ifdef TRAK_MEM
-    {
-    	Tot_mem+=plus;
-    }
-#endif
+void sub_Vectmem(int minus) 
+{ 
+#ifdef TRAK_MEM 
+    { 
+	Tot_mem-=minus; 
+    } 
+#endif 
     
-    return;
-}
-
-/*!
-  \brief Tracking memory
-
-  \param minus mimus number
-*/
-void sub_Vectmem(int minus)
-{
-#ifdef TRAK_MEM
-    {
-    	Tot_mem-=minus;
-    }
-#endif
-    
-    return;
-}
-
-/*!
-  \brief Tracking memory (print)
-*/
-void show_Vectmem(void)
-{
-#ifdef TRAK_MEM
-    {
-    	G_message("Total vect memory = %d Kbytes", Tot_mem/1000);
-    }
-#endif
-    
-    return;
-}
+    return; 
+} 

Modified: grass/branches/develbranch_6/lib/ogsf/gv.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gv.c	2008-07-26 21:00:45 UTC (rev 32321)
+++ grass/branches/develbranch_6/lib/ogsf/gv.c	2008-07-26 21:04:11 UTC (rev 32322)
@@ -326,8 +326,6 @@
 	fv->lines = NULL;
     }
 
-    show_Vectmem();
-
     return;
 }