[master] 3c5b6ec Drop deprecated 'a' and 'i' counter formats from table definition

[Martin Blix Grydeland]

commit 3c5b6ec33bcabfd6d387cecc16c7c9e4e6663d6a
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Fri Jan 16 13:49:04 2015 +0100

    Drop deprecated 'a' and 'i' counter formats from table definition

diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 63b2e54..27ef250 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -180,7 +180,7 @@ do_once_cb(void *priv, const struct VSC_point * const pt)
 	if (i >= op->pad)
 		op->pad = i + 1;
 	printf("%*.*s", op->pad - i, op->pad - i, "");
-	if (pt->desc->flag == 'a' || pt->desc->flag == 'c')
+	if (pt->desc->flag == 'c')
 		printf("%12ju %12.2f %s\n",
 		    (uintmax_t)val, val / op->up, pt->desc->sdesc);
 	else
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index 559e89e..b99ff53 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -317,10 +317,6 @@ build_pt_list_cb(void *priv, const struct VSC_point *vpt)
 	pt->ptr = vpt->ptr;
 	pt->last = *pt->ptr;
 	pt->flag = vpt->desc->flag;
-	if (pt->flag == 'a')
-		pt->flag = 'c';
-	if (pt->flag == 'i')
-		pt->flag = 'g';
 
 	pt->ma_10.nmax = 10;
 	pt->ma_100.nmax = 100;
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 77b3b71..f6c0bc2 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -34,11 +34,9 @@
  *    t - Type:		C-type, uint64_t, unless marked in 'f'
  *    l - Local:	Local counter in worker thread.
  *    f - Format:	Semantics of the value in this field
- *				'a' - Accumulator (deprecated, use 'c')
  *				'b' - Bitmap
  *				'c' - Counter, never decreases.
  *				'g' - Gauge, goes up and down
- *				'i' - Integer (deprecated, use 'g')
  *    v - Verbosity:	Counter verbosity level (see vsc_levels.h)
  *    e - Explanation:	Short explanation of field (for screen use)
  *    d - Description:	Long explanation of field (for doc use)