<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/9de1a8aba763864875fff84f0dc9fa5c6005a83e">https://github.com/macports/macports-base/commit/9de1a8aba763864875fff84f0dc9fa5c6005a83e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9de1a8aba763864875fff84f0dc9fa5c6005a83e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jun 4 02:35:13 2020 +1000
<span style='display:block; white-space:pre;color:#404040;'> avoid extra sscanf call in libmachista test
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit c9bf288cffaa23d86f24bac4d81fe9f81b5d64bb)
</span>---
src/machista1.0/tests/libmachista-test.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/tests/libmachista-test.c b/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 337a29d7..527e415c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,23 +174,18 @@ static bool compare_to_otool_output(char *path, const macho_t *ref) {
</span> char lib_path[_POSIX_PATH_MAX];
char lib_comp_version[256];
char lib_curr_version[256];
<span style='display:block; white-space:pre;background:#ffe0e0;'>- char lib_curr_version_tmp[256];
</span>
// read loadcommand output line from otool
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (3 != fscanf(tmpf, "%*[\n]%*[\t]%255s (compatibility version %255[^,], current version %255[^)]))", lib_path, lib_comp_version, lib_curr_version_tmp)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (3 != fscanf(tmpf, "%*[\n]%*[\t]%255s (compatibility version %255[^,], current version %255[^),]%*[^\n]", lib_path, lib_comp_version, lib_curr_version)) {
</span> // error out silently, probably been the last line
break;
}
nullterminate(lib_path);
nullterminate(lib_comp_version);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- nullterminate(lib_curr_version_tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nullterminate(lib_curr_version);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- //printf("\t\t%s, %s, %s\n", lib_path, lib_comp_version, lib_curr_version_tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Remove any extra after version (e.g. ', reexport' in 10.15)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sscanf(lib_curr_version_tmp, "%255[^,]", lib_curr_version);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullterminate(lib_comp_version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //printf("\t\t%s, %s, %s\n", lib_path, lib_comp_version, lib_curr_version);
</span>
// try to find the library in this architecture's list of loadcommands
macho_loadcmd_t *mlt;
</pre><pre style='margin:0'>
</pre>