autoconf: Enhance the --enable-instrument-functions result output

It prints now, by default, also the static functions names.

To configure the printing of only the global functions names, as before:
$ make instrument_global

To go back to print all the functions names:
$ make instrument_all

In case of truncation, the indentation level is reset to its previous
level in pretty_print_packet().

[skip ci]

1 files changed, 8 insertions, 2 deletions

diff --git a/print.c b/print.c
index be487f66..b1c81dd6 100644
--- a/print.c
+++ b/print.c
@@ -310,6 +310,7 @@ get_if_printer(int type)
 
 #ifdef ENABLE_INSTRUMENT_FUNCTIONS
 extern int profile_func_level;
+static int pretty_print_packet_level = -1;
 #endif
 
 void
@@ -322,6 +323,11 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	if (ndo->ndo_print_sampling && packets_captured % ndo->ndo_print_sampling != 0)
 		return;
 
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+	if (pretty_print_packet_level == -1)
+		pretty_print_packet_level = profile_func_level;
+#endif
+
 	if (ndo->ndo_packet_number)
 		ND_PRINT("%5u  ", packets_captured);
 
@@ -411,8 +417,8 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 		/* Print the full packet */
 		ndo->ndo_ll_hdr_len = 0;
 #ifdef ENABLE_INSTRUMENT_FUNCTIONS
-		/* truncation => reassignment, currently: 1 (main is 0) */
-		profile_func_level = 1;
+		/* truncation => reassignment */
+		profile_func_level = pretty_print_packet_level;
 #endif
 		break;
 	}