From 9c0338b1b4495457659157e1e9f47d422dcefc2e Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Wed, 14 May 2025 16:37:27 -0600 Subject: lib9p: Remove uses of printf --- build-aux/measurestack/app_plugins.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'build-aux/measurestack/app_plugins.py') diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 8009c0c..26eb66d 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -260,20 +260,12 @@ class Lib9PPlugin: lib9p_msgs: set[str] _CONFIG_9P_MAX_CONNS: int | None _CONFIG_9P_MAX_REQS: int | None - formatters: typing.Collection[BaseName] def __init__( self, arg_base_dir: str, arg_c_fnames: typing.Collection[str], - libmisc_plugin: LibMiscPlugin, ) -> None: - self.formatters = { - x.base() - for x in libmisc_plugin.objcalls["format"] - if str(x.base()).startswith("lib9p_") - } - # Find filenames ####################################################### def _is_config_h(fname: str) -> bool: @@ -347,7 +339,7 @@ class Lib9PPlugin: re_table_call = re.compile( r"\s*_lib9p_(?Pvalidate|unmarshal|marshal)\(.*(?P[RT])msg.*\);\s*" ) - re_print_call = re.compile(r".*lib9p_table_msg.*\.box_as_fmt_formatter\(.*") + re_print_call = re.compile(r".*lib9p_table_msg.*\.print\(.*") def indirect_callees( self, loc: str, line: str @@ -366,9 +358,7 @@ class Lib9PPlugin: ], True if self.re_print_call.fullmatch(line): # Functions for disabled protocol extensions will be missing. - return [ - QName(f"lib9p_msg_{msg}_format") for msg in self.lib9p_msgs - ], True + return [QName(f"fmt_print_{msg}") for msg in self.lib9p_msgs], True if "lib9p/srv.c:" in loc: if "srv->msglog(" in line: # Actual ROMs shouldn't set this, and so will be missing on rp2040 builds. -- cgit v1.2.3-2-g168b