summaryrefslogtreecommitdiff
path: root/bin/ed/ed.h
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2015-10-04 15:23:25 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2015-10-04 15:23:25 +0000
commitbca7820f6d7d6ed76cf0693b7090e778c03308b4 (patch)
treee99dbbe84c0c7fcc4dd92f9bba0baa54107d3c13 /bin/ed/ed.h
parent056d154b1a27de5b2d2f86066ac045ec10f4b332 (diff)
Remove useless pattern_t typedef, POSIX regex is here to stay so
just use regex_t directly.
Diffstat (limited to 'bin/ed/ed.h')
-rw-r--r--bin/ed/ed.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 25dffc6404c..2a5109dccad 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ed.h,v 1.17 2015/10/04 15:03:24 millert Exp $ */
+/* $OpenBSD: ed.h,v 1.18 2015/10/04 15:23:24 millert Exp $ */
/* $NetBSD: ed.h,v 1.23 1995/03/21 09:04:40 cgd Exp $ */
/* ed.h: type and constant definitions for the ed editor. */
@@ -55,8 +55,6 @@
#define GNP 010 /* enumerate after command */
#define GSG 020 /* global substitute */
-typedef regex_t pattern_t;
-
/* Line node */
typedef struct line {
struct line *q_forw;
@@ -170,11 +168,11 @@ char *extract_pattern(int);
int extract_subst_tail(int *, int *);
char *extract_subst_template(void);
line_t *get_addressed_line_node(int);
-pattern_t *get_compiled_pattern(void);
+regex_t *get_compiled_pattern(void);
char *get_extended_line(int *, int);
char *get_filename(void);
int get_line_node_addr(line_t *);
-int get_matching_node_addr(pattern_t *, int);
+int get_matching_node_addr(regex_t *, int);
int get_marked_node_addr(int);
char *get_sbuf_line(line_t *);
int get_shell_command(void);
@@ -200,13 +198,13 @@ int put_tty_line(char *, int, int, int);
void quit(int);
int read_file(char *, int);
int read_stream(FILE *, int);
-int search_and_replace(pattern_t *, int, int);
+int search_and_replace(regex_t *, int, int);
int set_active_node(line_t *);
void seterrmsg(char *);
void signal_hup(int);
void signal_int(int);
char *strip_escapes(char *);
-int substitute_matching_text(pattern_t *, line_t *, int, int);
+int substitute_matching_text(regex_t *, line_t *, int, int);
char *translit_text(char *, int, int, int);
void unmark_line_node(line_t *);
void unset_active_nodes(line_t *, line_t *);