[Ltrace-devel] r57 - in ltrace/trunk: . etc

[Ian Wienand]

Author: ianw-guest
Date: 2006-08-07 02:37:33 +0000 (Mon, 07 Aug 2006)
New Revision: 57

Modified:
   ltrace/trunk/ChangeLog
   ltrace/trunk/display_args.c
   ltrace/trunk/etc/ltrace.conf
   ltrace/trunk/ltrace.h
   ltrace/trunk/read_config_file.c
Log:
implement ignored arguments


Modified: ltrace/trunk/ChangeLog
===================================================================
--- ltrace/trunk/ChangeLog	2006-08-07 02:29:06 UTC (rev 56)
+++ ltrace/trunk/ChangeLog	2006-08-07 02:37:33 UTC (rev 57)
@@ -1,6 +1,11 @@
 2006-08-07  Steve Fink <sphink at gmail.com>
 
 	* display_args.c, etc/ltrace.conf, ltrace.h, read_config_file.c:
+	implement ignored arguments
+
+2006-08-07  Steve Fink <sphink at gmail.com>
+
+	* display_args.c, etc/ltrace.conf, ltrace.h, read_config_file.c:
 	implement string[argN] and string[N] parameter descriptors
 
 2006-08-07  Steve Fink <sphink at gmail.com>

Modified: ltrace/trunk/display_args.c
===================================================================
--- ltrace/trunk/display_args.c	2006-08-07 02:29:06 UTC (rev 56)
+++ ltrace/trunk/display_args.c	2006-08-07 02:37:33 UTC (rev 57)
@@ -36,6 +36,8 @@
 	switch (info->type) {
 	case ARGTYPE_VOID:
 		return 0;
+        case ARGTYPE_IGNORE:
+        	return 0; /* Empty gap between commas */
 	case ARGTYPE_INT:
 		return fprintf(output, "%d",
 			       (int)gimme_arg(type, proc, arg_num));

Modified: ltrace/trunk/etc/ltrace.conf
===================================================================
--- ltrace/trunk/etc/ltrace.conf	2006-08-07 02:29:06 UTC (rev 56)
+++ ltrace/trunk/etc/ltrace.conf	2006-08-07 02:37:33 UTC (rev 57)
@@ -22,6 +22,7 @@
 ; string[retval] == (char *)			[show only up to (return val) bytes]
 ; string[arg0]	== (char *)			[same as string[retval]]
 ; string[N]     == (char *)             [N>0]   [show only up to N bytes]
+; ignore	== (any)			[ignore arg, output blank]
 
 ; Backwards-compatibility:
 ; string0	== (char *)			[same as string[retval]]

Modified: ltrace/trunk/ltrace.h
===================================================================
--- ltrace/trunk/ltrace.h	2006-08-07 02:29:06 UTC (rev 56)
+++ ltrace/trunk/ltrace.h	2006-08-07 02:37:33 UTC (rev 57)
@@ -42,6 +42,7 @@
 	ARGTYPE_FORMAT,		/* printf-like format */
 	ARGTYPE_STRING,		/* NUL-terminated string */
 	ARGTYPE_STRING_N,	/* String of known maxlen */
+        ARGTYPE_IGNORE,		/* Leave parameter blank */
         ARGTYPE_COUNT		/* number of ARGTYPE_* values */
 };
 

Modified: ltrace/trunk/read_config_file.c
===================================================================
--- ltrace/trunk/read_config_file.c	2006-08-07 02:29:06 UTC (rev 56)
+++ ltrace/trunk/read_config_file.c	2006-08-07 02:37:33 UTC (rev 57)
@@ -29,6 +29,7 @@
 	"file", ARGTYPE_FILE}, {
 	"format", ARGTYPE_FORMAT}, {
 	"string", ARGTYPE_STRING}, {
+	"ignore", ARGTYPE_IGNORE}, {
 	NULL, ARGTYPE_UNKNOWN}	/* Must finish with NULL */
 };
 
@@ -45,6 +46,7 @@
 	{ ARGTYPE_FORMAT },
 	{ ARGTYPE_STRING },
 	{ ARGTYPE_STRING_N },
+	{ ARGTYPE_IGNORE },
 	{ ARGTYPE_UNKNOWN }
 };