[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Gavin D. Smith |
|
Date: |
Wed, 16 Mar 2022 16:35:35 -0400 (EDT) |
branch: master
commit a9239e5434fdaddfd2ec621248eef4ac643c3280
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Mar 16 20:20:05 2022 +0000
Rename info/info-utils.c
* info/info-utils.c, info/scan.c: Rename file.
---
ChangeLog | 6 ++++++
info/Makefile.am | 5 +++--
info/dir.c | 2 +-
info/display.h | 2 +-
info/echo-area.c | 2 +-
info/footnotes.c | 2 +-
info/indices.c | 2 +-
info/info.c | 2 +-
info/infodoc.c | 2 +-
info/infopath.c | 2 +-
info/man.c | 1 +
info/nodemenu.c | 1 +
info/nodes.c | 2 +-
info/{info-utils.c => scan.c} | 6 +++---
info/{info-utils.h => scan.h} | 6 +++---
info/search.c | 2 +-
info/tag.c | 2 +-
info/tag.h | 2 +-
info/variables.h | 1 -
info/window.c | 2 +-
20 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f3bc3ea89e..ce18af6bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Rename info/info-utils.c
+
+ * info/info-utils.c, info/scan.c: Rename file.
+
2022-03-16 Gavin Smith <gavinsmith0123@gmail.com>
Split info/info-utils.c
diff --git a/info/Makefile.am b/info/Makefile.am
index 15ad2714b0..1fd039ab1d 100644
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -32,9 +32,10 @@ EXTRA_DIST = pcterm.c
ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \
echo-area.c echo-area.h \
filesys.c filesys.h footnotes.c footnotes.h indices.c indices.h \
- info-utils.c info-utils.h info.c info.h infodoc.c infokey.c \
+ info.c info.h infodoc.c infokey.c \
infomap.c infomap.h infopath.c m-x.c man.c man.h nodemenu.c \
- nodes.c nodes.h search.c search.h session.c session.h signals.c signals.h \
+ nodes.c nodes.h scan.c scan.h \
+ search.c search.h session.c session.h signals.c signals.h \
tag.c tag.h termdep.h terminal.c terminal.h tilde.c tilde.h \
util.c util.h variables.c variables.h window.c window.h
nodist_ginfo_SOURCES = doc.c funs.h
diff --git a/info/dir.c b/info/dir.c
index d92e4ce3fd..852d4b1387 100644
--- a/info/dir.c
+++ b/info/dir.c
@@ -18,7 +18,7 @@
Originally written by Brian Fox. */
#include "info.h"
-#include "info-utils.h"
+#include "scan.h"
#include "filesys.h"
#include "tilde.h"
diff --git a/info/display.h b/info/display.h
index df9dcbb978..d66d44c39f 100644
--- a/info/display.h
+++ b/info/display.h
@@ -20,7 +20,7 @@
#ifndef INFO_DISPLAY_H
#define INFO_DISPLAY_H
-#include "info-utils.h"
+#include "scan.h"
#include "terminal.h"
typedef struct {
diff --git a/info/echo-area.c b/info/echo-area.c
index 910297ec18..fa134ab7a6 100644
--- a/info/echo-area.c
+++ b/info/echo-area.c
@@ -20,7 +20,7 @@
#include "info.h"
#include "session.h"
#include "display.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "echo-area.h"
diff --git a/info/footnotes.c b/info/footnotes.c
index 4f4bd19442..d0cc520a6a 100644
--- a/info/footnotes.c
+++ b/info/footnotes.c
@@ -19,7 +19,7 @@
#include "info.h"
#include "session.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "footnotes.h"
diff --git a/info/indices.c b/info/indices.c
index 078de86b4e..ead09f0a1f 100644
--- a/info/indices.c
+++ b/info/indices.c
@@ -18,7 +18,7 @@
Originally written by Brian Fox. */
#include "info.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "session.h"
#include "echo-area.h"
diff --git a/info/info.c b/info/info.c
index 33fbeb481a..df609b1d0f 100644
--- a/info/info.c
+++ b/info/info.c
@@ -19,7 +19,7 @@
#include "info.h"
#include "filesys.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "session.h"
#include "indices.h"
diff --git a/info/infodoc.c b/info/infodoc.c
index 144470d070..9cd2222ffd 100644
--- a/info/infodoc.c
+++ b/info/infodoc.c
@@ -18,7 +18,7 @@
Originally written by Brian Fox. */
#include "info.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "filesys.h"
#include "session.h"
diff --git a/info/infopath.c b/info/infopath.c
index 07ed3d1383..24b8f41219 100644
--- a/info/infopath.c
+++ b/info/infopath.c
@@ -17,7 +17,7 @@
*/
#include "info.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "session.h"
#include "filesys.h"
diff --git a/info/man.c b/info/man.c
index a9fb3a63e6..8eae36cb40 100644
--- a/info/man.c
+++ b/info/man.c
@@ -31,6 +31,7 @@
#include "nodes.h"
#include "man.h"
#include "variables.h"
+#include "scan.h"
#if !defined (_POSIX_VERSION)
#define pid_t int
diff --git a/info/nodemenu.c b/info/nodemenu.c
index 88ef04da08..07c285b765 100644
--- a/info/nodemenu.c
+++ b/info/nodemenu.c
@@ -20,6 +20,7 @@
#include "info.h"
#include "session.h"
#include "util.h"
+#include "scan.h"
#include "echo-area.h"
#include "variables.h"
diff --git a/info/nodes.c b/info/nodes.c
index f98f418912..e0e06c57d5 100644
--- a/info/nodes.c
+++ b/info/nodes.c
@@ -22,7 +22,7 @@
#include "nodes.h"
#include "search.h"
#include "filesys.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "tag.h"
#include "man.h"
diff --git a/info/info-utils.c b/info/scan.c
similarity index 99%
rename from info/info-utils.c
rename to info/scan.c
index 45cce26c33..f5e065e703 100644
--- a/info/info-utils.c
+++ b/info/scan.c
@@ -1,4 +1,4 @@
-/* info-utils.c -- miscellanous.
+/* scan.c -- miscellanous.
Copyright 1993-2020 Free Software Foundation, Inc.
@@ -19,7 +19,7 @@
#include "info.h"
#include "session.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "tag.h"
@@ -470,7 +470,7 @@ 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 (info-utils.h) on ITER if we need to advance
+ PL_CHARS. Use ITER_SETBYTES (scan.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
diff --git a/info/info-utils.h b/info/scan.h
similarity index 96%
rename from info/info-utils.h
rename to info/scan.h
index 4dbd6e1bc6..1097d1a6f6 100644
--- a/info/info-utils.h
+++ b/info/scan.h
@@ -1,4 +1,4 @@
-/* info-utils.h -- Exported functions and variables from info-utils.c.
+/* scan.h -- Exported functions and variables from scan.c.
Copyright 1993-2019 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@
Originally written by Brian Fox. */
-#ifndef INFO_UTILS_H
-#define INFO_UTILS_H
+#ifndef SCAN_H
+#define SCAN_H
#include "nodes.h"
#include "window.h"
diff --git a/info/search.c b/info/search.c
index 990e3e9a43..3da4e5a334 100644
--- a/info/search.c
+++ b/info/search.c
@@ -21,7 +21,7 @@
#include <regex.h>
#include "session.h"
-#include "info-utils.h"
+#include "scan.h"
#include "search.h"
diff --git a/info/tag.c b/info/tag.c
index 1f4226c73d..d9bee42206 100644
--- a/info/tag.c
+++ b/info/tag.c
@@ -18,7 +18,7 @@
#include "info.h"
#include "tag.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
struct tag_handler
diff --git a/info/tag.h b/info/tag.h
index 71b03d1fa4..ca250ff3a2 100644
--- a/info/tag.h
+++ b/info/tag.h
@@ -18,7 +18,7 @@
#ifndef TAG_H
#define TAG_H
-#include "info-utils.h"
+#include "util.h"
int tag_expand (char **input, char *input_end,
struct text_buffer *outbuf, int *is_index);
diff --git a/info/variables.h b/info/variables.h
index a5f7a93683..b445fbdc66 100644
--- a/info/variables.h
+++ b/info/variables.h
@@ -21,7 +21,6 @@
#define INFO_VARIABLES_H
#include "window.h"
-#include "info-utils.h"
/* A variable (in the Info sense) is an integer value with a user-visible
name. You may supply an array of strings to complete over when the
diff --git a/info/window.c b/info/window.c
index 4112d514cb..d00b2ba78e 100644
--- a/info/window.c
+++ b/info/window.c
@@ -20,7 +20,7 @@
#include "info.h"
#include "session.h"
#include "display.h"
-#include "info-utils.h"
+#include "scan.h"
#include "util.h"
#include "doc.h"
#include "tag.h"