update fake packages with function expecting any number of arguments (reduce perl_checker SNR)

9 files changed, 103 insertions, 93 deletions

diff --git a/fake_packages/Curses/UI.pm b/fake_packages/Curses/UI.pm
index 72cc81f..85dc1cc 100644
--- a/fake_packages/Curses/UI.pm
+++ b/fake_packages/Curses/UI.pm
@@ -1,7 +1,7 @@
 
 package Curses::UI;
 our @ISA = qw();
-sub add { my ($_o_args) = @_ }
+sub add { my (@_more_paras) = @_ }
 sub add() {}
 sub add_callback() {}
 sub calendardialog() {}
@@ -35,13 +35,13 @@ sub leave_curses() {}
 sub loadfilebrowser() {}
 sub mainloop { my ($_o_self) = @_ }
 sub mainloopExit() {}
-sub new { my ($_class, $_o_userargs) = @_ }
+sub new { my ($_class, @_more_paras) = @_ }
 sub noprogress() {}
 sub nostatus() {}
 sub object_at_xy($$;$) {}
 sub overlapping(;$) {}
 sub process_args() {}
-sub progress { my ($_o_args) = @_ }
+sub progress { my (@_more_paras) = @_ }
 sub progress() {}
 sub question() {}
 sub reset_curses() {}
@@ -52,7 +52,7 @@ sub set_read_timeout() {}
 sub set_timer($$;) {}
 sub setprogress($;$) {}
 sub status($;) {}
-sub tempdialog { my ($_o_args) = @_ }
+sub tempdialog { my (@_more_paras) = @_ }
 sub tempdialog() {}
 sub usemodule($;) {}
 sub userdata() {}
