[ekg-commit] r2851 - trunk/contrib/ekg_logs

[EKG commit list]

Author: porridge
Date: 2012-04-17 23:16:46 +0200 (Tue, 17 Apr 2012)
New Revision: 2851

Modified:
trunk/contrib/ekg_logs/Makefile
trunk/contrib/ekg_logs/parse.c
Log:
Update ekg_logs to glib2 and improve its Makefile.

Adapt for the changed semantics for g_strsplit() in version 2 of glib library.

Change the Makefile for ekg_logs to allow one to change cflags and disable
stripping during build.

Modified: trunk/contrib/ekg_logs/Makefile
===================================================================
--- trunk/contrib/ekg_logs/Makefile 2011-09-18 10:01:43 UTC (rev 2850)
+++ trunk/contrib/ekg_logs/Makefile 2012-04-17 21:16:46 UTC (rev 2851)
@@ -1,8 +1,9 @@
all: parse

+CFLAGS ?= -O2 -s
+
parse: parse.c
- gcc -O2 -o parse parse.c `glib-config --cflags --libs` # -ggdb
- strip parse
+ gcc $(CFLAGS) -o parse parse.c `pkg-config --cflags --libs glib-2.0` # -ggdb

clean:
rm -f parse

Modified: trunk/contrib/ekg_logs/parse.c
===================================================================
--- trunk/contrib/ekg_logs/parse.c 2011-09-18 10:01:43 UTC (rev 2850)
+++ trunk/contrib/ekg_logs/parse.c 2012-04-17 21:16:46 UTC (rev 2851)
@@ -295,7 +295,7 @@
char *l;

chr='<';
- a=g_strsplit(linebuf,",",5);
+ a=g_strsplit(linebuf,",",6);
l=a[5];
if(a[5][0]=='"')
{
@@ -321,7 +321,7 @@
char *l;

chr='>';
- a=g_strsplit(linebuf,",",4);
+ a=g_strsplit(linebuf,",",5);
l=a[4];
if(a[4][0]=='"')
{
@@ -345,7 +345,7 @@
char *l;

chr='|';
- a=g_strsplit(linebuf,",",6);
+ a=g_strsplit(linebuf,",",7);
l=a[6];
if(l && l[0]=='"')
{