From bb40336eb8a2acc9f2e3d2e9059b7d90afe5c0c4 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 29 Feb 2016 09:14:58 +0000
Subject: [PATCH] Some leaks still present in xml parsing library.
---
src/io.h | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/io.h b/src/io.h
index f76eb09..69de4e9 100644
--- a/src/io.h
+++ b/src/io.h
@@ -1,13 +1,26 @@
#ifndef _IO_H
#define _IO_H
-
+#include <confuse.h>
/** @ Global variables for I/O operations like filenames etc. */
/*static char mastername[1024];
static char prefixname[1024];
static ts_bool restore=0;
static char tape[1024]; */
-char path[1024];
int force_from_tape;
+
+typedef struct{
+ ts_int force_from_tape;
+ ts_int reset_iteration_count;
+ char path[1024]; //path where all files should be added
+ char output_fullfilename[1024]; //name of the master file
+ char dump_fullfilename[1024]; //name of the dump file
+ char tape_fullfilename[1024]; //name of the tape file
+ char tape_templatefull[1024]; //name of the tape template file
+ char tape_opts[1000]; //commandline tape options
+ char dump_from_vtk[1024];
+} ts_args;
+
+ts_args command_line_args;
ts_bool parse_args(int argc, char **argv);
@@ -60,8 +73,13 @@
ts_bool write_vertex_vtk_file(ts_vesicle *vesicle,ts_char *filename, ts_char *text);
ts_bool write_vertex_xml_file(ts_vesicle *vesicle, ts_uint timestepno);
ts_bool write_master_xml_file(ts_char *filename);
-ts_vesicle *parsetape(ts_uint *mcsweeps, ts_uint *inititer, ts_uint *iterations);
+ts_bool write_pov_file(ts_vesicle *vesicle, char *filename);
-ts_bool dump_state(ts_vesicle *vesicle);
-ts_vesicle *restore_state();
+ts_tape *parsetape(char *filename);
+ts_bool tape_free(ts_tape *tape);
+ts_bool getcmdline_tape(cfg_t *cfg, char *opts);
+ts_bool cmdline_to_tape(cfg_t *cfg, char *key, char *val);
+
+ts_bool dump_state(ts_vesicle *vesicle, ts_uint iteration);
+ts_vesicle *restore_state(ts_uint *iteration);
#endif
--
Gitblit v1.9.3