From 907a22f37e3acd6c12b2299ad331c3ea81d56f24 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Thu, 21 Nov 2013 23:48:39 +0100 Subject: Simplify params numbering in parse_csv_file When we add more fields, we don't need to renumber the whole thing. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- file.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/file.c b/file.c index 45b153d25..db9a10e2e 100644 --- a/file.c +++ b/file.c @@ -330,6 +330,7 @@ void parse_file(const char *filename, char **error) void parse_csv_file(const char *filename, int timef, int depthf, int tempf, char **error) { struct memblock mem; + int pnr=0; char *params[11]; char timebuf[MAXCOLDIGITS]; char depthbuf[MAXCOLDIGITS]; @@ -357,17 +358,17 @@ void parse_csv_file(const char *filename, int timef, int depthf, int tempf, char * is not discarded during the transform, thus prepend time with 1 */ strftime(curtime, sizeof(curtime), "1%H%M", timep); - params[0] = "timeField"; - params[1] = timebuf; - params[2] = "depthField"; - params[3] = depthbuf; - params[4] = "tempField"; - params[5] = tempbuf; - params[6] = "date"; - params[7] = curdate; - params[8] = "time"; - params[9] = curtime; - params[10] = NULL; + params[pnr++] = "timeField"; + params[pnr++] = timebuf; + params[pnr++] = "depthField"; + params[pnr++] = depthbuf; + params[pnr++] = "tempField"; + params[pnr++] = tempbuf; + params[pnr++] = "date"; + params[pnr++] = curdate; + params[pnr++] = "time"; + params[pnr++] = curtime; + params[pnr++] = NULL; if (filename == NULL) return; -- cgit v1.2.3-70-g09d2