diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b02cf1c157..b39c2c51e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -593,13 +593,17 @@ jobs: tar -xvf r2-static-latest.tar.xz -C r2-static-latest --strip-components=1 - name: ABI compatibility check run: | - echo '[suppress_function]' > abidiff.conf - echo 'name_regexp = ^r_bin_java.*' >> abidiff.conf - echo 'name_not_regexp = ^r_.*' >> abidiff.conf - echo '[suppress_variable]' >> abidiff.conf - echo 'name_not_regexp = ^r_.*' >> abidiff.conf + A=abidiff.conf + echo '[suppress_function]' > $A + echo 'name_regexp = .*java.*' >> $A + echo '[suppress_function]' >> $A + echo 'name_not_regexp = ^r_.*' >> $A + echo '[suppress_function]' >> $A + echo 'name_regexp = r_bin_add_import' >> $A + echo '[suppress_variable]' >> $A + echo 'name_not_regexp = ^r_.*' >> $A for lib in r2-static-latest/usr/lib/libr_*.so; do - echo $lib ; abidiff --suppr abidiff.conf ${lib} r2-static/usr/lib/$(basename ${lib}); + echo $lib ; abidiff --suppr $A ${lib} r2-static/usr/lib/$(basename ${lib}); done diff --git a/shlr/java/class.c b/shlr/java/class.c index 2062a5f49c..c3d7571a6b 100644 --- a/shlr/java/class.c +++ b/shlr/java/class.c @@ -2934,7 +2934,7 @@ R_API RList *U(r_bin_java_get_fields)(RBinJavaObj * bin) { return fields; } -R_API void r_bin_add_import(RBinJavaObj *bin, RBinJavaCPTypeObj *obj, const char *type) { +static void add_import(RBinJavaObj *bin, RBinJavaCPTypeObj *obj, const char *type) { RBinImport *imp = R_NEW0 (RBinImport); char *class_name = r_bin_java_get_name_from_bin_cp_list (bin, obj->info.cp_method.class_idx); char *name = r_bin_java_get_name_from_bin_cp_list (bin, obj->info.cp_method.name_and_type_idx); @@ -2965,7 +2965,7 @@ R_API void r_bin_java_set_imports(RBinJavaObj *bin) { default: type = NULL; break; } if (type) { - r_bin_add_import (bin, obj, type); + add_import (bin, obj, type); } } }