[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * info/indices.c, info/infodoc.c, info/infomap.c,
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * info/indices.c, info/infodoc.c, info/infomap.c, info/man.c, info/search.c, info/session.c, info/util.c: replace tabs by spaces. Changes in spacing. |
|
Date: |
Sat, 16 Nov 2024 17:05:04 -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 c353ef48bb * info/indices.c, info/infodoc.c, info/infomap.c,
info/man.c, info/search.c, info/session.c, info/util.c: replace tabs by spaces.
Changes in spacing.
c353ef48bb is described below
commit c353ef48bb3dc0d269e9804b7afb55d835dfe691
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Nov 16 23:04:59 2024 +0100
* info/indices.c, info/infodoc.c, info/infomap.c, info/man.c,
info/search.c, info/session.c, info/util.c: replace tabs by spaces.
Changes in spacing.
---
ChangeLog | 6 ++
info/indices.c | 78 +++++++++++-----------
info/infodoc.c | 2 +-
info/infomap.c | 60 ++++++++---------
info/man.c | 74 ++++++++++----------
info/search.c | 14 ++--
info/session.c | 208 ++++++++++++++++++++++++++++-----------------------------
info/util.c | 64 +++++++++---------
8 files changed, 256 insertions(+), 250 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 65875a669b..830a4c6534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-11-16 Patrice Dumas <pertusus@free.fr>
+
+ * info/indices.c, info/infodoc.c, info/infomap.c, info/man.c,
+ info/search.c, info/session.c, info/util.c: replace tabs by spaces.
+ Changes in spacing.
+
2024-11-16 Gavin Smith <gavinsmith0123@gmail.com>
* autogen.sh: regenerate tp/tests/input/non_ascii.tar. Suggestion
diff --git a/info/indices.c b/info/indices.c
index 38db05ed82..c4edd88627 100644
--- a/info/indices.c
+++ b/info/indices.c
@@ -86,7 +86,7 @@ add_index_to_index_nodenames (REFERENCE **array, NODE *node)
assoc->first = 1 + index_nodenames[i]->last;
assoc->last = assoc->first + last;
}
- add_pointer_to_array (assoc, index_nodenames_index, index_nodenames,
+ add_pointer_to_array (assoc, index_nodenames_index, index_nodenames,
index_nodenames_slots, 10);
}
@@ -106,10 +106,10 @@ clear_index_nodenames (void)
index_nodenames[0] = NULL;
}
-/* Find and concatenate the indices of FILE_BUFFER, saving the result in
- INDEX_INDEX. The indices are defined as the first node in the file
- containing the word "Index" and any immediately following nodes whose names
- also contain "Index". All such indices are concatenated and the result
+/* Find and concatenate the indices of FILE_BUFFER, saving the result in
+ INDEX_INDEX. The indices are defined as the first node in the file
+ containing the word "Index" and any immediately following nodes whose names
+ also contain "Index". All such indices are concatenated and the result
returned. */
static void
info_indices_of_file_buffer (FILE_BUFFER *file_buffer)
@@ -262,7 +262,7 @@ DECLARE_INFO_COMMAND (info_index_search,
index_initial = 0;
index_partial = 0;
}
-
+
old_offset = index_offset;
/* The "last" string searched for is this one. */
@@ -282,7 +282,7 @@ static int
index_entry_matches (REFERENCE *ent, const char *str, size_t len)
{
char *p;
-
+
if (strncmp (ent->label, str, len))
return 0;
p = ent->label + len;
@@ -291,26 +291,26 @@ index_entry_matches (REFERENCE *ent, const char *str,
size_t len)
if (p[0] == ' ' && p[1] == '<')
{
for (p += 2; *p; p++)
- {
- if (p[0] == '>' && p[1] == 0)
- return 1;
- else if (!isdigit (*p))
- return 0;
- }
+ {
+ if (p[0] == '>' && p[1] == 0)
+ return 1;
+ else if (!isdigit (*p))
+ return 0;
+ }
}
return 0;
}
-/* Search for the next occurence of STRING in FB's indices starting at OFFSET
+/* Search for the next occurence of STRING in FB's indices starting at OFFSET
in direction DIR.
-
- Try to get an exact match, If no match found, progress onto looking for
- initial matches, then non-initial substrings, updating the values of
+
+ Try to get an exact match, If no match found, progress onto looking for
+ initial matches, then non-initial substrings, updating the values of
INDEX_INITIAL and INDEX_PARTIAL.
If a match is found, return a pointer to the matching index entry, and
set *FOUND_OFFSET to its offset in INDEX_INDEX. Otherwise, return null.
- If we found a partial match, set *MATCH_OFFSET to the end of the match
+ If we found a partial match, set *MATCH_OFFSET to the end of the match
within the index entry text, else to 0. */
REFERENCE *
next_index_match (FILE_BUFFER *fb, char *string, int offset, int dir,
@@ -347,10 +347,10 @@ next_index_match (FILE_BUFFER *fb, char *string, int
offset, int dir,
}
if (i < 0 || !index_index[i])
- {
+ {
offset = -1;
index_initial = 1;
- }
+ }
}
if (index_initial)
@@ -364,11 +364,11 @@ next_index_match (FILE_BUFFER *fb, char *string, int
offset, int dir,
}
if (i < 0 || !index_index[i])
- {
+ {
offset = -1;
index_initial = 0;
index_partial = 1;
- }
+ }
}
if (index_partial)
@@ -459,7 +459,7 @@ DECLARE_INFO_COMMAND (info_next_index_match,
int match_offset;
int dir;
REFERENCE *result;
-
+
/* If there is no previous search string, the user hasn't built an index
yet. */
if (!index_search)
@@ -475,7 +475,7 @@ DECLARE_INFO_COMMAND (info_next_index_match,
else
dir = 1;
- result = next_index_match (file_buffer_of_window (window), index_search,
+ result = next_index_match (file_buffer_of_window (window), index_search,
index_offset, dir, &i, &match_offset);
/* If that failed, print an error. */
@@ -495,10 +495,10 @@ DECLARE_INFO_COMMAND (info_next_index_match,
info_select_reference (window, result);
}
-/* Look for the best match of STRING in the indices of FB. If SLOPPY, allow
- case-insensitive initial substrings to match. Return null if no match is
- found. Return value should not be freed or modified. This differs from
the
- behaviour of next_index_match in that only _initial_ substrings are
+/* Look for the best match of STRING in the indices of FB. If SLOPPY, allow
+ case-insensitive initial substrings to match. Return null if no match is
+ found. Return value should not be freed or modified. This differs from the
+ behaviour of next_index_match in that only _initial_ substrings are
considered. */
REFERENCE *
look_in_indices (FILE_BUFFER *fb, char *string, int sloppy)
@@ -506,7 +506,7 @@ look_in_indices (FILE_BUFFER *fb, char *string, int sloppy)
REFERENCE **index_ptr;
REFERENCE *nearest = 0;
- /* Remember the search string so we can use it as the default for
+ /* Remember the search string so we can use it as the default for
'virtual-index' or 'next-index-match'. */
free (index_search);
index_search = xstrdup (string);
@@ -638,7 +638,7 @@ apropos_in_all_indices (char *search_string, int inform)
{
if (string_in_line (search_string, entry->label) != -1)
{
- add_pointer_to_array (entry, apropos_list_index, apropos_list,
+ add_pointer_to_array (entry, apropos_list_index, apropos_list,
apropos_list_slots, 100);
}
}
@@ -690,16 +690,16 @@ DECLARE_INFO_COMMAND (info_index_apropos,
apropos_list = apropos_in_all_indices (index_search, 1);
if (!apropos_list)
- {
+ {
info_error (_(APROPOS_NONE), index_search);
return;
}
else
{
/* Create the node. FIXME: Labels and node names taken from the
- indices of Info files may be in a different character encoding to
+ indices of Info files may be in a different character encoding to
the one currently being used.
- This problem is reduced by makeinfo not putting quotation marks
+ This problem is reduced by makeinfo not putting quotation marks
from @samp, etc., into node names and index entries. */
register int i;
@@ -793,11 +793,11 @@ static void
format_reference (REFERENCE *ref, const char *filename, struct text_buffer
*buf)
{
size_t n;
-
+
n = text_buffer_printf (buf, "* %s: ", ref->label);
if (n < NODECOL)
n += text_buffer_fill (buf, ' ', NODECOL - n);
-
+
if (ref->filename && strcmp (ref->filename, filename))
n += text_buffer_printf (buf, "(%s)", ref->filename);
n += text_buffer_printf (buf, "%s. ", ref->nodename);
@@ -809,7 +809,7 @@ format_reference (REFERENCE *ref, const char *filename,
struct text_buffer *buf)
text_buffer_add_char (buf, '\n');
text_buffer_fill (buf, ' ', LINECOL);
}
-
+
text_buffer_printf (buf, "(line %4d)\n", ref->line_number);
}
@@ -877,7 +877,7 @@ DECLARE_INFO_COMMAND (info_virtual_index,
char *prompt, *line;
FILE_BUFFER *fb;
NODE *node;
-
+
fb = file_buffer_of_window (window);
if (!initial_index_filename ||
@@ -893,7 +893,7 @@ DECLARE_INFO_COMMAND (info_virtual_index,
info_error (_("No indices found."));
return;
}
-
+
/* Default to last search if there is one. */
if (index_search)
xasprintf (&prompt, "%s [%s]: ", _("Index topic"), index_search);
@@ -919,7 +919,7 @@ DECLARE_INFO_COMMAND (info_virtual_index,
free (line);
return; /* No previous search string, and no string given. */
}
-
+
node = create_virtual_index (fb, index_search);
if (!node)
{
diff --git a/info/infodoc.c b/info/infodoc.c
index cc6e1b3cd6..5c0b7c3c58 100644
--- a/info/infodoc.c
+++ b/info/infodoc.c
@@ -506,7 +506,7 @@ DECLARE_INFO_COMMAND (describe_key, _("Print documentation
for KEY"))
if (map[lowerkey].value.function == NULL)
{
message_in_echo_area (_("%s is undefined"),
- pretty_keyseq (keys));
+ pretty_keyseq (keys));
return;
}
}
diff --git a/info/infomap.c b/info/infomap.c
index fb968209f7..273f14cf55 100644
--- a/info/infomap.c
+++ b/info/infomap.c
@@ -252,7 +252,7 @@ static int default_emacs_like_info_keys[] =
KEY_RIGHT_ARROW, NUL, A_info_forward_char,
KEY_LEFT_ARROW, NUL, A_info_backward_char,
KEY_DELETE, NUL, A_info_scroll_backward,
-
+
ESC, KEY_PAGE_UP, NUL, A_info_scroll_other_window_backward,
ESC, KEY_PAGE_DOWN, NUL, A_info_scroll_other_window,
ESC, KEY_UP_ARROW, NUL, A_info_prev_line,
@@ -260,7 +260,7 @@ static int default_emacs_like_info_keys[] =
ESC, KEY_RIGHT_ARROW, NUL, A_info_forward_word,
ESC, KEY_LEFT_ARROW, NUL, A_info_backward_word,
KEY_BACK_TAB, NUL, A_info_move_to_prev_xref,
-
+
};
@@ -478,7 +478,7 @@ static int default_vi_like_info_keys[] =
ESC, KEY_LEFT_ARROW, NUL, A_info_beginning_of_node,
CONTROL('x'), KEY_DELETE, NUL, A_ea_backward_kill_line,
KEY_BACK_TAB, NUL, A_info_move_to_prev_xref,
-
+
};
@@ -529,7 +529,7 @@ static int default_vi_like_ea_keys[] =
LFD, NUL, A_ea_newline,
RET, NUL, A_ea_newline,
TAB, NUL, A_ea_complete,
-
+
KEY_RIGHT_ARROW, NUL, A_ea_forward,
KEY_LEFT_ARROW, NUL, A_ea_backward,
KEY_HOME, NUL, A_ea_beg_of_line,
@@ -553,9 +553,9 @@ static int sup_info, sup_ea;
/* MS-DOS doesn't allow leading dots in file names. */
#ifdef __MSDOS__
-#define DOT_INFOKEY_FILE "_infokey"
+#define DOT_INFOKEY_FILE "_infokey"
#else
-#define DOT_INFOKEY_FILE ".infokey"
+#define DOT_INFOKEY_FILE ".infokey"
#endif
@@ -719,44 +719,44 @@ section_to_keymaps (Keymap map, int *table, unsigned int
len)
int *p;
int *seq;
enum { getseq, gotseq, getaction } state = getseq;
-
+
for (p = table; (unsigned int) (p - table) < len; p++)
{
switch (state)
- {
- case getseq:
- if (*p)
- {
- seq = p;
- state = gotseq;
- }
- break;
-
- case gotseq:
- if (!*p)
+ {
+ case getseq:
+ if (*p)
+ {
+ seq = p;
+ state = gotseq;
+ }
+ break;
+
+ case gotseq:
+ if (!*p)
state = getaction;
- break;
-
- case getaction:
- {
- unsigned int action = *p;
- KEYMAP_ENTRY ke;
-
- state = getseq;
+ break;
+
+ case getaction:
+ {
+ unsigned int action = *p;
+ KEYMAP_ENTRY ke;
+
+ state = getseq;
ke.type = ISFUNC;
ke.value.function = action < A_NCOMMANDS ?
&function_doc_array[action]
: NULL;
keymap_bind_keyseq (map, seq, &ke);
- }
- break;
- }
+ }
+ break;
+ }
}
if (state != getseq)
abort ();
- /* Go through map and bind ESC x to the same function as M-x if it is not
+ /* Go through map and bind ESC x to the same function as M-x if it is not
bound already. */
if (!map[ESC].value.function)
{
diff --git a/info/man.c b/info/man.c
index 9d4e698352..cdf40f43d2 100644
--- a/info/man.c
+++ b/info/man.c
@@ -150,7 +150,7 @@ get_manpage_node (char *pagename)
add_pointer_to_array (node, manpage_node_index,
manpage_nodes,
manpage_node_slots, 100);
- }
+ }
/* Node wasn't found, or its contents were freed since last time. */
if (!node->contents)
@@ -213,18 +213,18 @@ executable_file_in_path (char *filename, char *path)
free (temp_dirname);
/* Look for FILENAME, possibly with any of the extensions
- in EXEC_EXTENSIONS[]. */
+ in EXEC_EXTENSIONS[]. */
for (i = 0; exec_extensions[i]; i++)
- {
- if (exec_extensions[i][0])
- strcpy (temp_end, exec_extensions[i]);
- statable = (stat (temp, &finfo) == 0);
-
- /* If we have found a regular executable file, then use it. */
- if ((statable) && (S_ISREG (finfo.st_mode)) &&
- (access (temp, X_OK) == 0))
- return temp;
- }
+ {
+ if (exec_extensions[i][0])
+ strcpy (temp_end, exec_extensions[i]);
+ statable = (stat (temp, &finfo) == 0);
+
+ /* If we have found a regular executable file, then use it. */
+ if ((statable) && (S_ISREG (finfo.st_mode)) &&
+ (access (temp, X_OK) == 0))
+ return temp;
+ }
free (temp);
}
@@ -293,7 +293,7 @@ clean_manpage (char *manpage)
char *newpage = xmalloc (len + 1);
char *np = newpage;
int prev_len = 0;
-
+
for (mbi_init (iter, manpage, len);
mbi_avail (iter);
mbi_advance (iter))
@@ -302,30 +302,30 @@ clean_manpage (char *manpage)
int cur_len = mb_len (mbi_cur (iter));
if (cur_len == 1)
- {
- if (*cur_ptr == '\b' || *cur_ptr == '\f')
- {
- if (np >= newpage + prev_len)
- np -= prev_len;
- }
- else if (ansi_escape (iter, &cur_len))
- {
- memcpy (np, cur_ptr, cur_len);
- np += cur_len;
- ITER_SETBYTES (iter, cur_len);
- }
- else if (show_malformed_multibyte_p || mbi_cur (iter).wc_valid)
- *np++ = *cur_ptr;
- }
+ {
+ if (*cur_ptr == '\b' || *cur_ptr == '\f')
+ {
+ if (np >= newpage + prev_len)
+ np -= prev_len;
+ }
+ else if (ansi_escape (iter, &cur_len))
+ {
+ memcpy (np, cur_ptr, cur_len);
+ np += cur_len;
+ ITER_SETBYTES (iter, cur_len);
+ }
+ else if (show_malformed_multibyte_p || mbi_cur (iter).wc_valid)
+ *np++ = *cur_ptr;
+ }
else
- {
- memcpy (np, cur_ptr, cur_len);
- np += cur_len;
- }
+ {
+ memcpy (np, cur_ptr, cur_len);
+ np += cur_len;
+ }
prev_len = cur_len;
}
*np = 0;
-
+
strcpy (manpage, newpage);
free (newpage);
}
@@ -435,7 +435,7 @@ get_manpage_from_formatter (char *formatter_args[])
if (fd_err > 2)
dup2 (fd_err, fileno (stderr)); /* Don't print errors. */
sprintf (cmdline, "\"%s\" %s %s",
- formatter_args[0], formatter_args[1], formatter_args[2]);
+ formatter_args[0], formatter_args[1], formatter_args[2]);
fpipe = popen (cmdline, "r");
free (cmdline);
if (fd_err > 2)
@@ -454,12 +454,12 @@ get_manpage_from_formatter (char *formatter_args[])
/* We could check the exit status of "man -a" to see if it successfully
output a man page However:
* It is possible for "man -a" to output a man page and still to exit with
- a non-zero status. This was found to happen when duplicate man pages
+ a non-zero status. This was found to happen when duplicate man pages
were found.
* "man" was found to exit with a zero status on Solaris 10 even when
it found nothing.
- Hence, treat it as a success if more than three lines were output. (A
- small amount of output could be error messages that were sent to standard
+ Hence, treat it as a success if more than three lines were output. (A
+ small amount of output could be error messages that were sent to standard
output.) */
{
int i;
diff --git a/info/search.c b/info/search.c
index 56beb96b31..51fb4cb4fe 100644
--- a/info/search.c
+++ b/info/search.c
@@ -174,7 +174,7 @@ extend_matches (MATCH_STATE *state)
state->match_count = match_count;
}
-/* Search BUFFER for REGEXP. If matches are found, pass back the list of
+/* Search BUFFER for REGEXP. If matches are found, pass back the list of
matches in MATCH_STATE. */
enum search_result
regexp_search (const char *regexp, int is_literal, int is_insensitive,
@@ -273,7 +273,7 @@ search_forward (const char *string, const SEARCH_BINDING
*binding, long *poff)
if (binding->flags & S_SkipDest)
buff += len;
*poff = buff - binding->buffer;
- return search_success;
+ return search_success;
}
buff++;
@@ -345,7 +345,7 @@ search_backward (const char *input_string, const
SEARCH_BINDING *binding,
if (binding->flags & S_SkipDest)
buff -= len;
*poff = 1 + buff - binding->buffer;
- return search_success;
+ return search_success;
}
buff--;
@@ -367,7 +367,7 @@ string_in_line (const char *string, char *line)
register size_t end;
SEARCH_BINDING binding;
long offset;
-
+
/* Find the end of the line. */
for (end = 0; line[end] && line[end] != '\n'; end++);
@@ -396,7 +396,7 @@ looking_at (const char *string, const SEARCH_BINDING
*binding)
return search_end == binding->start;
}
-/* Return non-zero if POINTER is looking at the text at STRING before an
+/* Return non-zero if POINTER is looking at the text at STRING before an
end-of-line. */
int
looking_at_line (const char *string, const char *pointer)
@@ -596,7 +596,7 @@ skip_non_whitespace (const char *string)
/* **************************************************************** */
/* Return the absolute position of the first occurence of a node separator
- starting in BINDING->buffer between BINDING->start and BINDING->end
+ starting in BINDING->buffer between BINDING->start and BINDING->end
inclusive. Return -1 if no node separator was found. */
long
find_node_separator (const SEARCH_BINDING *binding)
@@ -736,7 +736,7 @@ find_node_in_binding (const char *nodename, const
SEARCH_BINDING *binding)
continue;
s.start += offset;
- s.start += skip_whitespace (s.buffer + s.start);
+ s.start += skip_whitespace (s.buffer + s.start);
nodename_start = s.buffer + s.start;
read_quoted_string (nodename_start, "\n\r\t,", 0, &read_nodename);
if (!read_nodename)
diff --git a/info/session.c b/info/session.c
index 7ed13946e5..5f18198aa0 100644
--- a/info/session.c
+++ b/info/session.c
@@ -32,9 +32,9 @@
#endif
#ifdef __MINGW32__
# undef read
-# define read(f,b,s) w32_read(f,b,s)
+# define read(f,b,s) w32_read(f,b,s)
# undef _read
-# define _read(f,b,s) w32_read(f,b,s)
+# define _read(f,b,s) w32_read(f,b,s)
extern ssize_t w32_read (int, void *, size_t);
#endif
@@ -76,7 +76,7 @@ allfiles_create_node (char *term, REFERENCE **fref)
{
int i;
struct text_buffer text;
-
+
text_buffer_init (&text);
text_buffer_printf (&text,
@@ -186,8 +186,8 @@ display_startup_message (void)
char *format;
format = replace_in_documentation
- /* TRANSLATORS: Try to keep this message (when "expanded") at most 79
- characters; anything after the 79th character will not actually be
+ /* TRANSLATORS: Try to keep this message (when "expanded") at most 79
+ characters; anything after the 79th character will not actually be
displayed on an 80-column terminal. */
(_("Welcome to Info version %s. Type \\[get-help-window] for help,
\\[get-info-help-node] for tutorial."),
0);
@@ -252,7 +252,7 @@ info_read_and_dispatch (void)
(*cmd) (active_window, count);
- /* Don't change the goal column when going up and down. This
+ /* Don't change the goal column when going up and down. This
means we can go from a long line to a short line and back to
a long line and end back in the same column. */
if (!(cmd == &info_next_line || cmd == &info_prev_line))
@@ -437,7 +437,7 @@ info_gather_typeahead (int wait)
char c;
/* Wait until there is a byte waiting, and then stuff it into the input
buffer. */
- if (read (tty, &c, 1) <= 0)
+ if (read (tty, &c, 1) <= 0)
return 0;
if (info_dribble_file)
@@ -579,7 +579,7 @@ int
get_input_key (void)
{
int ret = -1;
-
+
while (ret == -1)
{
ret = get_input_key_internal ();
@@ -676,7 +676,7 @@ get_input_key_internal (void)
{
/* If the sequence was incomplete, return the first byte.
Also return the first byte for sequences with ESC that are at
- least three bytes long if 'key_time' is 0, to give some support for
+ least three bytes long if 'key_time' is 0, to give some support for
specifying byte sequences in infokey for those sent by unrecognized
special keys (which would otherwise be skipped below). */
pop_index = pop_start;
@@ -1023,7 +1023,7 @@ static int forward_move_node_structure (WINDOW *window,
int behaviour);
static int backward_move_node_structure (WINDOW *window, int behaviour);
/* Controls whether scroll-behavior affects line movement commands */
-int cursor_movement_scrolls_p = 1;
+int cursor_movement_scrolls_p = 1;
/* Variable controlling redisplay of scrolled windows. If non-zero,
it is the desired number of lines to scroll the window in order to
@@ -1120,7 +1120,7 @@ looking_at_newline (WINDOW *win, long point)
{
mbi_iterator_t iter;
mbi_init (iter, win->node->contents + point,
- win->node->nodelen - point);
+ win->node->nodelen - point);
if (!mbi_avail (iter))
return 0;
@@ -1134,7 +1134,7 @@ looking_at_alnum (WINDOW *win)
{
mbi_iterator_t iter;
mbi_init (iter, win->node->contents + win->point,
- win->node->nodelen - win->point);
+ win->node->nodelen - win->point);
if (!mbi_avail (iter))
return 0;
@@ -1197,11 +1197,11 @@ point_forward_word (WINDOW *win)
while (1)
{
for (; col < win->line_map.used; col++)
- {
+ {
win->point = win->line_map.map[col];
if (looking_at_alnum (win))
goto skipped_whitespace;
- }
+ }
if (!point_next_line (win))
return;
col = 0;
@@ -1211,11 +1211,11 @@ point_forward_word (WINDOW *win)
while (1)
{
for (; col < win->line_map.used; col++)
- {
+ {
win->point = win->line_map.map[col];
- if (!looking_at_alnum (win))
+ if (!looking_at_alnum (win))
return;
- }
+ }
if (!point_next_line (win))
return;
col = 0;
@@ -1233,7 +1233,7 @@ point_backward_word (WINDOW *win)
goto back_to_word_start;
}
-back_to_word_start:
+ back_to_word_start:
while (point_backward_char (win))
{
if (!looking_at_alnum (win))
@@ -1358,13 +1358,13 @@ DECLARE_INFO_COMMAND (info_beginning_of_line, _("Move
to the start of the line")
{
int old_point = window->point;
int point;
-
+
while (1)
{
point = window->line_map.map[0];
if (point == window->line_starts[0]
|| looking_at_newline (window, point-1))
- break;
+ break;
if (!point_prev_line (window))
break;
}
@@ -1743,7 +1743,7 @@ gc_file_buffers_and_nodes (void)
{
FILE_BUFFER *fb = info_loaded_files[fb_index];
- /* Each node should match at most one file, either a subfile or
a
+ /* Each node should match at most one file, either a subfile or a
non-split file. */
if (fb->flags & F_Subfile)
{
@@ -1786,7 +1786,7 @@ gc_file_buffers_and_nodes (void)
if ((fb->flags & F_IsCompressed) && !gc_compressed_files)
continue;
- /* Don't free file buffers corresponding to files that aren't there
+ /* Don't free file buffers corresponding to files that aren't there
any more, because a node may still refer to them. */
if (fb->flags & F_Gone)
continue;
@@ -2064,7 +2064,7 @@ info_select_reference (WINDOW *window, REFERENCE *entry)
NODE *node;
char *file_system_error = NULL;
- /* We need to copy everything from entry because the call to
+ /* We need to copy everything from entry because the call to
info_get_node_with_defaults can free it if it came from
the tag table of a file. */
char *filename = entry->filename;
@@ -2211,7 +2211,7 @@ menu_digit (WINDOW *window, int key)
/* Check if there is a menu in this node. */
if (references)
{
- int i;
+ int i;
for (i = 0; references[i]; i++)
if (references[i]->type == REFERENCE_MENU_ITEM)
goto has_menu;
@@ -2219,7 +2219,7 @@ menu_digit (WINDOW *window, int key)
info_error ("%s", msg_no_menu_node);
return;
-has_menu:
+ has_menu:
if ((entry = select_menu_digit (window, key)))
info_select_reference (window, entry);
@@ -2277,7 +2277,7 @@ info_menu_or_ref_item (WINDOW *window, int menu_item, int
xref, int ask_p)
int which, closest = -1;
- reference_bool_fn exclude;
+ reference_bool_fn exclude;
if (!refs)
return;
@@ -2443,7 +2443,7 @@ DECLARE_INFO_COMMAND (info_menu_item, _("Read a menu item
and select its node"))
if (window->node->references)
{
REFERENCE **r;
-
+
/* Check if there is a menu in this node. */
for (r = window->node->references; *r; r++)
if ((*r)->type == REFERENCE_MENU_ITEM)
@@ -2468,7 +2468,7 @@ DECLARE_INFO_COMMAND
if (window->node->references)
{
REFERENCE **r;
-
+
/* Check if there is a cross-reference in this node. */
for (r = window->node->references; *r; r++)
if ((*r)->type == REFERENCE_XREF)
@@ -2535,7 +2535,7 @@ DECLARE_INFO_COMMAND (info_visit_menu,
if (!menu)
{
info_error ("%s", msg_no_menu_node);
- return;
+ return;
}
for (i = 0; (entry = menu[i]); i++)
@@ -2664,7 +2664,7 @@ DECLARE_INFO_COMMAND (info_move_to_prev_xref,
count--;
continue;
}
-
+
info_error ("%s", msg_no_xref_node);
return;
}
@@ -2724,7 +2724,7 @@ DECLARE_INFO_COMMAND (info_move_to_next_xref,
count--;
continue;
}
-
+
info_error ("%s", msg_no_xref_node);
return;
}
@@ -2768,7 +2768,7 @@ DECLARE_INFO_COMMAND (info_select_reference_this_line,
return null. This function frees INITIAL_NODE. */
NODE *
info_follow_menus (NODE *initial_node, char **menus, char **error,
- int strict)
+ int strict)
{
NODE *node = NULL;
@@ -2778,7 +2778,7 @@ info_follow_menus (NODE *initial_node, char **menus, char
**error,
char *arg = *menus; /* Remember the name of the menu entry we want. */
debug (3, ("looking for %s in %s:%s", arg, initial_node->fullpath,
- initial_node->nodename));
+ initial_node->nodename));
if (!initial_node->references)
{
@@ -2821,14 +2821,14 @@ info_follow_menus (NODE *initial_node, char **menus,
char **error,
}
debug (3, ("entry: %s, %s", entry->filename, entry->nodename));
-
+
/* Try to find this node. */
node = info_get_node_with_defaults (entry->filename, entry->nodename,
initial_node);
if (!node)
{
- debug (3, ("no matching node found"));
- if (error)
+ debug (3, ("no matching node found"));
+ if (error)
{
free (*error);
xasprintf (error,
@@ -2846,7 +2846,7 @@ info_follow_menus (NODE *initial_node, char **menus, char
**error,
}
debug (3, ("node: %s, %s", node->fullpath, node->nodename));
-
+
/* Success. Go round the loop again. */
free_history_node (initial_node);
initial_node = node;
@@ -3183,11 +3183,11 @@ forward_move_node_structure (WINDOW *window, int
behaviour)
info_error ("%s",
_("No more nodes within this document"));
return 1;
-
+
case SLN_Top:
info_parse_and_select ("Top", window);
return 0;
-
+
default:
abort ();
}
@@ -3374,7 +3374,7 @@ DECLARE_INFO_COMMAND (info_goto_node, _("Read a node name
and select it"))
fb->filename, fb->tags[i]->nodename);
}
- add_pointer_to_array (entry, items_index, items,
+ add_pointer_to_array (entry, items_index, items,
items_slots, 100);
}
}
@@ -3431,7 +3431,7 @@ find_invocation_node_by_nodename (FILE_BUFFER *fb, char
*program)
/* Find the node in the file with name FILE that is the best candidate to
list the PROGRAM's invocation info and its command-line options, by looking
for menu items and chains of menu items with characteristic names. This
- function frees NODE. Return value should be freed by caller with
+ function frees NODE. Return value should be freed by caller with
info_reference_free. */
REFERENCE *
info_intuit_options_node (NODE *node, char *program)
@@ -3463,10 +3463,10 @@ info_intuit_options_node (NODE *node, char *program)
char *filename = node->fullpath;
if (!strcmp ("Top", node->nodename))
{
- /* Look through the list of nodes (and anchors) in the file for a node
to
- start at. There may be an invocation node that is not listed in the
- top-level menu (this is the case for the Bash 4.2 manual), or it may
- be referred to with an anchor ("Invoking makeinfo" in Texinfo
+ /* Look through the list of nodes (and anchors) in the file for a node to
+ start at. There may be an invocation node that is not listed in the
+ top-level menu (this is the case for the Bash 4.2 manual), or it may
+ be referred to with an anchor ("Invoking makeinfo" in Texinfo
manual). */
FILE_BUFFER *fb;
NODE *n;
@@ -3513,7 +3513,7 @@ info_intuit_options_node (NODE *node, char *program)
if (!entry)
break;
- /* Go down into menu, and repeat. */
+ /* Go down into menu, and repeat. */
if (!entry->filename)
entry->filename = xstrdup (filename);
@@ -3536,8 +3536,8 @@ info_intuit_options_node (NODE *node, char *program)
}
}
-/* Given a name of an Info file, find the name of the package it describes by
- removing the leading directories and extensions. Return value should be
+/* Given a name of an Info file, find the name of the package it describes by
+ removing the leading directories and extensions. Return value should be
freed by caller. */
char *
program_name_from_file_name (char *file_name)
@@ -3644,7 +3644,7 @@ DECLARE_INFO_COMMAND (info_dir_node, _("Select the node
'(dir)'"))
}
DECLARE_INFO_COMMAND (info_display_file_info,
- _("Show full file name of node being displayed"))
+ _("Show full file name of node being displayed"))
{
if (window->node->fullpath && *window->node->fullpath)
{
@@ -3654,7 +3654,7 @@ DECLARE_INFO_COMMAND (info_display_file_info,
? window->node->subfile
: window->node->fullpath,
line, window->line_count,
- line * 100 / window->line_count);
+ line * 100 / window->line_count);
}
else
window_message_in_echo_area ("Internal node");
@@ -3759,7 +3759,7 @@ dump_nodes_to_file (REFERENCE **references,
{
int i;
FILE *output_stream;
-
+
if (!references)
return;
@@ -3797,13 +3797,13 @@ dump_nodes_to_file (REFERENCE **references,
nodename = "Top";
if (dump_node_to_stream (file_buffer, nodename,
output_stream, dump_subnodes) == DUMP_SYS_ERROR)
- {
- info_error (_("error writing to %s: %s"), output_filename,
+ {
+ info_error (_("error writing to %s: %s"), output_filename,
strerror (errno));
- exit (EXIT_FAILURE);
- }
+ exit (EXIT_FAILURE);
+ }
}
-
+
if (output_stream != stdout)
fclose (output_stream);
@@ -3826,7 +3826,7 @@ initialize_dumping (void)
static int
dump_node_to_stream (FILE_BUFFER *file_buffer,
char *nodename,
- FILE *stream, int dump_subnodes)
+ FILE *stream, int dump_subnodes)
{
register int i;
NODE *node;
@@ -3996,7 +3996,7 @@ info_search_in_node_internal (WINDOW *window, NODE *node,
long new_point;
MATCH_STATE matches;
-
+
/* Check if we need to calculate new results. */
if (!matches_ready (&window->matches)
|| strcmp (window->search_string, string)
@@ -4014,7 +4014,7 @@ info_search_in_node_internal (WINDOW *window, NODE *node,
matches = window->matches;
result = search_success;
}
-
+
if (result != search_success)
return result;
@@ -4051,7 +4051,7 @@ info_search_in_node_internal (WINDOW *window, NODE *node,
start1 = node->body_start;
if (end1 < node->body_start)
end1 = node->body_start;
-
+
result = match_in_match_list (&matches, start1, end1, dir, &match_index);
if (result != search_success)
return result;
@@ -4088,7 +4088,7 @@ info_search_in_node_internal (WINDOW *window, NODE *node,
Return non-zero if the search fails. */
static int
info_search_internal (char *string, WINDOW *window,
- int dir, int case_sensitive,
+ int dir, int case_sensitive,
long *start_off)
{
register int i;
@@ -4102,7 +4102,7 @@ info_search_internal (char *string, WINDOW *window,
TAG *tag;
char *msg = 0;
int first_time = 1;
-
+
/* If this node isn't part of a larger file, search this node only. */
file_buffer = file_buffer_of_window (window);
if (!file_buffer || !file_buffer->tags
@@ -4131,7 +4131,7 @@ info_search_internal (char *string, WINDOW *window,
/* Set starting position of search. */
start = *start_off;
-
+
/* Search through subsequent nodes, wrapping around to the top
of the Info file until we find the string or return to this
window's node and point. */
@@ -4163,12 +4163,12 @@ info_search_internal (char *string, WINDOW *window,
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
+ Bail out. (We searched the second time in case there were matches
before the starting offset.) */
if (current_tag == starting_tag && !first_time)
break;
first_time = 0;
-
+
/* Find the next tag that isn't an anchor. */
for (i = current_tag + dir; ; i += dir)
{
@@ -4182,7 +4182,7 @@ info_search_internal (char *string, WINDOW *window,
msg = N_("Search continued from the beginning of the document");
i = 0;
}
-
+
tag = file_buffer->tags[i];
if (!(tag->flags & T_IsAnchor))
break;
@@ -4239,14 +4239,14 @@ info_search_internal (char *string, WINDOW *window,
if (!echo_area_is_active)
info_error ("%s", _("Search failed"));
-funexit:
+ funexit:
return -1;
}
/* Minimal length of a search string */
int min_search_length = 1;
-/* Read a string from the user, storing the result in SEARCH_STRING. Return 0
+/* Read a string from the user, storing the result in SEARCH_STRING. Return 0
if the user aborted. */
static int
ask_for_search_string (int case_sensitive, int use_regex, int direction)
@@ -4298,7 +4298,7 @@ ask_for_search_string (int case_sensitive, int use_regex,
int direction)
WINDOW The window to search in
COUNT The sign of this argument defines the search
direction (negative for searching backwards);
- its absolute value gives number of repetitions.
+ its absolute value gives number of repetitions.
CASE_SENSITIVE Whether the search is case-sensitive or not.
*/
static void
@@ -4329,7 +4329,7 @@ info_search_1 (WINDOW *window, int count, int
case_sensitive)
window->node->active_menu = 0;
start_off = window->point + direction;
-
+
/* If the search string includes upper-case letters, make the search
case-sensitive. */
if (case_sensitive == 0)
@@ -4346,7 +4346,7 @@ info_search_1 (WINDOW *window, int count, int
case_sensitive)
for (result = 0; result == 0 && count--; )
result = info_search_internal (search_string,
active_window, direction, case_sensitive,
- &start_off);
+ &start_off);
window_adjust_pagetop (window);
@@ -4379,7 +4379,7 @@ tag_of_reference (REFERENCE *r, WINDOW *window,
FILE_BUFFER **fb, TAG ***t)
if (!strcmp (nodename, (**t)->nodename))
goto found_tag;
return 0;
-found_tag: ;
+ found_tag: ;
return 1;
}
@@ -4409,7 +4409,7 @@ tree_search_check_node (WINDOW *window)
string = xstrdup (window->search_string);
goto check_node;
-check_node:
+ check_node:
result = info_search_in_node_internal (window, window->node,
string,
window->point + 1,
@@ -4429,9 +4429,9 @@ check_node:
goto check_menus;
/* At this juncture, window->node->active_menu is the index of the last
- reference in the node to have been checked, plus one. BEFORE_MENU is a
+ reference in the node to have been checked, plus one. BEFORE_MENU is a
special code to say that none of them have been checked. */
-check_menus:
+ check_menus:
if (!(window->node->flags & N_IsIndex)) /* Don't go down menus in index */
{ /* nodes, because this leads to loops. */
REFERENCE *r;
@@ -4465,7 +4465,7 @@ check_menus:
}
goto go_up;
-go_up:
+ go_up:
/* If no more menu entries, try going back. */
if (window->hist_index >= 2
&& window->hist[window->hist_index - 2]->node->active_menu != 0)
@@ -4508,7 +4508,7 @@ go_up:
}
info_error (previous_match ? _("No more matches") : _("Search failed"));
-funexit:
+ funexit:
free (string);
} /*********** end tree_search_check_node *************/
@@ -4527,7 +4527,7 @@ tree_search_check_node_backwards (WINDOW *window)
string = xstrdup (window->search_string);
goto check_node;
-check_node:
+ check_node:
result = info_search_in_node_internal (window, window->node,
string,
window->point - 1,
@@ -4545,9 +4545,9 @@ check_node:
/* Check through menus in current node, in reverse order.
At this juncture, window->node->active_menu is the index of the last
- reference in the node to have been checked, plus one. BEFORE_MENU is a
+ reference in the node to have been checked, plus one. BEFORE_MENU is a
special code to say that none of them have been checked. */
-check_menus:
+ check_menus:
if (!(window->node->flags & N_IsIndex)) /* Don't go down menus in index */
{ /* nodes, because this leads to loops. */
REFERENCE *r;
@@ -4568,8 +4568,8 @@ check_menus:
if (!tag_of_reference (r, window, &file_buffer, &tag))
continue;
- /* This inverts what is done for the forwards search. It's
- possible that we will visit the nodes in a different order if
+ /* This inverts what is done for the forwards search. It's
+ possible that we will visit the nodes in a different order if
there is more than one reference to a node. */
if (!((*tag)->flags & T_SeenBySearch))
continue;
@@ -4596,7 +4596,7 @@ check_menus:
goto check_node;
/* Try going back. */
-go_up:
+ go_up:
if (window->hist_index >= 2
&& window->hist[window->hist_index - 2]->node->active_menu != 0)
{
@@ -4621,7 +4621,7 @@ go_up:
/* Otherwise, no result. */
info_error (previous_match ? _("No more matches") : _("Search failed"));
-funexit:
+ funexit:
free (string);
} /*********** end tree_search_check_node_backwards *************/
@@ -4735,16 +4735,16 @@ DECLARE_INFO_COMMAND (info_search_next,
/* Find window bottom */
long n = window->height + window->pagetop;
if (n < window->line_count)
- start_off = window->line_starts[n];
+ start_off = window->line_starts[n];
else
- start_off = window->node->nodelen;
+ start_off = window->node->nodelen;
}
for (result = 0; result == 0 && count--; )
result = info_search_internal (search_string,
active_window, 1,
last_search_case_sensitive,
- &start_off);
+ &start_off);
if (result == 0 && window->node == starting_node && search_skip_screen_p)
{
@@ -4791,7 +4791,7 @@ DECLARE_INFO_COMMAND (info_search_previous,
result = info_search_internal (search_string,
active_window, -1,
last_search_case_sensitive,
- &start_off);
+ &start_off);
if (result == 0 && window->node == starting_node && search_skip_screen_p)
{
@@ -5109,7 +5109,7 @@ incremental_search (WINDOW *window, int count)
key = get_input_key ();
}
}
-gotfunc:
+ gotfunc:
if (func == &ea_quoted_insert)
{
@@ -5156,7 +5156,7 @@ gotfunc:
while (isearch_string_index > 0
&& (long) mbrlen (isearch_string + isearch_string_index,
end - isearch_string_index, NULL) <= 0);
-
+
isearch_string[isearch_string_index] = '\0';
if (isearch_string_index == 0)
@@ -5263,7 +5263,7 @@ gotfunc:
}
/* Show the new search string in the prompt. */
- show_isearch_prompt (dir, (unsigned char *) isearch_string,
+ show_isearch_prompt (dir, (unsigned char *) isearch_string,
search_result);
/* Make the search case-sensitive only if the search string includes
@@ -5314,8 +5314,8 @@ gotfunc:
/* Free the memory used to remember each search state. */
free_isearch_states ();
- /* Alter the window history so that we have added at most one node in the
- incremental search, so that going back once with "l" goes to where we
+ /* Alter the window history so that we have added at most one node in the
+ incremental search, so that going back once with "l" goes to where we
started the incremental search if the match was in a different node. */
{
int i = window->hist_index - 1;
@@ -5525,7 +5525,7 @@ get_another_input_key (void)
timer.tv_sec = 1;
timer.tv_usec = 750;
ready = select (fileno(info_input_stream)+1, &readfds,
- NULL, NULL, &timer);
+ NULL, NULL, &timer);
#else
ready = 0;
#endif /* FD_SET */
@@ -5549,14 +5549,14 @@ int ea_explicit_arg = 0;
void info_universal_argument (WINDOW *, int count);
void info_add_digit_to_numeric_arg (WINDOW *, int count);
-/* Read a key sequence and look up its command in MAP. Handle C-u style
- numeric args, as well as M--, and M-digits. Return argument in COUNT if it
+/* Read a key sequence and look up its command in MAP. Handle C-u style
+ numeric args, as well as M--, and M-digits. Return argument in COUNT if it
is non-null.
Some commands can be executed directly, in which case null is returned
instead:
- If MENU, call info_menu_digit on ACTIVE_WINDOW if a number key was
+ If MENU, call info_menu_digit on ACTIVE_WINDOW if a number key was
pressed.
If MOUSE, call mouse_event_handler if a mouse event occurred.
@@ -5612,7 +5612,7 @@ read_key_sequence (Keymap map, int menu, int mouse,
if (active_window != the_echo_area)
display_cursor_at_point (active_window);
- /* If reading a universal argument, both <digit> and M-<digit> help form
+ /* If reading a universal argument, both <digit> and M-<digit> help form
the argument. Don't look up the pressed key in the key map. */
if (reading_universal_argument)
{
@@ -5691,7 +5691,7 @@ read_key_sequence (Keymap map, int menu, int mouse,
else if (func == &info_universal_argument)
{
/* Multiply by 4. */
- /* TODO: Maybe C-u should also terminate the universal argument
+ /* TODO: Maybe C-u should also terminate the universal argument
sequence, as in Emacs. (C-u 6 4 C-u 1 inserts 64 1's.) */
if (!*which_explicit_arg)
numeric_arg *= 4;
@@ -5717,9 +5717,9 @@ read_key_sequence (Keymap map, int menu, int mouse,
}
else if (func)
{
- /* Don't update the key sequence if we have finished reading a key
- sequence in the echo area. This means that a key sequence like
- "C-u 2 Left" appears to take effect immediately, instead of there
+ /* Don't update the key sequence if we have finished reading a key
+ sequence in the echo area. This means that a key sequence like
+ "C-u 2 Left" appears to take effect immediately, instead of there
being a delay while the message is displayed. */
if (!echo_area_is_active && info_keyseq_displayed_p)
display_info_keyseq (0);
@@ -5727,8 +5727,8 @@ read_key_sequence (Keymap map, int menu, int mouse,
if (count)
*count = numeric_arg * numeric_arg_sign;
- /* *which_explicit_arg has not been set yet if only a sequence of
- C-u's was typed (each of which has multiplied the argument by
+ /* *which_explicit_arg has not been set yet if only a sequence of
+ C-u's was typed (each of which has multiplied the argument by
four). */
if (*count != 1 && !*which_explicit_arg)
*which_explicit_arg = 1;
diff --git a/info/util.c b/info/util.c
index dd5f45b3bd..3d616b3a80 100644
--- a/info/util.c
+++ b/info/util.c
@@ -141,7 +141,7 @@ ansi_escape (mbi_iterator_t iter, int *plen)
ITER_SETBYTES (iter, 1);
mbi_advance (iter);
if (isdigit (*mbi_cur_ptr (iter)) && mbi_avail (iter))
- {
+ {
ITER_SETBYTES (iter, 1);
mbi_advance (iter);
if (*mbi_cur_ptr (iter) == 'm')
@@ -162,7 +162,7 @@ ansi_escape (mbi_iterator_t iter, int *plen)
}
}
}
-
+
return 0;
}
@@ -170,9 +170,9 @@ static struct text_buffer printed_rep = { 0 };
/* Return pointer to string that is the printed representation of character
(or other logical unit) at ITER if it were printed at screen column
- PL_CHARS. Use ITER_SETBYTES (util.h) on ITER if we need to advance
- past a unit that the multibyte iteractor doesn't know about (like an ANSI
- escape sequence). If ITER points at an end-of-line character, set *DELIM
to
+ PL_CHARS. Use ITER_SETBYTES (util.h) on ITER if we need to advance
+ past a unit that the multibyte iteractor doesn't know about (like an ANSI
+ escape sequence). If ITER points at an end-of-line character, set *DELIM to
this character. *PCHARS gets the number of screen columns taken up by
outputting the return value, and *PBYTES the number of bytes in returned
string. Return value is not null-terminated. Return value must not be
@@ -216,7 +216,7 @@ printed_representation (mbi_iterator_t *iter, int *delim,
size_t pl_chars,
}
else if (ansi_escape (*iter, &cur_len))
{
- *pchars = 0;
+ *pchars = 0;
*pbytes = cur_len;
ITER_SETBYTES (*iter, cur_len);
@@ -265,10 +265,10 @@ printed_representation (mbi_iterator_t *iter, int *delim,
size_t pl_chars,
}
else
{
- /* Original byte was not recognized as anything. Display its octal
+ /* Original byte was not recognized as anything. Display its octal
value. This could happen in the C locale for bytes above 128,
- or for bytes 128-159 in an ISO-8859-1 locale. Don't output the bytes
- as they are, because they could have special meaning to the
+ or for bytes 128-159 in an ISO-8859-1 locale. Don't output the bytes
+ as they are, because they could have special meaning to the
terminal. */
*pchars = 4;
*pbytes = 4;
@@ -300,31 +300,31 @@ text_buffer_vprintf (struct text_buffer *buf, const char
*format, va_list ap)
if (!buf->base)
{
if (buf->size == 0)
- buf->size = MIN_TEXT_BUF_ALLOC; /* Initial allocation */
-
+ buf->size = MIN_TEXT_BUF_ALLOC; /* Initial allocation */
+
buf->base = xmalloc (buf->size);
}
-
+
for (;;)
{
va_copy (ap_copy, ap);
n = vsnprintf (buf->base + buf->off, buf->size - buf->off,
- format, ap_copy);
+ format, ap_copy);
va_end (ap_copy);
if (n < 0 || buf->off + n >= buf->size ||
- !memchr (buf->base + buf->off, '\0', buf->size - buf->off + 1))
- {
- size_t newlen = buf->size * 2;
- if (newlen < buf->size)
- xalloc_die ();
- buf->size = newlen;
- buf->base = xrealloc (buf->base, buf->size);
- }
+ !memchr (buf->base + buf->off, '\0', buf->size - buf->off + 1))
+ {
+ size_t newlen = buf->size * 2;
+ if (newlen < buf->size)
+ xalloc_die ();
+ buf->size = newlen;
+ buf->base = xrealloc (buf->base, buf->size);
+ }
else
- {
- buf->off += n;
- break;
- }
+ {
+ buf->off += n;
+ break;
+ }
}
return n;
}
@@ -337,7 +337,7 @@ text_buffer_alloc (struct text_buffer *buf, size_t len)
{
buf->size = buf->off + len;
if (buf->size < MIN_TEXT_BUF_ALLOC)
- buf->size = MIN_TEXT_BUF_ALLOC;
+ buf->size = MIN_TEXT_BUF_ALLOC;
buf->base = xrealloc (buf->base, buf->size);
}
}
@@ -401,13 +401,13 @@ text_buffer_fill (struct text_buffer *buf, int c, size_t
len)
{
char *p;
size_t i;
-
+
text_buffer_alloc (buf, len);
-
+
for (i = 0, p = buf->base + buf->off; i < len; i++)
*p++ = c;
buf->off += len;
-
+
return len;
}
@@ -423,7 +423,7 @@ text_buffer_printf (struct text_buffer *buf, const char
*format, ...)
{
va_list ap;
size_t n;
-
+
va_start (ap, format);
n = text_buffer_vprintf (buf, format, ap);
va_end (ap);
@@ -439,10 +439,10 @@ fncmp (const char *fn1, const char *fn2)
const char *s1 = fn1, *s2 = fn2;
while (tolower (*s1) == tolower (*s2)
- || (IS_SLASH (*s1) && IS_SLASH (*s2)))
+ || (IS_SLASH (*s1) && IS_SLASH (*s2)))
{
if (*s1 == 0)
- return 0;
+ return 0;
s1++;
s2++;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * info/indices.c, info/infodoc.c, info/infomap.c, info/man.c, info/search.c, info/session.c, info/util.c: replace tabs by spaces. Changes in spacing.,
Patrice Dumas <=