[dm-devel] device-mapper ./WHATS_NEW lib/libdm-report.c

[agk at sourceware.org]

CVSROOT:	/cvs/dm
Module name:	device-mapper
Changes by:	agk at sourceware.org	2007-01-18 22:15:04

Modified files:
	.              : WHATS_NEW 
	lib            : libdm-report.c 

Log message:
	Suppress 'Unrecognised field' error if report field is 'help'.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/WHATS_NEW.diff?cvsroot=dm&r1=1.152&r2=1.153
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/lib/libdm-report.c.diff?cvsroot=dm&r1=1.4&r2=1.5

--- device-mapper/WHATS_NEW	2007/01/18 17:47:56	1.152
+++ device-mapper/WHATS_NEW	2007/01/18 22:15:04	1.153
@@ -1,5 +1,6 @@
 Version 1.02.16 -
 ===================================
+  Suppress 'Unrecognised field' error if report field is 'help'.
   Add --separator and --sort to dmsetup (unused).
   Make alignment flag optional when specifying report fields.
 
--- device-mapper/lib/libdm-report.c	2007/01/18 21:59:02	1.4
+++ device-mapper/lib/libdm-report.c	2007/01/18 22:15:04	1.5
@@ -416,8 +416,9 @@
 		if (!_field_match(rh, ws, (size_t) (we - ws))) {
 			_display_fields(rh);
 			log_print(" ");
-			log_error("dm_report: Unrecognised field: %.*s",
-				  (int) (we - ws), ws);
+			if (strcasecmp(ws, "help") && strcmp(ws, "?"))
+				log_error("Unrecognised field: %.*s",
+					  (int) (we - ws), ws);
 			return 0;
 		}
 	}