o __P has been reoved

o Old-style K&R declarations have been converted to new C89 style
o register has been removed
o prototype for main() has been removed (gcc3 makes it an error)
o int main(int argc, char *argv[]) is the preferred main definition.
o Attempt to not break style(9) conformance for declarations more than
  they already are.
o gc some #ifdef sun ... #endif code

Approved by: arch@, new style(9)

1 files changed, 73 insertions, 88 deletions

diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index ad9c38f..1a03bb1 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -175,92 +175,80 @@ if ((i) > (n)) { \
 /* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */
 #define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0')
 
-#ifdef sun
-# define strerror(n) sys_errlist[n]
-#endif
-
-#ifndef __P
-# ifndef __STDC__
-#  define __P(proto) ()
-# else
-#  define __P(proto) proto
-# endif
-#endif
-
 /* Local Function Declarations */
-void add_line_node __P((line_t *));
-int append_lines __P((long));
-int apply_subst_template __P((const char *, regmatch_t *, int, int));
-int build_active_list __P((int));
-int cbc_decode __P((char *, FILE *));
-int cbc_encode __P((char *, int, FILE *));
-int check_addr_range __P((long, long));
-void clear_active_list __P((void));
-void clear_undo_stack __P((void));
-int close_sbuf __P((void));
-int copy_lines __P((long));
-int delete_lines __P((long, long));
-void des_error __P((const char *));
-int display_lines __P((long, long, int));
-line_t *dup_line_node __P((line_t *));
-int exec_command __P((void));
-long exec_global __P((int, int));
-void expand_des_key __P((char *, char *));
-int extract_addr_range __P((void));
-char *extract_pattern __P((int));
-int extract_subst_tail __P((int *, long *));
-char *extract_subst_template __P((void));
-int filter_lines __P((long, long, char *));
-int flush_des_file __P((FILE *));
-line_t *get_addressed_line_node __P((long));
-pattern_t *get_compiled_pattern __P((void));
-int get_des_char __P((FILE *));
-char *get_extended_line __P((int *, int));
-char *get_filename __P((void));
-int get_keyword __P((void));
-long get_line_node_addr __P((line_t *));
-long get_matching_node_addr __P((pattern_t *, int));
-long get_marked_node_addr __P((int));
-char *get_sbuf_line __P((line_t *));
-int get_shell_command __P((void));
-int get_stream_line __P((FILE *));
-int get_tty_line __P((void));
-void handle_hup __P((int));
-void handle_int __P((int));
-void handle_winch __P((int));
-int has_trailing_escape __P((char *, char *));
-int hex_to_binary __P((int, int));
-void init_buffers __P((void));
-void init_des_cipher __P((void));
-int is_legal_filename __P((char *));
-int join_lines __P((long, long));
-int mark_line_node __P((line_t *, int));
-int move_lines __P((long));
-line_t *next_active_node __P((void));
-long next_addr __P((void));
-int open_sbuf __P((void));
-char *parse_char_class __P((char *));
-int pop_undo_stack __P((void));
-undo_t *push_undo_stack __P((int, long, long));
-int put_des_char __P((int, FILE *));
-const char *put_sbuf_line __P((const char *));
-int put_stream_line __P((FILE *, const char *, int));
-int put_tty_line __P((const char *, int, long, int));
-void quit __P((int));
-long read_file __P((char *, long));
-long read_stream __P((FILE *, long));
-int search_and_replace __P((pattern_t *, int, int));
-int set_active_node __P((line_t *));
-void set_des_key __P((char *));
-void signal_hup __P((int));
-void signal_int __P((int));
-char *strip_escapes __P((char *));
-int substitute_matching_text __P((pattern_t *, line_t *, int, int));
-char *translit_text __P((char *, int, int, int));
-void unmark_line_node __P((line_t *));
-void unset_active_nodes __P((line_t *, line_t *));
-long write_file __P((char *, const char *, long, long));
-long write_stream __P((FILE *, long, long));
+void add_line_node(line_t *);
+int append_lines(long);
+int apply_subst_template(const char *, regmatch_t *, int, int);
+int build_active_list(int);
+int cbc_decode(char *, FILE *);
+int cbc_encode(char *, int, FILE *);
+int check_addr_range(long, long);
+void clear_active_list(void);
+void clear_undo_stack(void);
+int close_sbuf(void);
+int copy_lines(long);
+int delete_lines(long, long);
+void des_error(const char *);
+int display_lines(long, long, int);
+line_t *dup_line_node(line_t *);
+int exec_command(void);
+long exec_global(int, int);
+void expand_des_key(char *, char *);
+int extract_addr_range(void);
+char *extract_pattern(int);
+int extract_subst_tail(int *, long *);
+char *extract_subst_template(void);
+int filter_lines(long, long, char *);
+int flush_des_file(FILE *);
+line_t *get_addressed_line_node(long);
+pattern_t *get_compiled_pattern(void);
+int get_des_char(FILE *);
+char *get_extended_line(int *, int);
+char *get_filename(void);
+int get_keyword(void);
+long get_line_node_addr(line_t *);
+long get_matching_node_addr(pattern_t *, int);
+long get_marked_node_addr(int);
+char *get_sbuf_line(line_t *);
+int get_shell_command(void);
+int get_stream_line(FILE *);
+int get_tty_line(void);
+void handle_hup(int);
+void handle_int(int);
+void handle_winch(int);
+int has_trailing_escape(char *, char *);
+int hex_to_binary(int, int);
+void init_buffers(void);
+void init_des_cipher(void);
+int is_legal_filename(char *);
+int join_lines(long, long);
+int mark_line_node(line_t *, int);
+int move_lines(long);
+line_t *next_active_node(void);
+long next_addr(void);
+int open_sbuf(void);
+char *parse_char_class(char *);
+int pop_undo_stack(void);
+undo_t *push_undo_stack(int, long, long);
+int put_des_char(int, FILE *);
+const char *put_sbuf_line(const char *);
+int put_stream_line(FILE *, const char *, int);
+int put_tty_line(const char *, int, long, int);
+void quit(int);
+long read_file(char *, long);
+long read_stream(FILE *, long);
+int search_and_replace(pattern_t *, int, int);
+int set_active_node(line_t *);
+void set_des_key(char *);
+void signal_hup(int);
+void signal_int(int);
+char *strip_escapes(char *);
+int substitute_matching_text(pattern_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 *);
+long write_file(char *, const char *, long, long);
+long write_stream(FILE *, long, long);
 
 /* global buffers */
 extern char stdinbuf[];
@@ -282,6 +270,3 @@ extern const char *errmsg;
 extern long first_addr;
 extern int lineno;
 extern long second_addr;
-#ifdef sun
-extern char *sys_errlist[];
-#endif