branch master updated: * tp/Texinfo/Convert/Converter.pm (converter_line_error) (converter_line_warn), tp/Texinfo/XS/convert/ConvertXS.xs (converter_line_error, converter_line_warn), tp/Texinfo/XS/main/get_perl_info.c (get_line_message): remove 'silent' argument.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new d41edca5ee * tp/Texinfo/Convert/Converter.pm (converter_line_error) 
(converter_line_warn), tp/Texinfo/XS/convert/ConvertXS.xs 
(converter_line_error, converter_line_warn), tp/Texinfo/XS/main/get_perl_info.c 
(get_line_message): remove 'silent' argument.
d41edca5ee is described below

commit d41edca5ee02907d4d077ab579e8d86c093f3a84
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 12 14:47:17 2023 +0100

    * tp/Texinfo/Convert/Converter.pm (converter_line_error)
    (converter_line_warn), tp/Texinfo/XS/convert/ConvertXS.xs
    (converter_line_error, converter_line_warn),
    tp/Texinfo/XS/main/get_perl_info.c (get_line_message): remove 'silent'
    argument.
---
 ChangeLog                          |  8 ++++++++
 tp/Texinfo/Convert/Converter.pm    | 18 ++++++------------
 tp/Texinfo/XS/convert/ConvertXS.xs | 14 ++++----------
 tp/Texinfo/XS/main/get_perl_info.c |  4 ++--
 tp/Texinfo/XS/main/get_perl_info.h |  2 +-
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af99ccc011..c64be47285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-12-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Converter.pm (converter_line_error)
+       (converter_line_warn), tp/Texinfo/XS/convert/ConvertXS.xs
+       (converter_line_error, converter_line_warn),
+       tp/Texinfo/XS/main/get_perl_info.c (get_line_message): remove 'silent'
+       argument.
+
 2023-12-12  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Structuring.pm (setup_sortable_index_entries): fix
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index e6facb2947..7db01dde28 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -503,35 +503,29 @@ sub destroy($)
 {
 }
 
-sub converter_line_error($$$;$$)
+sub converter_line_error($$$;$)
 {
   my $self = shift;
   my $text = shift;
   my $error_location_info = shift;
   my $continuation = shift;
-  my $silent = shift;
-
-  my $warn = ($self->get_conf('DEBUG')
-              and not $silent);
 
   my $message = Texinfo::Report::format_line_message ('error', $text,
-                        $error_location_info, $continuation, $warn);
+                                 $error_location_info, $continuation,
+                                            $self->get_conf('DEBUG'));
   push @{$self->{'error_warning_messages'}}, $message;
 }
 
-sub converter_line_warn($$$;$$)
+sub converter_line_warn($$$;$)
 {
   my $self = shift;
   my $text = shift;
   my $error_location_info = shift;
   my $continuation = shift;
-  my $silent = shift;
-
-  my $warn = ($self->get_conf('DEBUG')
-              and not $silent);
 
   my $message = Texinfo::Report::format_line_message ('warning', $text,
-                           $error_location_info, $continuation, $warn);
+                                   $error_location_info, $continuation,
+                                              $self->get_conf('DEBUG'));
   push @{$self->{'error_warning_messages'}}, $message;
 }
 
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index db27a32a34..1ca7642879 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -87,43 +87,37 @@ set_conf (SV *converter_in, conf, SV *value)
 void
 converter_line_error (SV *converter_in, text, SV *error_location_info, ...)
           char *text = (char *)SvPVutf8_nolen($arg);
-      PROTOTYPE: $$$;$$
+      PROTOTYPE: $$$;$
       PREINIT:
          CONVERTER *self;
          int continuation = 0;
-         int silent = 0;
       CODE:
          self = get_sv_converter (converter_in, 0);
          if (items > 3 && SvOK(ST(3)))
            continuation = SvIV (ST(3));
-         if (items > 4 && SvOK(ST(4)))
-           silent = SvIV (ST(4));
 
          if (self)
            {
              get_line_message (self, MSG_error, continuation,
-                               error_location_info, strdup (text), silent);
+                               error_location_info, strdup (text));
            }
 
 void
 converter_line_warn (SV *converter_in, text, SV *error_location_info, ...)
           char *text = (char *)SvPVutf8_nolen($arg);
-      PROTOTYPE: $$$;$$
+      PROTOTYPE: $$$;$
       PREINIT:
          CONVERTER *self;
          int continuation = 0;
-         int silent = 0;
       CODE:
          self = get_sv_converter (converter_in, 0);
          if (items > 3 && SvOK(ST(3)))
            continuation = SvIV (ST(3));
-         if (items > 4 && SvOK(ST(4)))
-           silent = SvIV (ST(4));
 
          if (self)
            {
              get_line_message (self, MSG_warning, continuation,
-                               error_location_info, strdup (text), silent);
+                               error_location_info, strdup (text));
            }
 
 void
diff --git a/tp/Texinfo/XS/main/get_perl_info.c 
b/tp/Texinfo/XS/main/get_perl_info.c
index 94811e5687..e999e2d1f3 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -239,9 +239,9 @@ get_source_info (SV *source_info_sv)
 
 void
 get_line_message (CONVERTER *self, enum error_type type, int continuation,
-                  SV *error_location_info, char *message, int silent)
+                  SV *error_location_info, char *message)
 {
-  int do_warn = (self->conf->DEBUG > 1 && !silent);
+  int do_warn = (self->conf->DEBUG > 1);
   SOURCE_INFO *source_info = get_source_info (error_location_info);
   message_list_line_formatted_message (&self->error_messages,
                                        type, continuation, source_info,
diff --git a/tp/Texinfo/XS/main/get_perl_info.h 
b/tp/Texinfo/XS/main/get_perl_info.h
index 12ca923495..167e358e52 100644
--- a/tp/Texinfo/XS/main/get_perl_info.h
+++ b/tp/Texinfo/XS/main/get_perl_info.h
@@ -28,7 +28,7 @@ void add_svav_to_string_list (SV *sv, STRING_LIST 
*string_list,
 
 SOURCE_INFO *get_source_info (SV *source_info_sv);
 void get_line_message (CONVERTER *self, enum error_type type, int continuation,
-                      SV *error_location_info, char *message, int silent);
+                       SV *error_location_info, char *message);
 OPTIONS *copy_sv_options (SV *sv_in, CONVERTER *converter);
 void set_conf (CONVERTER *converter, const char *conf, SV *value);