[Perfparse-cvs] _perfparse/db_tools convert.c,1.26,1.27

[Florian G. <re...@us...>]

Update of /cvsroot/perfparse/_perfparse/db_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18251

Modified Files:
	convert.c 
Log Message:
fix double free and disabled version check


Index: convert.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** convert.c	9 Apr 2007 22:39:09 -0000	1.26
--- convert.c	10 Apr 2007 15:03:27 -0000	1.27
***************
*** 97,101 ****
      g_string_printf(gsNDBSql, "select policy_id from perfdata_delete_policy where policy_name='%s'",policy_name);
      query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new);
-     g_string_free(gsNDBSql,TRUE);
      if((result_row_new=mysql_fetch_row(query_result_new))) {
        Pid=atoi(result_row_new[0]);
--- 97,100 ----
***************
*** 127,131 ****
      g_string_printf(gsNDBSql, "select group_id from perfdata_groups where group_name='%s'",group_name);
      query_result_new=dbtool_mysql_query(gsNDBSql->str, p_db_mysql_new, query_result_new);
-     g_string_free(gsNDBSql,TRUE);
      if((result_row_new=mysql_fetch_row(query_result_new))) {
        Gid=atoi(result_row_new[0]);
--- 126,129 ----
***************
*** 215,218 ****
--- 213,219 ----
  	 * Get the version from the database 
  	 */
+ 
+   // TODO: Do version check after mysql login data are provided
+   /*
  	version = getVersion ();
  
***************
*** 223,229 ****
      exit(1);
  	}
  
! 	if (version < 0.20)
! 	{
      char yesno;
      
--- 224,231 ----
      exit(1);
  	}
+   */
  
! 	//if (version < 0.20)
! 	//{
      char yesno;
      
***************
*** 731,735 ****
      
      */
! 	}
  
  	/*
--- 733,739 ----
      
      */
! 
!     //TODO: End comment versioncheck
! 	//}
  
  	/*