INN commit: trunk/lib (dbz.c)

INN Commit rra at isc.org
Wed Sep 2 12:23:29 UTC 2015


    Date: Wednesday, September 2, 2015 @ 05:23:29
  Author: iulius
Revision: 9935

Explicitly say that the dbz config file is the .dir history file

Thanks to Bernard Higonnet for the report.

see #138

Modified:
  trunk/lib/dbz.c

-------+
 dbz.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: dbz.c
===================================================================
--- dbz.c	2015-08-28 19:28:56 UTC (rev 9934)
+++ dbz.c	2015-09-02 12:23:29 UTC (rev 9935)
@@ -1147,7 +1147,8 @@
 		&cp->valuesize, &cp->fillpercent, &cp->tagenb,
 		&cp->tagmask, &cp->tagshift, &cp->dropbits);
     if (i != 7) {
-	warn("dbz: bad first line in config");
+	warn("dbz: bad first line in .dir history file");
+    warn("dbz: you should consider running makedbz manually");
 	return false;
     }
     if (cp->valuesize != sizeof(of_t)) {
@@ -1169,7 +1170,7 @@
     i = fscanf(df, "dbz 6 %ld %d %d\n", &cp->tsize,
 		&cp->valuesize, &cp->fillpercent);
     if (i != 3) {
-        warn("dbz: bad first line in config");
+        warn("dbz: bad first line in .dir history file");
 	return false;
     }
     if (cp->valuesize != (sizeof(of_t) + sizeof(erec))) {
@@ -1182,7 +1183,7 @@
     /* second line, the usages */
     for (i = 0; i < NUSEDS; i++)
 	if (!fscanf(df, "%ld", &cp->used[i])) {
-            warn("dbz: bad usage value in config");
+            warn("dbz: bad usage value in .dir history file");
 	    return false;
 	}
     debug("used %ld %ld %ld...", cp->used[0], cp->used[1], cp->used[2]);
@@ -1191,7 +1192,7 @@
     /* third line, the text usages */
     for (i = 0; i < NUSEDS; i++)
 	if (!fscanf(df, "%ld", &cp->vused[i])) {
-            warn("dbz: bad text usage value in config");
+            warn("dbz: bad text usage value in .dir history file");
 	    return false;
 	}
     debug("vused %ld %ld %ld...", cp->vused[0], cp->vused[1], cp->vused[2]);



More information about the inn-committers mailing list