[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5530] avoid double typedef; couple of small fixes
From: |
Gavin D. Smith |
Subject: |
[5530] avoid double typedef; couple of small fixes |
Date: |
Wed, 07 May 2014 22:46:08 +0000 |
Revision: 5530
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5530
Author: gavin
Date: 2014-05-07 22:46:07 +0000 (Wed, 07 May 2014)
Log Message:
-----------
avoid double typedef; couple of small fixes
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/filesys.c
trunk/info/info-utils.c
trunk/info/nodes.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-05-07 22:06:11 UTC (rev 5529)
+++ trunk/ChangeLog 2014-05-07 22:46:07 UTC (rev 5530)
@@ -1,3 +1,14 @@
+2014-05-07 Gavin Smith <address@hidden>
+
+ * info/filesys.c (filesys_error_string): Correct comment about
+ whether return value should be freed by caller or not.
+
+ * info/info-utils.c (scan_reference_label): Remove superseded
+ correction to 'end' field of REFERENCE.
+
+ * info/nodes.h: Avoid double WINDOW typedef. Reported by
+ Benno Schulenberg 06 May 2014.
+
2014-05-07 Karl Berry <address@hidden>
* configure.ac (AC_INIT): go to 5.2dev, to reduce confusion
Modified: trunk/info/filesys.c
===================================================================
--- trunk/info/filesys.c 2014-05-07 22:06:11 UTC (rev 5529)
+++ trunk/info/filesys.c 2014-05-07 22:46:07 UTC (rev 5530)
@@ -572,8 +572,8 @@
static char *errmsg_buf = NULL;
static int errmsg_buf_size = 0;
-/* Return string for ERROR_NUM when opening file. Return value to be freed
- by caller. */
+/* Return string for ERROR_NUM when opening file. Return value should not
+ be freed by caller. */
char *
filesys_error_string (char *filename, int error_num)
{
Modified: trunk/info/info-utils.c
===================================================================
--- trunk/info/info-utils.c 2014-05-07 22:06:11 UTC (rev 5529)
+++ trunk/info/info-utils.c 2014-05-07 22:46:07 UTC (rev 5530)
@@ -1137,14 +1137,6 @@
entry->end = entry->start + label_len;
}
- /* Text of reference ends later in node because of terminal
- control characters that were output. */
- if (preprocess_nodes_p)
- {
- entry->end += strlen (ANSI_UNDERLINING_ON);
- entry->end += strlen (ANSI_UNDERLINING_OFF);
- }
-
return entry;
}
Modified: trunk/info/nodes.h
===================================================================
--- trunk/info/nodes.h 2014-05-07 22:06:11 UTC (rev 5529)
+++ trunk/info/nodes.h 2014-05-07 22:46:07 UTC (rev 5530)
@@ -166,12 +166,14 @@
If the node cannot be found, return a NULL pointer. */
extern NODE *info_get_node (char *filename, char *nodename, int flag);
-/* Forward declaration to avoid node.h and window.h having to
- include each other. */
-typedef struct window_struct WINDOW;
+/* struct window_struct is typedef as WINDOW in window.h, but we cannot
+ include window.h in this file (nodes.h), because window.h includes
+ nodes.h. */
+struct window_struct;
extern NODE *info_get_node_with_defaults (char *filename, char *nodename,
- int flag, WINDOW *window);
+ int flag,
+ struct window_struct *window);
extern NODE *info_node_of_tag (FILE_BUFFER *fb, NODE **tag_ptr);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5530] avoid double typedef; couple of small fixes,
Gavin D. Smith <=