From 0f99d49ae680e675809428deace3c4fe839d323c Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Thu, 24 Jul 2008 23:38:04 +0000
Subject: *: conversion to config parser

function                                             old     new   delta
config_read                                          540     597     +57
config_open2                                          41      44      +3
rtnl_rtprot_initialize                                70      66      -4
rtnl_rttable_initialize                               78      73      -5
rtnl_rtscope_initialize                               88      83      -5
rtnl_rtrealm_initialize                               48      43      -5
rtnl_rtdsfield_initialize                             48      43      -5
process_module                                       566     560      -6
bbunpack                                             391     383      -8
rtnl_tab_initialize                                  279     121    -158
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/8 up/down: 60/-196)          Total: -136 bytes

---
 networking/libiproute/rt_names.c | 44 ++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

(limited to 'networking/libiproute/rt_names.c')

diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c
index b22df9c..1a2d52e 100644
--- a/networking/libiproute/rt_names.c
+++ b/networking/libiproute/rt_names.c
@@ -13,41 +13,27 @@
 #include "libbb.h"
 #include "rt_names.h"
 
+/* so far all callers have size == 256 */
+#define rtnl_tab_initialize(file, tab, size) rtnl_tab_initialize(file, tab)
+#define size 256
 static void rtnl_tab_initialize(const char *file, const char **tab, int size)
 {
-	char buf[512];
-	FILE *fp;
-
-	fp = fopen_for_read(file);
-	if (!fp)
+	char *token[2];
+	parser_t *parser = config_open2(file, fopen_for_read);
+	if (!parser)
 		return;
-	while (fgets(buf, sizeof(buf), fp)) {
-		char *p = buf;
-		int id;
-		char namebuf[512];
-
-		while (*p == ' ' || *p == '\t')
-			p++;
-		if (*p == '#' || *p == '\n' || *p == 0)
-			continue;
-		if (sscanf(p, "0x%x %s\n", &id, namebuf) != 2
-		 && sscanf(p, "0x%x %s #", &id, namebuf) != 2
-		 && sscanf(p, "%d %s\n", &id, namebuf) != 2
-		 && sscanf(p, "%d %s #", &id, namebuf) != 2
-		) {
-			bb_error_msg("database %s is corrupted at %s",
-				file, p);
-			return;
+	while (config_read(parser, token, 2, 2, "# \t", 0)) {
+		int id = bb_strtou(token[0], NULL, 0);
+		if (id < 0 || id > size) {
+			bb_error_msg("database %s is corrupted at line %d",
+				file, parser->lineno);
+			break;
 		}
-
-		if (id < 0 || id > size)
-			continue;
-
-		tab[id] = xstrdup(namebuf);
+		tab[id] = xstrdup(token[1]);
 	}
-	fclose(fp);
+	config_close(parser);
 }
-
+#undef size
 
 static const char **rtnl_rtprot_tab; /* [256] */
 
-- 
cgit v1.1