[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Mon, 7 Oct 2024 17:04:49 -0400 (EDT) |
branch: master
commit d369afbe829756d19fae0411212e2ed305a98d74
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 7 22:39:39 2024 +0200
* info/dir.c (insert_text_into_node): use size_t in argument for a
length.
* info/nodes.c (get_node_length): return size_t.
* info/man.c (get_manpage_node, xrefs_of_manpage), info/nodes.c
(build_tags_and_nodes, get_tags_of_indirect_tags_table)
(get_file_character_encoding, get_node_length), info/search.c
(search_forward, search_backward, string_in_line): use size_t for
variables representing length, numbers or indices in arrays.
---
ChangeLog | 13 +++++++++++++
info/dir.c | 6 +++---
info/man.c | 10 +++++-----
info/nodes.c | 17 +++++++++--------
info/search.c | 14 ++++++++------
info/session.c | 2 +-
6 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dd122b39d5..ce66613582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-10-07 Patrice Dumas <pertusus@free.fr>
+
+ * info/dir.c (insert_text_into_node): use size_t in argument for a
+ length.
+
+ * info/nodes.c (get_node_length): return size_t.
+
+ * info/man.c (get_manpage_node, xrefs_of_manpage), info/nodes.c
+ (build_tags_and_nodes, get_tags_of_indirect_tags_table)
+ (get_file_character_encoding, get_node_length), info/search.c
+ (search_forward, search_backward, string_in_line): use size_t for
+ variables representing length, numbers or indices in arrays.
+
2024-10-07 Gavin Smith <gavinsmith0123@gmail.com>
Fix info.js index lookup to go to correct location
diff --git a/info/dir.c b/info/dir.c
index 2831c14134..b4c9c8b84f 100644
--- a/info/dir.c
+++ b/info/dir.c
@@ -23,8 +23,8 @@
#include "tilde.h"
static void add_menu_to_node (char *contents, size_t size, NODE *node);
-static void insert_text_into_node (NODE *node, long start,
- char *text, int textlen);
+static void insert_text_into_node (NODE *node, size_t start,
+ char *text, size_t textlen);
static NODE *dir_node = 0;
@@ -203,7 +203,7 @@ add_menu_to_node (char *contents, size_t size, NODE *node)
}
static void
-insert_text_into_node (NODE *node, long start, char *text, int textlen)
+insert_text_into_node (NODE *node, size_t start, char *text, size_t textlen)
{
char *contents;
long end;
diff --git a/info/man.c b/info/man.c
index 01d42e2c12..384283397a 100644
--- a/info/man.c
+++ b/info/man.c
@@ -155,7 +155,7 @@ get_manpage_node (char *pagename)
/* Node wasn't found, or its contents were freed since last time. */
if (!node->contents)
{
- int plen;
+ size_t plen;
page = get_manpage_contents (pagename);
if (!page)
@@ -570,7 +570,7 @@ xrefs_of_manpage (NODE *node)
s.end = node->nodelen;
/* Exclude first line, which often looks like:
-CAT(1) User Commands CAT(1)
+ CAT(1) User Commands CAT(1)
*/
s.start = strcspn (node->contents, "\n");
@@ -578,8 +578,8 @@ CAT(1) User Commands
CAT(1)
followed by non-whitespace text within parenthesis leading with a digit.
*/
while (search_forward ("(", &s, &position) == search_success)
{
- register int name, name_end;
- int section, section_end;
+ register size_t name, name_end;
+ size_t section, section_end;
name = position;
if (name == 0)
@@ -673,7 +673,7 @@ CAT(1) User Commands
CAT(1)
add_pointer_to_array (entry, refs_index, refs, refs_slots, 10);
}
-skip:
+ skip:
s.start = position + 1;
}
diff --git a/info/nodes.c b/info/nodes.c
index eb1e459a1f..6c96227336 100644
--- a/info/nodes.c
+++ b/info/nodes.c
@@ -60,7 +60,7 @@ build_tags_and_nodes (FILE_BUFFER *file_buffer)
{
SEARCH_BINDING binding;
long position;
- long tags_table_begin, tags_table_end;
+ size_t tags_table_begin, tags_table_end;
free_file_buffer_tags (file_buffer);
file_buffer->flags &= ~N_HasTagsTable;
@@ -337,7 +337,7 @@ static void
get_tags_of_indirect_tags_table (FILE_BUFFER *file_buffer,
SEARCH_BINDING *indirect_binding, SEARCH_BINDING *tags_binding)
{
- int i;
+ size_t i;
/* A structure used only in `get_tags_of_indirect_tags_table' to hold onto
an intermediate value. */
@@ -400,13 +400,13 @@ get_tags_of_indirect_tags_table (FILE_BUFFER *file_buffer,
}
{
- int tags_index;
+ size_t tags_index;
long header_length;
SEARCH_BINDING binding;
char *containing_dir;
char *temp;
- int len_containing_dir;
+ size_t len_containing_dir;
/* Find the length of the header of the file containing the indirect
tags table. This header appears at the start of every file. We
@@ -761,7 +761,8 @@ get_file_character_encoding (FILE_BUFFER *fb)
SEARCH_BINDING binding;
long position;
- long int enc_start, enc_len;
+ long int enc_start;
+ size_t enc_len;
char *enc_string;
/* See if there is a local variables section in this info file. */
@@ -848,7 +849,7 @@ info_reload_file_buffer_contents (FILE_BUFFER *fb)
/* Functions for node creation and retrieval. */
-static long get_node_length (SEARCH_BINDING *binding);
+static size_t get_node_length (SEARCH_BINDING *binding);
static void node_set_body_start (NODE *node);
static int adjust_nodestart (FILE_BUFFER *file_buffer, TAG *tag);
@@ -892,10 +893,10 @@ info_create_node (void)
}
/* Return the length of the node which starts at BINDING. */
-static long
+static size_t
get_node_length (SEARCH_BINDING *binding)
{
- int i;
+ size_t i;
char *body;
/* [A node] ends with either a ^_, a ^L, or end of file. */
diff --git a/info/search.c b/info/search.c
index 898f363a82..2f73b54c9c 100644
--- a/info/search.c
+++ b/info/search.c
@@ -226,7 +226,8 @@ regexp_search (char *regexp, int is_literal, int
is_insensitive,
enum search_result
search_forward (char *string, SEARCH_BINDING *binding, long *poff)
{
- register int c, i, len;
+ register int c;
+ register size_t i, len;
register char *buff, *end;
char *alternate = NULL;
@@ -286,7 +287,8 @@ search_forward (char *string, SEARCH_BINDING *binding, long
*poff)
enum search_result
search_backward (char *input_string, SEARCH_BINDING *binding, long *poff)
{
- register int c, i, len;
+ register int i_end, c;
+ register size_t i, len;
register char *buff, *end;
char *string;
char *alternate = NULL;
@@ -295,10 +297,10 @@ search_backward (char *input_string, SEARCH_BINDING
*binding, long *poff)
/* Reverse the characters in the search string. */
string = xmalloc (1 + len);
- for (c = 0, i = len - 1; input_string[c]; c++, i--)
- string[i] = input_string[c];
+ for (i = 0, i_end = len - 1; input_string[i]; i++, i_end--)
+ string[i_end] = input_string[i];
- string[c] = '\0';
+ string[i] = '\0';
/* We match characters in the search buffer against STRING and ALTERNATE.
ALTERNATE is a case reversed version of STRING; this is cheaper than
@@ -359,7 +361,7 @@ search_backward (char *input_string, SEARCH_BINDING
*binding, long *poff)
int
string_in_line (char *string, char *line)
{
- register int end;
+ register size_t end;
SEARCH_BINDING binding;
long offset;
diff --git a/info/session.c b/info/session.c
index 92109afcb0..528cf030b3 100644
--- a/info/session.c
+++ b/info/session.c
@@ -4163,7 +4163,7 @@ info_search_internal (char *string, WINDOW *window,
if (!search_other_nodes)
break;
-search_next_node:
+ search_next_node:
/* If we've searched our starting node twice, there are no matches.
Bail out. (We searched the second time in case there were matches
before the starting offset.) */