[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Sun, 29 Sep 2024 04:30:26 -0400 (EDT) |
branch: master
commit 49a5cd03b036132281b07c7cdfe450351aa88f8a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jun 8 22:50:45 2024 +0200
* tp/Texinfo/XS/main/extra.c: remove add_info_string,
add_info_string_dup, lookup_info and lookup_info_string.
---
ChangeLog | 5 +++++
tp/Texinfo/XS/main/convert_to_texinfo.c | 2 +-
tp/Texinfo/XS/main/extra.c | 30 ------------------------------
tp/Texinfo/XS/main/extra.h | 4 ----
4 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 190ad22f0a..67147942f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
tp/Texinfo/XS/structuring_transfo/structuring.c (new_node_menu_entry):
use the union e name.
+2024-06-08 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/main/extra.c: remove add_info_string,
+ add_info_string_dup, lookup_info and lookup_info_string.
+
2024-06-08 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/convert_html.c (convert_to_html_internal): fix
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index d56ea9fef5..bed619dd27 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -26,7 +26,7 @@
#include "element_types.h"
#include "tree_types.h"
#include "types_data.h"
-/* for lookup_info* */
+/* for lookup_extra* */
#include "extra.h"
/* new_element and destroy_element for convert_contents_to_texinfo */
#include "tree.h"
diff --git a/tp/Texinfo/XS/main/extra.c b/tp/Texinfo/XS/main/extra.c
index adfdee9c3a..828fbd66a1 100644
--- a/tp/Texinfo/XS/main/extra.c
+++ b/tp/Texinfo/XS/main/extra.c
@@ -155,13 +155,6 @@ add_extra_string (ELEMENT *e, const char *key, char *value)
k->k.string = value;
}
-void
-add_info_string (ELEMENT *e, char *key, char *value)
-{
- KEY_PAIR *k = get_associated_info_key (&e->e.c->info_info, key,
extra_string);
- k->k.string = value;
-}
-
void
add_extra_string_dup (ELEMENT *e, const char *key, const char *value)
{
@@ -169,13 +162,6 @@ add_extra_string_dup (ELEMENT *e, const char *key, const
char *value)
k->k.string = strdup (value);
}
-void
-add_info_string_dup (ELEMENT *e, const char *key, const char *value)
-{
- KEY_PAIR *k = get_associated_info_key (&e->e.c->info_info, key,
extra_string);
- k->k.string = strdup (value);
-}
-
void
add_associated_info_integer (ASSOCIATED_INFO *a, const char *key, int value)
{
@@ -342,22 +328,6 @@ lookup_extra_misc_args (const ELEMENT *e, const char *key)
return k->k.list;
}
-KEY_PAIR *
-lookup_info (const ELEMENT *e, const char *key)
-{
- return lookup_associated_info (&e->e.c->info_info, key);
-}
-
-char *
-lookup_info_string (const ELEMENT *e, const char *key)
-{
- const KEY_PAIR *k;
- k = lookup_associated_info (&e->e.c->info_info, key);
- if (!k || !k->k.string)
- return 0;
- return k->k.string;
-}
-
/* only called in tree copy to optimize for speed */
KEY_PAIR *
lookup_associated_info_by_index (const ASSOCIATED_INFO *a,
diff --git a/tp/Texinfo/XS/main/extra.h b/tp/Texinfo/XS/main/extra.h
index 0a55d7b8e4..262b41b0da 100644
--- a/tp/Texinfo/XS/main/extra.h
+++ b/tp/Texinfo/XS/main/extra.h
@@ -30,21 +30,17 @@ void add_extra_misc_args (ELEMENT *e, char *key,
ELEMENT_LIST *value);
void add_extra_string (ELEMENT *e, const char *key, char *value);
void add_extra_string_dup (ELEMENT *e, const char *key, const char *value);
void add_extra_integer (ELEMENT *e, char *key, long value);
-void add_info_string (ELEMENT *e, char *key, char *value);
-void add_info_string_dup (ELEMENT *e, const char *key, const char *value);
void add_associated_info_integer (ASSOCIATED_INFO *a,
const char *key, int value);
void add_associated_info_string_dup (ASSOCIATED_INFO *a, const char *key,
const char *value);
KEY_PAIR *lookup_extra (const ELEMENT *e, const char *key);
-KEY_PAIR *lookup_info (const ELEMENT *e, const char *key);
ELEMENT *lookup_extra_element (const ELEMENT *e, const char *key);
ELEMENT_LIST *lookup_extra_contents (const ELEMENT *e, const char *key);
const ELEMENT_LIST *lookup_extra_misc_args (const ELEMENT *e, const char *key);
const ELEMENT_LIST *lookup_extra_directions (const ELEMENT *e, const char
*key);
int lookup_extra_integer (const ELEMENT *e, const char *key, int *ret);
char *lookup_extra_string (const ELEMENT *e, const char *key);
-char *lookup_info_string (const ELEMENT *e, const char *key);
KEY_PAIR *lookup_associated_info (const ASSOCIATED_INFO *a, const char *key);