Merge style with NetBSD -- ANSI-C prototypes, style(9) tabing, etc.

This commit is contained in:
David E. O'Brien 2001-10-01 21:07:33 +00:00
parent 002a632d81
commit 3f289a0678

View File

@ -1,6 +1,3 @@
/* $FreeBSD$ */
/* $NetBSD: histedit.h,v 1.15 2000/02/28 17:41:05 chopps Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@ -37,13 +34,15 @@
* SUCH DAMAGE.
*
* @(#)histedit.h 8.2 (Berkeley) 1/3/94
* $NetBSD: histedit.h,v 1.15 2000/02/28 17:41:05 chopps Exp $
* $FreeBSD$
*/
/*
* histedit.h: Line editor and history interface.
*/
#ifndef _h_editline
#define _h_editline
#ifndef _HISTEDIT_H_
#define _HISTEDIT_H_
#include <sys/types.h>
#include <stdio.h>
@ -57,9 +56,9 @@ typedef struct editline EditLine;
* For user-defined function interface
*/
typedef struct lineinfo {
const char *buffer;
const char *cursor;
const char *lastchar;
const char *buffer;
const char *cursor;
const char *lastchar;
} LineInfo;
@ -70,28 +69,28 @@ typedef struct lineinfo {
#define CC_NORM 0
#define CC_NEWLINE 1
#define CC_EOF 2
#define CC_ARGHACK 3
#define CC_REFRESH 4
#define CC_ARGHACK 3
#define CC_REFRESH 4
#define CC_CURSOR 5
#define CC_ERROR 6
#define CC_FATAL 7
#define CC_REDISPLAY 8
#define CC_FATAL 7
#define CC_REDISPLAY 8
#define CC_REFRESH_BEEP 9
/*
* Initialization, cleanup, and resetting
*/
EditLine *el_init __P((const char *, FILE *, FILE *, FILE *));
void el_reset __P((EditLine *));
void el_end __P((EditLine *));
EditLine *el_init(const char *, FILE *, FILE *, FILE *);
void el_reset(EditLine *);
void el_end(EditLine *);
/*
* Get a line, a character or push a string back in the input queue
*/
const char *el_gets __P((EditLine *, int *));
int el_getc __P((EditLine *, char *));
void el_push __P((EditLine *, const char *));
const char *el_gets(EditLine *, int *);
int el_getc(EditLine *, char *);
void el_push(EditLine *, const char *);
/*
* Beep!
@ -102,21 +101,21 @@ void el_beep(EditLine *);
* High level function internals control
* Parses argc, argv array and executes builtin editline commands
*/
int el_parse __P((EditLine *, int, char **));
int el_parse(EditLine *, int, char **);
/*
* Low level editline access function
* Low level editline access functions
*/
int el_set __P((EditLine *, int, ...));
int el_get __P((EditLine *, int, void *));
int el_set(EditLine *, int, ...);
int el_get(EditLine *, int, void *);
/*
* el_set/el_get parameters
*/
#define EL_PROMPT 0 /* , el_pfunc_t); */
#define EL_TERMINAL 1 /* , const char *); */
#define EL_EDITOR 2 /* , const char *); */
#define EL_SIGNAL 3 /* , int); */
#define EL_PROMPT 0 /* , el_pfunc_t); */
#define EL_TERMINAL 1 /* , const char *); */
#define EL_EDITOR 2 /* , const char *); */
#define EL_SIGNAL 3 /* , int); */
#define EL_BIND 4 /* , const char *, ..., NULL); */
#define EL_TELLTC 5 /* , const char *, ..., NULL); */
#define EL_SETTC 6 /* , const char *, ..., NULL); */
@ -124,29 +123,29 @@ int el_get __P((EditLine *, int, void *));
#define EL_SETTY 8 /* , const char *, ..., NULL); */
#define EL_ADDFN 9 /* , const char *, const char * */
/* , el_func_t); */
#define EL_HIST 10 /* , hist_fun_t, const char *); */
#define EL_HIST 10 /* , hist_fun_t, const char *); */
#define EL_EDITMODE 11 /* , int); */
#define EL_RPROMPT 12 /* , el_pfunc_t); */
/*
* Source named file or $PWD/.editrc or $HOME/.editrc
*/
int el_source __P((EditLine *, const char *));
int el_source(EditLine *, const char *);
/*
* Must be called when the terminal changes size; If EL_SIGNAL
* is set this is done automatically otherwise it is the responsibility
* of the application
*/
void el_resize __P((EditLine *));
void el_resize(EditLine *);
/*
* User-defined function interface.
*/
const LineInfo *el_line __P((EditLine *));
int el_insertstr __P((EditLine *, const char *));
void el_deletestr __P((EditLine *, int));
const LineInfo *el_line(EditLine *);
int el_insertstr(EditLine *, const char *);
void el_deletestr(EditLine *, int);
/*
* ==== History ====
@ -155,19 +154,19 @@ void el_deletestr __P((EditLine *, int));
typedef struct history History;
typedef struct HistEvent {
int num;
const char *str;
int num;
const char *str;
} HistEvent;
/*
* History access functions.
*/
History * history_init __P((void));
void history_end __P((History *));
History * history_init(void);
void history_end(History *);
int history __P((History *, HistEvent *, int, ...));
int history(History *, HistEvent *, int, ...);
#define H_FUNC 0 /* , UTSL */
#define H_FUNC 0 /* , UTSL */
#define H_SETSIZE 1 /* , const int); */
#define H_EVENT 1 /* , const int); */
#define H_GETSIZE 2 /* , void); */
@ -189,4 +188,4 @@ int history __P((History *, HistEvent *, int, ...));
#define H_SAVE 18 /* , const char *); */
#define H_CLEAR 19 /* , void); */
#endif /* _h_editline */
#endif /* _HISTEDIT_H_ */