@@ -67,7 +67,7 @@ sub get() {}
 sub get_selected_button() {}
 sub layout() {}
 sub mouse_button1($$$$;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub next_button() {}
 sub press_button() {}
 sub previous_button() {}
@@ -100,7 +100,7 @@ sub layout() {}
 sub make_sane_date() {}
 sub month($;) {}
 sub mouse_button($$$$;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub onChange(;$) {}
 sub setdate($;$) {}
 sub year($;) {}
@@ -113,7 +113,7 @@ sub event_onblur() {}
 sub get() {}
 sub layout() {}
 sub mouse_button1($$$$;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub onChange(;$) {}
 sub toggle() {}
 sub uncheck() {}
@@ -124,7 +124,7 @@ sub colors() {}
 sub define_color { my ($_r, $_g, $_o_b) = @_ }
 sub get_color_pair() {}
 sub get_colors() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::Common;
 our @ISA = qw();
@@ -151,7 +151,7 @@ sub text_wrap($$;) { my ($_line, $_maxlen, $_o_wordwrap) = @_ }
 
 package Curses::UI::Container;
 our @ISA = qw();
-sub add($@) { my ($_o_args) = @_ }
+sub add($@) { my (@_more_paras) = @_ }
 sub base_id2idx($;) {}
 sub delete(;$) {}
 sub delete_subwindows() {}
@@ -169,10 +169,10 @@ sub getobj($;) {}
 sub hasa($;) {}
 sub layout() {}
 sub layout_contained_objects() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub new() {}
-sub set_draworder(@) { my ($_o_order) = @_ }
-sub set_focusorder(@) { my ($_o_order) = @_ }
+sub set_draworder(@) { my (@_more_paras) = @_ }
+sub set_focusorder(@) { my (@_more_paras) = @_ }
 sub window_is_ontop($;) {}
 
 package Curses::UI::ContainerWidget;
@@ -183,13 +183,13 @@ package Curses::UI::Dialog::Basic;
 our @ISA = qw();
 sub get() {}
 sub layout() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::Dialog::Calendar;
 our @ISA = qw();
 sub get() {}
 sub layout() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub press_button_callback() {}
 
 package Curses::UI::Dialog::Dirbrowser;
@@ -201,14 +201,14 @@ sub get_dir() {}
 sub goto_homedirectory() {}
 sub layout() {}
 sub maskbox_onchange() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub press_button_callback() {}
 sub select_homedirectory() {}
 
 package Curses::UI::Dialog::Error;
 our @ISA = qw();
 sub draw(;$) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::Dialog::Filebrowser;
 our @ISA = qw();
@@ -220,7 +220,7 @@ sub get_dir() {}
 sub goto_homedirectory() {}
 sub layout() {}
 sub maskbox_onchange() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub press_button_callback() {}
 sub select_homedirectory() {}
 
@@ -229,21 +229,21 @@ our @ISA = qw();
 sub focus() {}
 sub layout() {}
 sub message() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub pos($;) {}
 
 package Curses::UI::Dialog::Question;
 our @ISA = qw();
 sub get() {}
 sub layout() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::Dialog::Status;
 our @ISA = qw();
 sub focus() {}
 sub layout() {}
 sub message($;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::Label;
 our @ISA = qw();
@@ -254,7 +254,7 @@ sub dim() {}
 sub draw(;$) {}
 sub get() {}
 sub layout() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub reverse() {}
 sub set_attribute($$;) {}
 sub text($;$) {}
@@ -285,9 +285,9 @@ sub insert_at() {}
 sub labels(;$) {}
 sub layout() {}
 sub layout_content() {}
-sub maxlabelwidth(@) { my ($_o_args) = @_ }
+sub maxlabelwidth(@) { my (@_more_paras) = @_ }
 sub mouse_button1($$$;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub number_of_lines() {}
 sub onChange(;$) {}
 sub onSelectionChange(;$) {}
@@ -312,7 +312,7 @@ sub cursor_left() {}
 sub cursor_right() {}
 sub escape_key() {}
 sub mouse_button1() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub new() {}
 sub option_select() {}
 
@@ -328,14 +328,14 @@ sub menu_left() {}
 sub menu_right() {}
 sub menuoption_selected() {}
 sub mouse_button1() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub pulldown() {}
 
 package Curses::UI::Notebook;
 our @ISA = qw();
 sub activate_page($$) {}
 sub active_page($) {}
-sub add_page($$;) { my ($_o_userargs) = @_ }
+sub add_page($$;) { my (@_more_paras) = @_ }
 sub debug_msg(;$) {}
 sub delete_page($$) {}
 sub draw($;$) {}
@@ -344,13 +344,13 @@ sub intellidraw(;$) {}
 sub last_page($) {}
 sub layout($) {}
 sub mouse_button1($$$$) {}
-sub new($;) { my ($_o_userargs) = @_ }
+sub new($;) { my (@_more_paras) = @_ }
 sub next_page($) {}
 sub prev_page($) {}
 
 package Curses::UI::PasswordEntry;
 our @ISA = qw();
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::Popupmenu;
 our @ISA = qw();
@@ -358,7 +358,7 @@ sub draw(;$) {}
 sub get() {}
 sub layout() {}
 sub mouse_button1($$$;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub onChange(;$) {}
 sub open_popup() {}
 sub select_next() {}
@@ -373,19 +373,19 @@ package Curses::UI::Progressbar;
 our @ISA = qw();
 sub draw(;$) {}
 sub get() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub pos(;$) {}
 
 package Curses::UI::Radiobuttonbox;
 our @ISA = qw();
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::SearchEntry;
 our @ISA = qw();
 sub entry_loose_focus() {}
 sub event_keypress($;) {}
 sub get() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub new() {}
 sub pos(;$) {}
 sub prompt(;$) {}
@@ -434,7 +434,7 @@ sub getrealxpos() {}
 sub layout() {}
 sub layout_content() {}
 sub mouse_button1($$$$;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub newline() {}
 sub number_of_columns() {}
 sub number_of_lines() {}
@@ -456,11 +456,11 @@ sub undo() {}
 
 package Curses::UI::TextEntry;
 our @ISA = qw();
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::TextViewer;
 our @ISA = qw();
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 
 package Curses::UI::Widget;
 our @ISA = qw();
@@ -474,7 +474,7 @@ sub canvaswidth() {}
 sub clear_binding($;) {}
 sub clear_event($;) {}
 sub delete_subwindows() {}
-sub do_routine($;$) { my ($_o_arguments) = @_ }
+sub do_routine($;$) { my (@_more_paras) = @_ }
 sub dobeep() {}
 sub draw(;$) {}
 sub draw_scrollbars() {}
@@ -485,7 +485,7 @@ sub event_onfocus() {}
 sub focus() {}
 sub focusable(;$) {}
 sub height() {}
-sub height_by_windowscrheight($@) { my ($_o_args) = @_ }
+sub height_by_windowscrheight($@) { my (@_more_paras) = @_ }
 sub hidden() {}
 sub hide() {}
 sub in_topwindow() {}
@@ -495,15 +495,15 @@ sub loose_focus() {}
 sub lose_focus() {}
 sub modalfocus() {}
 sub mouse_button1($$$$;) {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
 sub onBlur($;$) {}
 sub onFocus($;$) {}
 sub parentwindow() {}
-sub process_bindings($;$@) { my ($_o_extra) = @_ }
+sub process_bindings($;$@) { my (@_more_paras) = @_ }
 sub process_padding($;) {}
 sub run_event($;) {}
 sub schedule_draw(;$) {}
-sub set_binding($@) { my ($_o_keys) = @_ }
+sub set_binding($@) { my (@_more_paras) = @_ }
 sub set_color_bbg() {}
 sub set_color_bfg() {}
 sub set_color_bg() {}
@@ -513,16 +513,16 @@ sub set_color_sfg() {}
 sub set_color_tbg() {}
 sub set_color_tfg() {}
 sub set_event($;$) {}
-sub set_mouse_binding($@) { my ($_o_mouse_events) = @_ }
+sub set_mouse_binding($@) { my (@_more_paras) = @_ }
 sub set_routine($$;) {}
 sub show() {}
 sub title() {}
 sub userdata() {}
 sub width() {}
-sub width_by_windowscrwidth($@) { my ($_o_args) = @_ }
+sub width_by_windowscrwidth($@) { my (@_more_paras) = @_ }
 sub windowparameters() {}
 
 package Curses::UI::Window;
 our @ISA = qw();
 sub layout() {}
-sub new { my ($_o_userargs) = @_ }
+sub new { my (@_more_paras) = @_ }
diff --git a/fake_packages/Getopt/Long.pm b/fake_packages/Getopt/Long.pm
index dad875e..a8a14ac 100644
--- a/fake_packages/Getopt/Long.pm
+++ b/fake_packages/Getopt/Long.pm
@@ -2,10 +2,10 @@
 package Getopt::Long;
 our @ISA = qw();
 sub ConfigDefaults() {}
-sub Configure { my ($_o_options) = @_ }
+sub Configure { my (@_more_paras) = @_ }
 sub FindOption { my ($_argv, $_prefix, $_argend, $_opt, $_o_opctl) = @_ }
 sub GetOptions(@) {}
-sub GetOptionsFromArray(@) { my ($_argv, $_o_optionlist) = @_ }
+sub GetOptionsFromArray(@) { my ($_argv, @_more_paras) = @_ }
 sub GetOptionsFromString(@) {}
 sub HelpMessage(@) {}
 sub OptCtl { my ($_o_v) = @_ }
@@ -20,10 +20,10 @@ sub setup_pa_args($@) {}
 package Getopt::Long::CallBack;
 our @ISA = qw();
 sub name() {}
-sub new { my ($_pkg, $_o_atts) = @_ }
+sub new { my ($_pkg, @_more_paras) = @_ }
 
 package Getopt::Long::Parser;
 our @ISA = qw();
 sub configure() {}
 sub getoptions() {}
-sub new { my ($_o_atts) = @_ }
+sub new { my (@_more_paras) = @_ }
diff --git a/fake_packages/Glib.pm b/fake_packages/Glib.pm
index dc3218e..9f972a5 100644
--- a/fake_packages/Glib.pm
+++ b/fake_packages/Glib.pm
@@ -134,9 +134,9 @@ sub Glib::Flags::xor { my ($_a, $_b, $_swap) = @_ }
 package Glib::GenPod;
 our @ISA = qw();
 sub _pod_escape { my ($_o_str) = @_ }
-sub _podify_pspecs { my ($_package, $_o_properties) = @_ }
+sub _podify_pspecs { my ($_package, @_more_paras) = @_ }
 sub _pspec_formatted_default { my ($_o_pspec) = @_ }
-sub add_types { my ($_o_files) = @_ }
+sub add_types { my (@_more_paras) = @_ }
 sub compile_signature() {}
 sub convert_arg_type() {}
 sub convert_return_type_to_name() {}
@@ -147,13 +147,13 @@ sub get_copyright() {}
 sub mkdir_p() {}
 sub podify_ancestors() {}
 sub podify_child_properties() {}
-sub podify_deprecated_by { my ($_o_deprecated_by) = @_ }
+sub podify_deprecated_by { my (@_more_paras) = @_ }
 sub podify_enums_and_flags() {}
 sub podify_interfaces() {}
 sub podify_methods() {}
 sub podify_pods() {}
 sub podify_properties() {}
-sub podify_see_alsos { my ($_o_entries) = @_ }
+sub podify_see_alsos { my (@_more_paras) = @_ }
 sub podify_signals() {}
 sub podify_style_properties() {}
 sub podify_values() {}
@@ -246,11 +246,11 @@ sub run { my ($_loop) = @_ }
 package Glib::MakeHelper;
 our @ISA = qw();
 sub do_pod_files() {}
-sub get_configure_requires_yaml { my ($_o_prereqs) = @_ }
+sub get_configure_requires_yaml { my (@_more_paras) = @_ }
 sub postamble_clean() {}
-sub postamble_docs { my ($_class, $_o_xs_files) = @_ }
-sub postamble_docs_full { my ($_o_params) = @_ }
-sub postamble_precompiled_headers { my ($_o_headers) = @_ }
+sub postamble_docs { my ($_class, @_more_paras) = @_ }
+sub postamble_docs_full { my (@_more_paras) = @_ }
+sub postamble_precompiled_headers { my (@_more_paras) = @_ }
 sub postamble_rpms() {}
 sub read_source_list_file { my ($_class, $_o_filename) = @_ }
 sub select_files_by_version { my ($_class, $_stem, $_major, $_o_minor) = @_ }
@@ -313,7 +313,7 @@ sub STORE() {}
 
 package Glib::Object::Subclass;
 our @ISA = qw();
-sub import { my ($_self, $_superclass, $_o_arg) = @_ }
+sub import { my ($_self, $_superclass, @_more_paras) = @_ }
 
 package Glib::Object::_LazyLoader;
 our @ISA = qw();
@@ -451,14 +451,14 @@ sub is_module_line() {}
 sub new() {}
 sub package() {}
 sub parse_file() {}
-sub parse_xsub { my ($_self, $_o_thisxsub) = @_ }
+sub parse_xsub { my ($_self, @_more_paras) = @_ }
 sub pkgdata() {}
 sub preprocess_pods() {}
 sub sanitize_type() {}
 sub slurp_pod_paragraph() {}
 sub split_aliases() {}
 sub swizzle_pods() {}
-sub xsdocparse { my ($_o_filenames) = @_ }
+sub xsdocparse { my (@_more_paras) = @_ }
 
 package Glib::Source;
 our @ISA = qw();
diff --git a/fake_packages/Gtk2.pm b/fake_packages/Gtk2.pm
index a2992ea..53305b2 100644
--- a/fake_packages/Gtk2.pm
+++ b/fake_packages/Gtk2.pm
@@ -15,7 +15,6 @@ sub disable_setlocale { my ($_class) = @_ }
 sub dl_load_flags() {}
 sub draw_insertion_cursor { my ($_class, $_widget, $_drawable, $_area, $_location, $_is_primary, $_direction, $_draw_arrow) = @_ }
 sub events_pending { my ($_class) = @_ }
-sub exit { my ($_error_code) = @_ }
 sub get_current_event { my ($_class) = @_ }
 sub get_current_event_state { my ($_class) = @_ }
 sub get_current_event_time { my ($_class) = @_ }
@@ -3192,7 +3191,7 @@ sub FETCHSIZE() {}
 sub POP() {}
 sub PUSH() {}
 sub SHIFT() {}
-sub SPLICE { my ($_o_list) = @_ }
+sub SPLICE { my (@_more_paras) = @_ }
 sub STORE() {}
 sub STORESIZE() {}
 sub TIEARRAY() {}
diff --git a/fake_packages/Gtk2/Html2.pm b/fake_packages/Gtk2/Html2.pm
index 81be0c7..7961649 100644
--- a/fake_packages/Gtk2/Html2.pm
+++ b/fake_packages/Gtk2/Html2.pm
@@ -1,4 +1,8 @@
 
+package Gtk2::Html2;
+our @ISA = qw();
+sub dl_load_flags() {}
+
 package Gtk2::Html2::Context;
 our @ISA = qw();
 sub get { my ($_class) = @_ }
diff --git a/fake_packages/Gtk2/NotificationBubble.pm b/fake_packages/Gtk2/NotificationBubble.pm
index 4977c6c..cb0fd16 100644
--- a/fake_packages/Gtk2/NotificationBubble.pm
+++ b/fake_packages/Gtk2/NotificationBubble.pm
@@ -2,6 +2,7 @@
 package Gtk2::NotificationBubble;
 our @ISA = qw();
 sub attach { my ($_bubble, $_widget) = @_ }
+sub dl_load_flags() {}
 sub force_window { my ($_bubble) = @_ }
 sub hide { my ($_bubble) = @_ }
 sub new { my ($_class) = @_ }
diff --git a/fake_packages/Gtk2/Notify.pm b/fake_packages/Gtk2/Notify.pm
index 8dfe2bf..ce5a3a8 100644
--- a/fake_packages/Gtk2/Notify.pm
+++ b/fake_packages/Gtk2/Notify.pm
@@ -7,9 +7,11 @@ sub attach_to_widget { my ($_notification, $_attach) = @_ }
 sub clear_actions { my ($_notification) = @_ }
 sub clear_hints { my ($_notification) = @_ }
 sub close { my ($_notification) = @_ }
+sub dl_load_flags() {}
 sub get_app_name { my ($_class) = @_ }
 sub get_server_caps { my ($_class) = @_ }
 sub get_server_info { my ($_class) = @_ }
+sub import() {}
 sub init { my ($_class, $_app_name) = @_ }
 sub is_initted { my ($_class) = @_ }
 sub new { my ($_class, $_summary, $_o_body, $_o_icon, $_o_attach) = @_ }
diff --git a/fake_packages/Gtk2/Sexy.pm b/fake_packages/Gtk2/Sexy.pm
index daa40fd..2d70c32 100644
--- a/fake_packages/Gtk2/Sexy.pm
+++ b/fake_packages/Gtk2/Sexy.pm
@@ -1,4 +1,8 @@
 
+package Gtk2::Sexy;
+our @ISA = qw();
+sub dl_load_flags() {}
+
 package Gtk2::Sexy::IconEntry;
 our @ISA = qw();
 sub add_clear_button { my ($_entry) = @_ }
diff --git a/fake_packages/URPM.pm b/fake_packages/URPM.pm
index 4a88fbd..29e9ab5 100644
--- a/fake_packages/URPM.pm
+++ b/fake_packages/URPM.pm
@@ -3,10 +3,10 @@ package URPM;
 our @ISA = qw();
 sub _add_group { my ($_groups, $_o_group) = @_ }
 sub _add_rejected_backtrack { my ($_state, $_pkg, $_o_backtrack) = @_ }
-sub _choose_best_pkg { my ($_urpm, $_pkg_installed, $_o_pkgs) = @_ }
-sub _choose_best_pkg_ { my ($_urpm, $_pkg_installed, $_o_pkgs) = @_ }
-sub _choose_bests_obsolete { my ($_urpm, $_db, $_pkg_installed, $_o_pkgs) = @_ }
-sub _choose_required { my ($_urpm, $_db, $_state, $_dep, $_properties, $_choices, $_diff_provides, $_o_options) = @_ }
+sub _choose_best_pkg { my ($_urpm, $_pkg_installed, @_more_paras) = @_ }
+sub _choose_best_pkg_ { my ($_urpm, $_pkg_installed, @_more_paras) = @_ }
+sub _choose_bests_obsolete { my ($_urpm, $_db, $_pkg_installed, @_more_paras) = @_ }
+sub _choose_required { my ($_urpm, $_db, $_state, $_dep, $_properties, $_choices, $_diff_provides, @_more_paras) = @_ }
 sub _compute_diff_provides_of_removed_pkg { my ($_urpm, $_state, $_diff_provides_h, $_o_p) = @_ }
 sub _dep_to_name { my ($_urpm, $_o_dep) = @_ }
 sub _find_packages_obsoleting { my ($_urpm, $_state, $_o_p) = @_ }
@@ -16,15 +16,15 @@ sub _find_required_package__sort { my ($_urpm, $_db, $_packages, $_o_provided_ve
 sub _get_tmp_dir() {}
 sub _handle_conflict { my ($_urpm, $_state, $_pkg, $_p, $_property, $_reason, $_properties, $_diff_provides_h, $_o_keep) = @_ }
 sub _handle_conflicts { my ($_urpm, $_db, $_state, $_pkg, $_properties, $_diff_provides_h, $_o_keep) = @_ }
-sub _handle_conflicts_with_selected { my ($_urpm, $_db, $_state, $_pkg, $_dep, $_properties, $_diff_provides, $_o_options) = @_ }
-sub _handle_diff_provides { my ($_urpm, $_db, $_state, $_properties, $_diff_provides, $_n, $_pkg, $_o_options) = @_ }
+sub _handle_conflicts_with_selected { my ($_urpm, $_db, $_state, $_pkg, $_dep, $_properties, $_diff_provides, @_more_paras) = @_ }
+sub _handle_diff_provides { my ($_urpm, $_db, $_state, $_properties, $_diff_provides, $_n, $_pkg, @_more_paras) = @_ }
 sub _id_to_name { my ($_urpm, $_o_id_prop) = @_ }
 sub _ids_to_fullnames() {}
 sub _ids_to_names() {}
 sub _is_selected_or_installed { my ($_urpm, $_db, $_o_name) = @_ }
 sub _merge_2_groups { my ($_groups, $_l1, $_o_l2) = @_ }
 sub _no_more_recent_installed_and_providing { my ($_urpm, $_db, $_state, $_pkg, $_o_required) = @_ }
-sub _parse_hdlist_or_synthesis { my ($_parse_func, $_urpm, $_file, $_o_options) = @_ }
+sub _parse_hdlist_or_synthesis { my ($_parse_func, $_urpm, $_file, @_more_paras) = @_ }
 sub _remove_all_rejected_from { my ($_state, $_o_from_fullname) = @_ }
 sub _remove_rejected_from { my ($_state, $_fullname, $_o_from_fullname) = @_ }
 sub _score_for_locales { my ($_urpm, $_db, $_o_pkg) = @_ }
@@ -39,22 +39,22 @@ sub _unselect_package_deprecated_by_property { my ($_urpm, $_db, $_state, $_pkg,
 sub add_macro { my ($_o_s) = @_ }
 sub add_macro_noexpand { my ($_macro) = @_ }
 sub archscore { my ($_arch) = @_ }
-sub backtrack_selected { my ($_urpm, $_db, $_state, $_dep, $_diff_provides, $_o_options) = @_ }
+sub backtrack_selected { my ($_urpm, $_db, $_state, $_dep, $_diff_provides, @_more_paras) = @_ }
 sub backtrack_selected_psel_keep { my ($_urpm, $_db, $_state, $_psel, $_o_keep) = @_ }
 sub bind_rpm_textdomain_codeset() {}
-sub build_base_files { my ($_urpm, $_o_options) = @_ }
-sub build_hdlist { my ($_urpm, $_o_options) = @_ }
+sub build_base_files { my ($_urpm, @_more_paras) = @_ }
+sub build_hdlist { my ($_urpm, @_more_paras) = @_ }
 sub build_listid { my ($_urpm, $_start, $_end, $_o_listid) = @_ }
-sub build_synthesis { my ($_urpm, $_o_options) = @_ }
-sub build_transaction_set { my ($_urpm, $_db, $_state, $_o_options) = @_ }
+sub build_synthesis { my ($_urpm, @_more_paras) = @_ }
+sub build_transaction_set { my ($_urpm, $_db, $_state, @_more_paras) = @_ }
 sub check_graph_is_sorted { my ($_sorted, $_nodes, $_o_edges) = @_ }
-sub compute_deps { my ($_urpm, $_o_options) = @_ }
-sub compute_flag { my ($_urpm, $_pkg, $_o_options) = @_ }
-sub compute_flags { my ($_urpm, $_val, $_o_options) = @_ }
+sub compute_deps { my ($_urpm, @_more_paras) = @_ }
+sub compute_flag { my ($_urpm, $_pkg, @_more_paras) = @_ }
+sub compute_flags { my ($_urpm, $_val, @_more_paras) = @_ }
 sub compute_installed_flags { my ($_urpm, $_o_db) = @_ }
 sub del_macro { my ($_name) = @_ }
-sub disable_selected { my ($_urpm, $_db, $_state, $_o_pkgs_todo) = @_ }
-sub disable_selected_and_unrequested_dependencies { my ($_urpm, $_db, $_state, $_o_pkgs_todo) = @_ }
+sub disable_selected { my ($_urpm, $_db, $_state, @_more_paras) = @_ }
+sub disable_selected_and_unrequested_dependencies { my ($_urpm, $_db, $_state, @_more_paras) = @_ }
 sub expand { my ($_name) = @_ }
 sub find(&@) {}
 sub find_candidate_packages { my ($_urpm, $_id_prop, $_o_o_rejected) = @_ }
@@ -69,11 +69,11 @@ sub import_pubkey { my (@_more_paras) = @_ }
 sub import_pubkey_file { my ($_db, $_filename) = @_ }
 sub is_package_installed { my ($_db, $_o_pkg) = @_ }
 sub list_rpm_tag { my ($_o_urpm) = @_ }
-sub listlength { my ($_o_l) = @_ }
+sub listlength { my (@_more_paras) = @_ }
 sub loadmacrosfile { my ($_filename) = @_ }
 sub make_delta_rpm() {}
 sub min() {}
-sub new { my ($_class, $_o_options) = @_ }
+sub new { my ($_class, @_more_paras) = @_ }
 sub osscore { my ($_os) = @_ }
 sub packages_by_name { my ($_urpm, $_o_name) = @_ }
 sub packages_obsoleting { my ($_urpm, $_o_name) = @_ }
@@ -81,11 +81,11 @@ sub packages_providing { my ($_urpm, $_o_name) = @_ }
 sub packages_to_remove { my ($_o_state) = @_ }
 sub parse_hdlist { my ($_urpm, $_filename, @_more_paras) = @_ }
 sub parse_hdlist__XS { my ($_urpm, $_filename, @_more_paras) = @_ }
-sub parse_headers { my ($_urpm, $_o_options) = @_ }
-sub parse_pubkeys { my ($_urpm, $_o_options) = @_ }
+sub parse_headers { my ($_urpm, @_more_paras) = @_ }
+sub parse_pubkeys { my ($_urpm, @_more_paras) = @_ }
 sub parse_pubkeys_ { my ($_o_db) = @_ }
 sub parse_rpm { my ($_urpm, $_filename, @_more_paras) = @_ }
-sub parse_rpms_build_headers { my ($_urpm, $_o_options) = @_ }
+sub parse_rpms_build_headers { my ($_urpm, @_more_paras) = @_ }
 sub parse_synthesis { my ($_urpm, $_filename, @_more_paras) = @_ }
 sub parse_synthesis__XS { my ($_urpm, $_filename, @_more_paras) = @_ }
 sub pkg2media { my ($_mediums, $_o_p) = @_ }
@@ -98,39 +98,39 @@ sub query_pkg { my ($_undef, $_pkg, $_o_query) = @_ }
 sub ranges_overlap { my ($_a, $_b, $_o_b_nopromote) = @_ }
 sub read_config_files() {}
 sub removed_or_obsoleted_packages { my ($_o_state) = @_ }
-sub request_packages_to_upgrade { my ($_urpm, $_db, $_state, $_requested, $_o_options) = @_ }
+sub request_packages_to_upgrade { my ($_urpm, $_db, $_state, $_requested, @_more_paras) = @_ }
 sub resetmacros() {}
-sub resolve_rejected { my ($_urpm, $_db, $_state, $_pkg, $_o_rdep) = @_ }
+sub resolve_rejected { my ($_urpm, $_db, $_state, $_pkg, @_more_paras) = @_ }
 sub resolve_rejected_ { my ($_urpm, $_db, $_state, $_properties, $_o_rdep) = @_ }
-sub resolve_requested { my ($_urpm, $_db, $_state, $_requested, $_o_options) = @_ }
-sub resolve_requested__no_suggests { my ($_urpm, $_db, $_state, $_requested, $_o_options) = @_ }
-sub resolve_requested__no_suggests_ { my ($_urpm, $_db, $_state, $_requested, $_o_options) = @_ }
+sub resolve_requested { my ($_urpm, $_db, $_state, $_requested, @_more_paras) = @_ }
+sub resolve_requested__no_suggests { my ($_urpm, $_db, $_state, $_requested, @_more_paras) = @_ }
+sub resolve_requested__no_suggests_ { my ($_urpm, $_db, $_state, $_requested, @_more_paras) = @_ }
 sub reverse_multi_hash { my ($_o_h) = @_ }
 sub rpmErrorString() {}
 sub rpmErrorWriteTo { my ($_fd) = @_ }
 sub rpmvercmp { my ($_one, $_two) = @_ }
-sub search { my ($_urpm, $_name, $_o_options) = @_ }
+sub search { my ($_urpm, $_name, @_more_paras) = @_ }
 sub selected_size { my ($_urpm, $_o_state) = @_ }
 sub selected_size_filesize { my ($_urpm, $_o_state) = @_ }
 sub setVerbosity { my ($_level) = @_ }
 sub set_nofatal { my ($_urpm, $_o_bool) = @_ }
 sub set_rejected { my ($_urpm, $_state, $_o_rdep) = @_ }
 sub set_rejected_and_compute_diff_provides { my ($_urpm, $_state, $_diff_provides_h, $_o_rdep) = @_ }
-sub sort_by_dependencies { my ($_urpm, $_state, $_o_list_unsorted) = @_ }
+sub sort_by_dependencies { my ($_urpm, $_state, @_more_paras) = @_ }
 sub sort_graph { my ($_nodes, $_o_edges) = @_ }
-sub sorted_rpms_to_string { my ($_urpm, $_o_sorted) = @_ }
+sub sorted_rpms_to_string { my ($_urpm, @_more_paras) = @_ }
 sub spec2srcheader { my ($_specfile) = @_ }
 sub stream2header { my ($_fp) = @_ }
 sub strict_arch { my ($_o_urpm) = @_ }
 sub strict_arch_check { my ($_installed_pkg, $_o_pkg) = @_ }
 sub strict_arch_check_installed { my ($_db, $_o_pkg) = @_ }
-sub tag2id { my ($_o_l) = @_ }
+sub tag2id { my (@_more_paras) = @_ }
 sub traverse { my ($_urpm, $_o_callback) = @_ }
 sub traverse_tag { my ($_urpm, $_tag, $_names, $_o_callback) = @_ }
 sub traverse_tag_find { my ($_urpm, $_tag, $_name, $_o_callback) = @_ }
-sub uniq { my ($_o_l) = @_ }
+sub uniq { my (@_more_paras) = @_ }
 sub unresolved_provides_clean { my ($_o_urpm) = @_ }
-sub unsatisfied_requires { my ($_urpm, $_db, $_state, $_pkg, $_o_options) = @_ }
+sub unsatisfied_requires { my ($_urpm, $_db, $_state, $_pkg, @_more_paras) = @_ }
 sub verify_rpm { my ($_filename, @_more_paras) = @_ }
 sub verify_signature { my ($_filename, $_o_prefix) = @_ }
 sub whatrequires { my ($_urpm, $_state, $_o_property_name) = @_ }