Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Aug 2014 10:55:04 GMT
From:      zkorchev@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r272604 - soc2014/zkorchev/freebsd_head/lib/libsol
Message-ID:  <201408181055.s7IAt4Yw078385@socsvn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181055.s7IAt4Yw078385>