[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/main/errors.c (message_list_docum
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/XS/main/errors.c (message_list_document_error) (message_list_document_warn): add continuation argument. Update callers. |
|
Date: |
Fri, 23 Feb 2024 10:37:33 -0500 |
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 8cb7dad194 * tp/Texinfo/XS/main/errors.c
(message_list_document_error) (message_list_document_warn): add continuation
argument. Update callers.
8cb7dad194 is described below
commit 8cb7dad194017cee5cf92fc5bb0b6185fe63bacc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Feb 23 16:37:29 2024 +0100
* tp/Texinfo/XS/main/errors.c (message_list_document_error)
(message_list_document_warn): add continuation argument. Update
callers.
---
ChangeLog | 6 ++++++
tp/Texinfo/XS/convert/convert_html.c | 22 +++++++++++-----------
tp/Texinfo/XS/main/errors.c | 11 ++++++-----
tp/Texinfo/XS/main/errors.h | 4 ++--
tp/Texinfo/XS/main/manipulate_indices.c | 2 +-
tp/Texinfo/XS/main/unicode.c | 2 +-
6 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0d87c4f145..7c748ac8d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-23 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/main/errors.c (message_list_document_error)
+ (message_list_document_warn): add continuation argument. Update
+ callers.
+
2024-02-23 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/convert_html.c
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index ef1933b222..54c2b2627c 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -2122,7 +2122,7 @@ set_root_commands_targets_node_files (CONVERTER *self)
if (self->conf->VERBOSE.integer > 0)
{
message_list_document_warn (&self->error_messages,
self->conf,
- "user-defined node file name not set for `%s'",
+ 0, "user-defined node file name not set for `%s'",
node_filename);
}
else if (self->conf->DEBUG.integer > 0)
@@ -3173,7 +3173,7 @@ external_node_href (CONVERTER *self, const ELEMENT
*external_node,
manual_name, 0))
{
message_list_document_warn (&self->error_messages,
- self->conf,
+ self->conf, 0,
"no htmlxref.cnf entry found for `%s'", manual_name);
}
}
@@ -5557,7 +5557,7 @@ html_set_pages_files (CONVERTER *self, OUTPUT_UNIT_LIST
*output_units,
file_name_path->filepath))
{
message_list_document_warn (&self->error_messages,
- self->conf,
+ self->conf, 0,
"resetting %s file path %s to %s",
file_name_path->filename,
file_source_info->path,
@@ -7010,7 +7010,7 @@ file_header_information (CONVERTER *self, const ELEMENT
*command,
{
if (!self->conf->SPLIT.string || !strlen (self->conf->SPLIT.string))
{
- message_list_document_error (&self->error_messages, self->conf,
+ message_list_document_error (&self->error_messages, self->conf, 0,
"%s not meaningful for non-split output", "INFO_JS_DIR");
}
else
@@ -16662,7 +16662,7 @@ html_conversion_finalization (CONVERTER *self)
*/
if (self->pending_closes.top > 0)
{
- message_list_document_warn (&self->error_messages, self->conf,
+ message_list_document_warn (&self->error_messages, self->conf, 0,
"%zu registered opened sections not closed",
self->pending_closes.top);
clear_string_stack (&self->pending_closes);
@@ -16671,7 +16671,7 @@ html_conversion_finalization (CONVERTER *self)
if (self->pending_inline_content.top > 0)
{
char *inline_content = html_get_pending_formatted_inline_content (self);
- message_list_document_warn (&self->error_messages, self->conf,
+ message_list_document_warn (&self->error_messages, self->conf, 0,
"%zu registered inline contents: %s",
self->pending_inline_content.top, inline_content);
free (inline_content);
@@ -16688,19 +16688,19 @@ html_conversion_finalization (CONVERTER *self)
{
char *element_str
= print_element_debug (associated_content->element, 0);
- message_list_document_warn (&self->error_messages, self->conf,
+ message_list_document_warn (&self->error_messages, self->conf, 0,
"left inline content associated to %s: '%s'", element_str,
inline_content);
free (element_str);
}
else if (associated_content->hv)
{
- message_list_document_warn (&self->error_messages, self->conf,
+ message_list_document_warn (&self->error_messages, self->conf, 0,
"left inline content of %p: '%s'", associated_content->hv,
inline_content);
}
else
- message_list_document_warn (&self->error_messages, self->conf,
+ message_list_document_warn (&self->error_messages, self->conf, 0,
"left inline content associated: '%s'", inline_content);
free (associated_content->inline_content.text);
}
@@ -18397,7 +18397,7 @@ convert_output_output_unit_internal (CONVERTER *self,
free (path_encoding);
if (!file_fh)
{
- message_list_document_error (&self->error_messages, self->conf,
+ message_list_document_error (&self->error_messages, self->conf, 0,
"could not open %s for writing: %s",
out_filepath, open_error_message);
free (encoded_out_filepath);
@@ -18457,7 +18457,7 @@ convert_output_output_unit_internal (CONVERTER *self,
encoded_out_filepath);
if (fclose (file_fh))
{
- message_list_document_error (&self->error_messages, self->conf,
+ message_list_document_error (&self->error_messages, self->conf,
0,
"error on closing %s: %s",
out_filepath, strerror (errno));
free (encoded_out_filepath);
diff --git a/tp/Texinfo/XS/main/errors.c b/tp/Texinfo/XS/main/errors.c
index 023c42971d..e534b96980 100644
--- a/tp/Texinfo/XS/main/errors.c
+++ b/tp/Texinfo/XS/main/errors.c
@@ -283,30 +283,31 @@ message_list_command_error (ERROR_MESSAGE_LIST
*error_messages,
&e->source_info, format, v);
}
-/* TODO a continuation argument may need to be added. */
void
message_list_document_error (ERROR_MESSAGE_LIST *error_messages,
- OPTIONS *conf,
+ OPTIONS *conf, int continuation,
const char *format, ...)
{
va_list v;
va_start (v, format);
message_list_document_error_internal (error_messages, conf,
- MSG_document_error, 0,
+ MSG_document_error,
+ continuation,
format, v);
}
void
message_list_document_warn (ERROR_MESSAGE_LIST *error_messages,
- OPTIONS *conf,
+ OPTIONS *conf, int continuation,
const char *format, ...)
{
va_list v;
va_start (v, format);
message_list_document_error_internal (error_messages, conf,
- MSG_document_warning, 0,
+ MSG_document_warning,
+ continuation,
format, v);
}
diff --git a/tp/Texinfo/XS/main/errors.h b/tp/Texinfo/XS/main/errors.h
index f2fdfbbf79..c8922ec4eb 100644
--- a/tp/Texinfo/XS/main/errors.h
+++ b/tp/Texinfo/XS/main/errors.h
@@ -35,10 +35,10 @@ void message_list_document_formatted_message
(ERROR_MESSAGE_LIST *error_messages
enum error_type type, int
continuation,
char *message);
void message_list_document_error (ERROR_MESSAGE_LIST *error_messages,
- OPTIONS *conf,
+ OPTIONS *conf, int continuation,
const char *format, ...);
void message_list_document_warn (ERROR_MESSAGE_LIST *error_messages,
- OPTIONS *conf,
+ OPTIONS *conf, int continuation,
const char *format, ...);
void vmessage_list_command_warn (ERROR_MESSAGE_LIST *error_messages,
OPTIONS *conf,
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c
b/tp/Texinfo/XS/main/manipulate_indices.c
index cff5983ca5..f12d884dee 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -606,7 +606,7 @@ setup_collator (int use_unicode_collation, const char
*collation_language,
}
else
{
- message_list_document_warn (error_messages, options,
+ message_list_document_warn (error_messages, options, 0,
"collation locale not found: %s", collation_locale);
}
}
diff --git a/tp/Texinfo/XS/main/unicode.c b/tp/Texinfo/XS/main/unicode.c
index 6f1bd3b40a..998eac3a2e 100644
--- a/tp/Texinfo/XS/main/unicode.c
+++ b/tp/Texinfo/XS/main/unicode.c
@@ -39,11 +39,11 @@
uint8_t *
utf8_from_string (const char *text)
{
- /* TODO error checking? */
return (uint8_t *) strdup (text);
/* With uniconv gnulib module this could be the following, although
this pulls in quite a few other gnulib module dependencies. */
+ /* TODO error checking? */
/* return u8_strconv_from_encoding (text, "UTF-8", iconveh_question_mark); */
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/main/errors.c (message_list_document_error) (message_list_document_warn): add continuation argument. Update callers.,
Patrice Dumas <=