From owner-svn-soc-all@FreeBSD.ORG  Mon Aug 18 10:55:05 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0DAC4C23
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Aug 2014 10:55:05 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EE06337EE
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Aug 2014 10:55:04 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IAt4OD078389
 for <svn-soc-all@FreeBSD.org>; Mon, 18 Aug 2014 10:55:04 GMT
 (envelope-from zkorchev@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s7IAt4Yw078385
 for svn-soc-all@FreeBSD.org; Mon, 18 Aug 2014 10:55:04 GMT
 (envelope-from zkorchev@FreeBSD.org)
Date: Mon, 18 Aug 2014 10:55:04 GMT
Message-Id: <201408181055.s7IAt4Yw078385@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zkorchev@FreeBSD.org using -f
From: zkorchev@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r272604 - soc2014/zkorchev/freebsd_head/lib/libsol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Aug 2014 10:55:05 -0000

Author: zkorchev
Date: Mon Aug 18 10:55:04 2014
New Revision: 272604
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272604

Log:
  fixed configuration format keys

Modified:
  soc2014/zkorchev/freebsd_head/lib/libsol/sol.c

Modified: soc2014/zkorchev/freebsd_head/lib/libsol/sol.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/lib/libsol/sol.c	Mon Aug 18 10:53:15 2014	(r272603)
+++ soc2014/zkorchev/freebsd_head/lib/libsol/sol.c	Mon Aug 18 10:55:04 2014	(r272604)
@@ -52,10 +52,10 @@
 
 // TODO track whether a key or a value is expected and generate error when appropriate?
 
-static void xml_tag(const char *tag)
+static void print_key(const char *key)
 {
-	for(; *tag; ++tag)
-		switch (*tag)
+	for(; *key; ++key)
+		switch (*key)
 		{
 		case ' ':
 			putchar('_');
@@ -78,7 +78,7 @@
 			break;
 
 		default:
-			putchar(*tag);
+			putchar(*key);
 			break;
 		}
 }
@@ -95,7 +95,7 @@
 
 	if (tag) {
 		putchar('<');
-		xml_tag(tag);
+		print_key(tag);
 		putchar('>');
 	}
 	else
@@ -121,7 +121,7 @@
 	if (tag)
 	{
 		fputs("</", stdout);
-		xml_tag(tag);
+		print_key(tag);
 		putchar('>');
 		if (clean) free(tag);
 	}
@@ -329,7 +329,7 @@
 
 	case SOL_CONF:
 		padding(stream);
-		printf("%s", key); // TODO escape special chars
+		print_key(key);
 		break;
 
 	case SOL_XML: