run make indent

1 files changed, 170 insertions, 134 deletions

diff --git a/proto.h b/proto.h
index 9fc35f1..0c36b31 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.7 2001/11/23 19:00:47 ukai Exp $ */
+/* $Id: proto.h,v 1.8 2001/11/24 02:01:26 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -104,19 +104,24 @@ extern void setAlarmEvent(int sec, short status, int cmd, void *data);
 #else
 #define setAlarm nulcmd
 #endif
-extern int currentLn(Buffer * buf);
-extern void tmpClearBuffer(Buffer * buf);
+extern int currentLn(Buffer *buf);
+extern void tmpClearBuffer(Buffer *buf);
 extern char *filename_extension(char *patch, int is_url);
 extern void examineFile(char *path, URLFile *uf);
 extern int dir_exist(char *path);
-extern Str convertLine(URLFile * uf, Str line, char *code, int mode);
+extern Str convertLine(URLFile *uf, Str line, char *code, int mode);
 extern Buffer *loadFile(char *path);
-extern Buffer *loadGeneralFile(char *path, ParsedURL * current, char *referer, int flag, FormList * request);
+extern Buffer *loadGeneralFile(char *path, ParsedURL *current, char *referer,
+			       int flag, FormList *request);
 extern int is_boundary(int, int);
 extern int is_blank_line(char *line, int indent);
-extern void push_render_image(Str str, int width, int limit, struct html_feed_environ *h_env);
-extern void flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, int force, int width);
-extern void do_blankline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, int indent_incr, int width);
+extern void push_render_image(Str str, int width, int limit,
+			      struct html_feed_environ *h_env);
+extern void flushline(struct html_feed_environ *h_env, struct readbuffer *obuf,
+		      int indent, int force, int width);
+extern void do_blankline(struct html_feed_environ *h_env,
+			 struct readbuffer *obuf, int indent, int indent_incr,
+			 int width);
 extern void purgeline(struct html_feed_environ *h_env);
 extern void save_fonteffect(struct html_feed_environ *h_env,
 			    struct readbuffer *obuf);
@@ -134,30 +139,35 @@ extern Str process_n_textarea(void);
 extern void feed_textarea(char *str);
 extern Str process_form(struct parsed_tag *tag);
 extern Str process_n_form(void);
-extern int HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env);
-extern void HTMLlineproc2(Buffer * buf, TextLineList * tl);
-extern void HTMLlineproc0(char *istr, struct html_feed_environ *h_env, int internal);
+extern int HTMLtagproc1(struct parsed_tag *tag,
+			struct html_feed_environ *h_env);
+extern void HTMLlineproc2(Buffer *buf, TextLineList *tl);
+extern void HTMLlineproc0(char *istr, struct html_feed_environ *h_env,
+			  int internal);
 #define HTMLlineproc1(x,y) HTMLlineproc0(x,y,TRUE)
-extern Buffer *loadHTMLBuffer(URLFile * f, Buffer * newBuf);
+extern Buffer *loadHTMLBuffer(URLFile *f, Buffer *newBuf);
 extern void showProgress(int *linelen, int *trbyte);
 extern void init_henv(struct html_feed_environ *, struct readbuffer *,
 		      struct environment *, int, TextLineList *, int, int);
-extern void completeHTMLstream(struct html_feed_environ *, struct readbuffer *);
-extern void loadHTMLstream(URLFile * f, Buffer * newBuf, FILE * src, int internal);
+extern void completeHTMLstream(struct html_feed_environ *,
+			       struct readbuffer *);
+extern void loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src,
+			   int internal);
 extern Buffer *loadHTMLString(Str page);
 #ifdef USE_GOPHER
-extern Buffer *loadGopherDir(URLFile * uf, Buffer * newBuf);
+extern Buffer *loadGopherDir(URLFile *uf, Buffer *newBuf);
 #endif				/* USE_GOPHER */
-extern Buffer *loadBuffer(URLFile * uf, Buffer * newBuf);
-extern void saveBuffer(Buffer * buf, FILE * f);
-extern void saveBufferDelNum(Buffer * buf, FILE * f, int del);
+extern Buffer *loadBuffer(URLFile *uf, Buffer *newBuf);
+extern void saveBuffer(Buffer *buf, FILE * f);
+extern void saveBufferDelNum(Buffer *buf, FILE * f, int del);
 extern Buffer *getshell(char *cmd);
 extern Buffer *getpipe(char *cmd);
-extern Buffer *openPagerBuffer(InputStream stream, Buffer * buf);
+extern Buffer *openPagerBuffer(InputStream stream, Buffer *buf);
 extern Buffer *openGeneralPagerBuffer(InputStream stream);
-extern Line *getNextPage(Buffer * buf, int plen);
+extern Line *getNextPage(Buffer *buf, int plen);
 extern int save2tmp(URLFile uf, char *tmpf);
-extern int doExternal(URLFile uf, char *path, char *type, Buffer **bufp, Buffer *defaultbuf);
+extern int doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
+		      Buffer *defaultbuf);
 extern void doFileCopy(char *tmpf, char *defstr);
 extern void doFileMove(char *tmpf, char *defstr);
 extern void doFileSave(URLFile uf, char *defstr);
@@ -165,30 +175,31 @@ extern int checkCopyFile(char *path1, char *path2);
 extern int checkSaveFile(InputStream stream, char *path);
 extern int checkOverWrite(char *path);
 extern int matchattr(char *p, char *attr, int len, Str *value);
-extern char *checkHeader(Buffer * buf, char *field);
+extern char *checkHeader(Buffer *buf, char *field);
 extern Buffer *newBuffer(int width);
 extern Buffer *nullBuffer(void);
-extern void clearBuffer(Buffer * buf);
-extern void discardBuffer(Buffer * buf);
-extern Buffer *namedBuffer(Buffer * first, char *name);
-extern Buffer *deleteBuffer(Buffer * first, Buffer * delbuf);
-extern Buffer *replaceBuffer(Buffer * first, Buffer * delbuf, Buffer * newbuf);
-extern Buffer *nthBuffer(Buffer * firstbuf, int n);
-extern void gotoRealLine(Buffer * buf, int n);
-extern void gotoLine(Buffer * buf, int n);
-extern Buffer *selectBuffer(Buffer * firstbuf, Buffer * currentbuf, char *selectchar);
-extern void reshapeBuffer(Buffer * buf);
-extern void copyBuffer(Buffer * a, Buffer * b);
-extern Buffer *prevBuffer(Buffer * first, Buffer * buf);
+extern void clearBuffer(Buffer *buf);
+extern void discardBuffer(Buffer *buf);
+extern Buffer *namedBuffer(Buffer *first, char *name);
+extern Buffer *deleteBuffer(Buffer *first, Buffer *delbuf);
+extern Buffer *replaceBuffer(Buffer *first, Buffer *delbuf, Buffer *newbuf);
+extern Buffer *nthBuffer(Buffer *firstbuf, int n);
+extern void gotoRealLine(Buffer *buf, int n);
+extern void gotoLine(Buffer *buf, int n);
+extern Buffer *selectBuffer(Buffer *firstbuf, Buffer *currentbuf,
+			    char *selectchar);
+extern void reshapeBuffer(Buffer *buf);
+extern void copyBuffer(Buffer *a, Buffer *b);
+extern Buffer *prevBuffer(Buffer *first, Buffer *buf);
 extern int writeBufferCache(Buffer *buf);
 extern int readBufferCache(Buffer *buf);
 extern void fmTerm(void);
 extern void fmInit(void);
-extern void displayBuffer(Buffer * buf, int mode);
-extern void redrawBuffer(Buffer * buf);
-extern void redrawNLine(Buffer * buf, int n);
-extern Line *redrawLine(Buffer * buf, Line * l, int i);
-extern int redrawLineRegion(Buffer * buf, Line * l, int i, int bpos, int epos);
+extern void displayBuffer(Buffer *buf, int mode);
+extern void redrawBuffer(Buffer *buf);
+extern void redrawNLine(Buffer *buf, int n);
+extern Line *redrawLine(Buffer *buf, Line *l, int i);
+extern int redrawLineRegion(Buffer *buf, Line *l, int i, int bpos, int epos);
 extern void do_effects(Lineprop m);
 #ifdef USE_ANSI_COLOR
 extern void do_color(Linecolor c);
@@ -199,48 +210,50 @@ extern void record_err_message(char *s);
 extern Buffer *message_list_panel(void);
 extern void message(char *s, int return_x, int return_y);
 #define disp_err_message(s, f) (record_err_message((s)), disp_message((s), (f)))
-extern void disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse);
+extern void disp_message_nsec(char *s, int redraw_current, int sec, int purge,
+			      int mouse);
 extern void disp_message(char *s, int redraw_current);
 #ifdef USE_MOUSE
 extern void disp_message_nomouse(char *s, int redraw_current);
 #else
 #define disp_message_nomouse disp_message
 #endif
-extern void cursorUp(Buffer * buf, int n);
-extern void cursorDown(Buffer * buf, int n);
-extern void cursorUpDown(Buffer * buf, int n);
-extern void cursorRight(Buffer * buf, int n);
-extern void cursorLeft(Buffer * buf, int n);
-extern void cursorHome(Buffer * buf);
-extern void arrangeCursor(Buffer * buf);
-extern void arrangeLine(Buffer * buf);
-extern void cursorXY(Buffer * buf, int x, int y);
+extern void cursorUp(Buffer *buf, int n);
+extern void cursorDown(Buffer *buf, int n);
+extern void cursorUpDown(Buffer *buf, int n);
+extern void cursorRight(Buffer *buf, int n);
+extern void cursorLeft(Buffer *buf, int n);
+extern void cursorHome(Buffer *buf);
+extern void arrangeCursor(Buffer *buf);
+extern void arrangeLine(Buffer *buf);
+extern void cursorXY(Buffer *buf, int x, int y);
 extern int arg_is(char *str, char *tag);
-extern int columnSkip(Buffer * buf, int offset);
-extern int columnPos(Line * line, int column);
-extern Line *lineSkip(Buffer * buf, Line * line, int offset, int last);
-extern Line *currentLineSkip(Buffer * buf, Line * line, int offset, int last);
+extern int columnSkip(Buffer *buf, int offset);
+extern int columnPos(Line *line, int column);
+extern Line *lineSkip(Buffer *buf, Line *line, int offset, int last);
+extern Line *currentLineSkip(Buffer *buf, Line *line, int offset, int last);
 extern int gethtmlcmd(char **s, int *status);
 extern char *getAnchor(char *arg, char **arg_return);
-extern Str checkType(Str s, Lineprop * oprop,
+extern Str checkType(Str s, Lineprop *oprop,
 #ifdef USE_ANSI_COLOR
-		     Linecolor * ocolor, int * check_color,
+		     Linecolor *ocolor, int *check_color,
 #endif
 		     int len);
-extern int calcPosition(char *l, Lineprop *pr, int len, int pos, int bpos, int mode);
+extern int calcPosition(char *l, Lineprop *pr, int len, int pos, int bpos,
+			int mode);
 extern char *lastFileName(char *path);
 extern char *mybasename(char *s);
 extern char *mydirname(char *s);
 extern int next_status(char c, int *status);
 extern int read_token(Str buf, char **instr, int *status, int pre, int append);
 extern Str correct_irrtag(int status);
-extern int forwardSearch(Buffer * buf, char *str);
-extern int backwardSearch(Buffer * buf, char *str);
-extern void	pcmap ( void );
+extern int forwardSearch(Buffer *buf, char *str);
+extern int backwardSearch(Buffer *buf, char *str);
+extern void pcmap(void);
 extern void escmap(void);
 extern void escbmap(void);
 extern void escdmap(char c);
-extern char *inputLineHist(char *prompt, char *def_str, int flag, Hist * hist);
+extern char *inputLineHist(char *prompt, char *def_str, int flag, Hist *hist);
 #ifdef USE_HISTORY
 extern Buffer *historyBuffer(Hist *hist);
 extern void loadHistory(Hist *hist);
@@ -257,44 +270,56 @@ extern void align(TextLine *lbuf, int width, int mode);
 extern void print_item(struct table *t, int row, int col, int width, Str buf);
 extern void print_sep(struct table *t, int row, int type, int maxcol, Str buf);
 extern void do_refill(struct table *tbl, int row, int col, int maxlimit);
-extern void renderTable(struct table *t, int max_width, struct html_feed_environ *h_env);
-extern struct table *begin_table(int border, int spacing, int padding, int vspace);
-extern void end_table(struct table * tbl);
+extern void renderTable(struct table *t, int max_width,
+			struct html_feed_environ *h_env);
+extern struct table *begin_table(int border, int spacing, int padding,
+				 int vspace);
+extern void end_table(struct table *tbl);
 extern void check_rowcol(struct table *tbl, struct table_mode *mode);
 extern int minimum_length(char *line);
-extern int feed_table(struct table *tbl, char *line, struct table_mode *mode, int width, int internal);
-extern void feed_table1(struct table *tbl, Str tok, struct table_mode *mode, int width);
+extern int feed_table(struct table *tbl, char *line, struct table_mode *mode,
+		      int width, int internal);
+extern void feed_table1(struct table *tbl, Str tok, struct table_mode *mode,
+			int width);
 extern void pushTable(struct table *, struct table *);
-extern struct form_list *newFormList(char *action, char *method, char *charset, char *enctype, char *target, char *name, struct form_list *_next);
-extern struct form_item_list *formList_addInput(struct form_list *fl, struct parsed_tag *tag);
-extern char *form2str(FormItemList * fi);
+extern struct form_list *newFormList(char *action, char *method, char *charset,
+				     char *enctype, char *target, char *name,
+				     struct form_list *_next);
+extern struct form_item_list *formList_addInput(struct form_list *fl,
+						struct parsed_tag *tag);
+extern char *form2str(FormItemList *fi);
 extern int formtype(char *typestr);
-extern void formRecheckRadio(Anchor * a, Buffer * buf, FormItemList * form);
-extern void formResetBuffer(Buffer * buf, AnchorList * formitem);
-extern void formUpdateBuffer(Anchor * a, Buffer * buf, FormItemList * form);
+extern void formRecheckRadio(Anchor *a, Buffer *buf, FormItemList *form);
+extern void formResetBuffer(Buffer *buf, AnchorList *formitem);
+extern void formUpdateBuffer(Anchor *a, Buffer *buf, FormItemList *form);
 extern Str textfieldrep(Str s, int width);
-extern void input_textarea(FormItemList * fi);
+extern void input_textarea(FormItemList *fi);
 extern void do_internal(char *action, char *data);
 extern void form_write_data(FILE * f, char *boundary, char *name, char *value);
-extern void form_write_from_file(FILE * f, char *boundary, char *name, char *filename, char *file);
+extern void form_write_from_file(FILE * f, char *boundary, char *name,
+				 char *filename, char *file);
 extern void follow_map(struct parsed_tagarg *arg);
 #ifdef MENU_MAP
-extern char *follow_map_menu(Buffer * buf, struct parsed_tagarg *arg, int x, int y);
+extern char *follow_map_menu(Buffer *buf, struct parsed_tagarg *arg, int x,
+			     int y);
 #else
-extern Buffer *follow_map_panel(Buffer * buf, struct parsed_tagarg *arg);
+extern Buffer *follow_map_panel(Buffer *buf, struct parsed_tagarg *arg);
 #endif
-extern Buffer *page_info_panel(Buffer * buf);
+extern Buffer *page_info_panel(Buffer *buf);
 extern struct frame_body *newFrame(struct parsed_tag *tag, Buffer *buf);
 extern struct frameset *newFrameSet(struct parsed_tag *tag);
-extern void addFrameSetElement(struct frameset *f, union frameset_element element);
+extern void addFrameSetElement(struct frameset *f,
+			       union frameset_element element);
 extern void deleteFrame(struct frame_body *b);
 extern void deleteFrameSet(struct frameset *f);
 extern void deleteFrameSetElement(union frameset_element e);
 extern struct frameset *copyFrameSet(struct frameset *of);
-extern void pushFrameTree(struct frameset_queue **fqpp, struct frameset *fs, Buffer *buf);
+extern void pushFrameTree(struct frameset_queue **fqpp, struct frameset *fs,
+			  Buffer *buf);
 extern struct frameset *popFrameTree(struct frameset_queue **fqpp);
-extern void resetFrameElement(union frameset_element *f_element, Buffer * buf, char *referer, FormList * request);
-extern Buffer *renderFrame(Buffer * Cbuf, int force_reload);
+extern void resetFrameElement(union frameset_element *f_element, Buffer *buf,
+			      char *referer, FormList *request);
+extern Buffer *renderFrame(Buffer *Cbuf, int force_reload);
 extern union frameset_element *search_frame(struct frameset *fset, char *name);
 extern int set_tty(void);
 extern void set_cc(int spec, int val);
@@ -367,17 +392,21 @@ extern char *code_to_str(char code);
 extern void put_sjis(Str os, unsigned char ub, unsigned char lb);
 #endif				/* JP_CHARSET */
 extern void free_ssl_ctx();
-extern ParsedURL *baseURL(Buffer * buf);
-extern int openSocket(char *hostname, char *remoteport_name, unsigned short remoteport_num);
-extern void parseURL(char *url, ParsedURL * p_url, ParsedURL * current);
-extern void copyParsedURL(ParsedURL * p, ParsedURL * q);
-extern void parseURL2(char *url, ParsedURL * pu, ParsedURL * current);
-extern Str parsedURL2Str(ParsedURL * pu);
+extern ParsedURL *baseURL(Buffer *buf);
+extern int openSocket(char *hostname, char *remoteport_name,
+		      unsigned short remoteport_num);
+extern void parseURL(char *url, ParsedURL *p_url, ParsedURL *current);
+extern void copyParsedURL(ParsedURL *p, ParsedURL *q);
+extern void parseURL2(char *url, ParsedURL *pu, ParsedURL *current);
+extern Str parsedURL2Str(ParsedURL *pu);
 extern int getURLScheme(char **url);
 extern void init_stream(URLFile *uf, int scheme, InputStream stream);
-extern URLFile openURL(char *url, ParsedURL * pu, ParsedURL * current, URLOption * option, FormList * request, TextList * extra_header, URLFile * ouf, unsigned char *status);
+extern URLFile openURL(char *url, ParsedURL *pu, ParsedURL *current,
+		       URLOption *option, FormList *request,
+		       TextList *extra_header, URLFile *ouf,
+		       unsigned char *status);
 extern char *guessContentType(char *filename);
-extern TextList* make_domain_list(char *domain_list);
+extern TextList *make_domain_list(char *domain_list);
 extern int check_no_proxy(char *domain);
 extern char *filename_extension(char *path, int is_url);
 extern int mailcapMatch(struct mailcap *mcap, char *type);
@@ -385,33 +414,38 @@ extern struct mailcap *loadMailcap(char *filename);
 extern struct mailcap *searchMailcap(struct mailcap *table, char *type);
 extern void initMailcap();
 extern struct mailcap *searchExtViewer(char *type);
-extern Str unquote_mailcap(char *qstr, char *type, char *name, char *attr, int *stat);
+extern Str unquote_mailcap(char *qstr, char *type, char *name, char *attr,
+			   int *stat);
 extern char *guessContentType(char *filename);
 extern TextList *make_domain_list(char *domain_list);
 extern int check_no_proxy(char *domain);
-extern FILE *openFTP(ParsedURL * pu);
+extern FILE *openFTP(ParsedURL *pu);
 extern void closeFTP(FILE * f);
 extern int Ftpfclose(FILE * f);
-extern AnchorList * putAnchor(AnchorList * al, char *url, char *target, Anchor ** anchor_return, char *referer, int line, int pos);
-extern Anchor *registerHref(Buffer * buf, char *url, char *target, char *referer, int line, int pos);
-extern Anchor *registerName(Buffer * buf, char *url, int line, int pos);
-extern Anchor *registerImg(Buffer * buf, char *url, int line, int pos);
-extern Anchor *registerForm(Buffer * buf, FormList * flist, struct parsed_tag *tag, int line, int pos);
-extern int onAnchor(Anchor * a, int line, int pos);
-extern Anchor *retrieveAnchor(AnchorList * al, int line, int pos);
-extern Anchor *retrieveCurrentAnchor(Buffer * buf);
-extern Anchor *retrieveCurrentImg(Buffer * buf);
-extern Anchor *retrieveCurrentForm(Buffer * buf);
-extern Anchor *searchAnchor(AnchorList * al, char *str);
-extern Anchor *searchURLLabel(Buffer * buf, char *url);
-extern char *reAnchor(Buffer * buf, char *re);
+extern AnchorList *putAnchor(AnchorList *al, char *url, char *target,
+			     Anchor **anchor_return, char *referer, int line,
+			     int pos);
+extern Anchor *registerHref(Buffer *buf, char *url, char *target,
+			    char *referer, int line, int pos);
+extern Anchor *registerName(Buffer *buf, char *url, int line, int pos);
+extern Anchor *registerImg(Buffer *buf, char *url, int line, int pos);
+extern Anchor *registerForm(Buffer *buf, FormList *flist,
+			    struct parsed_tag *tag, int line, int pos);
+extern int onAnchor(Anchor *a, int line, int pos);
+extern Anchor *retrieveAnchor(AnchorList *al, int line, int pos);
+extern Anchor *retrieveCurrentAnchor(Buffer *buf);
+extern Anchor *retrieveCurrentImg(Buffer *buf);
+extern Anchor *retrieveCurrentForm(Buffer *buf);
+extern Anchor *searchAnchor(AnchorList *al, char *str);
+extern Anchor *searchURLLabel(Buffer *buf, char *url);
+extern char *reAnchor(Buffer *buf, char *re);
 #ifdef USE_NNTP
-extern char *reAnchorNews(Buffer * buf, char *re);
+extern char *reAnchorNews(Buffer *buf, char *re);
 #endif				/* USE_NNTP */
 extern void addMultirowsForm(Buffer *buf, AnchorList *al);
-extern Anchor *closest_next_anchor(AnchorList * a, Anchor * an, int x, int y);
-extern Anchor *closest_prev_anchor(AnchorList * a, Anchor * an, int x, int y);
-extern HmarkerList *putHmarker(HmarkerList * ml, int line, int pos, int seq);
+extern Anchor *closest_next_anchor(AnchorList *a, Anchor *an, int x, int y);
+extern Anchor *closest_prev_anchor(AnchorList *a, Anchor *an, int x, int y);
+extern HmarkerList *putHmarker(HmarkerList *ml, int line, int pos, int seq);
 extern Str decodeB(char **ww);
 extern Str decodeQ(char **ww);
 extern Str decodeQP(char **ww);
@@ -432,11 +466,11 @@ extern char *helpFile(char *base);
 extern void setLocalCookie(void);
 extern Buffer *dirBuffer(char *dirname);
 extern void set_environ(char *var, char *value);
-extern FILE *localcgi_post(char *, char *, FormList *, char*);
-extern FILE *localcgi_get(char *, char *, char*);
+extern FILE *localcgi_post(char *, char *, FormList *, char *);
+extern FILE *localcgi_get(char *, char *, char *);
 extern Str find_auth_cookie(char *host, char *realm);
 extern void add_auth_cookie(char *host, char *realm, Str cookie);
-extern char *last_modified(Buffer * buf);
+extern char *last_modified(Buffer *buf);
 extern Str romanNumeral(int n);
 extern Str romanAlphabet(int n);
 extern void mySystem(char *command, int background);
@@ -446,9 +480,9 @@ extern Str tmpfname(int type, char *ext);
 #ifdef USE_COOKIE
 extern time_t mymktime(char *timestr);
 extern char *FQDN(char *host);
-extern Str find_cookie(ParsedURL * pu);
-extern int add_cookie(ParsedURL * pu, Str name, Str value, time_t expires,
-		Str domain, Str path, int flag, Str comment, int version,
+extern Str find_cookie(ParsedURL *pu);
+extern int add_cookie(ParsedURL *pu, Str name, Str value, time_t expires,
+		      Str domain, Str path, int flag, Str comment, int version,
 		      Str port, Str commentURL);
 extern void save_cookies(void);
 extern void load_cookies(void);
@@ -488,8 +522,8 @@ extern void msToggle(void);
 extern char *searchKeyData(void);
 
 extern void initKeymap(void);
-extern int countFuncList(FuncList * list);
-extern int getFuncList(char *id, FuncList * list, int nlist);
+extern int countFuncList(FuncList *list);
+extern int getFuncList(char *id, FuncList *list, int nlist);
 extern int getKey(char *s);
 extern void addKeyList(KeyList *list, int key, char *data);
 extern KeyListItem *searchKeyList(KeyList *list, int key);
@@ -497,29 +531,31 @@ extern char *getWord(char **str);
 extern char *getQWord(char **str);
 
 #ifdef USE_MENU
-extern void new_menu(Menu * menu, MenuItem * item);
-extern void geom_menu(Menu * menu, int x, int y, int select);
-extern void draw_all_menu(Menu * menu);
-extern void draw_menu(Menu * menu);
-extern void draw_menu_item(Menu * menu, int select);
-extern int select_menu(Menu * menu, int select);
-extern void goto_menu(Menu * menu, int select, int down);
-extern void up_menu(Menu * menu, int n);
-extern void down_menu(Menu * menu, int n);
-extern int action_menu(Menu * menu);
-extern void popup_menu(Menu * parent, Menu * menu);
-extern void guess_menu_xy(Menu * menu, int width, int *x, int *y);
-extern void new_option_menu(Menu * menu, char **label, int *variable, void (*func) ());
+extern void new_menu(Menu *menu, MenuItem *item);
+extern void geom_menu(Menu *menu, int x, int y, int select);
+extern void draw_all_menu(Menu *menu);
+extern void draw_menu(Menu *menu);
+extern void draw_menu_item(Menu *menu, int select);
+extern int select_menu(Menu *menu, int select);
+extern void goto_menu(Menu *menu, int select, int down);
+extern void up_menu(Menu *menu, int n);
+extern void down_menu(Menu *menu, int n);
+extern int action_menu(Menu *menu);
+extern void popup_menu(Menu *parent, Menu *menu);
+extern void guess_menu_xy(Menu *menu, int width, int *x, int *y);
+extern void new_option_menu(Menu *menu, char **label, int *variable,
+			    void (*func) ());
 
-extern int setMenuItem(MenuItem * item, char *type, char *line);
-extern int addMenuList(MenuList ** list, char *id);
-extern int getMenuN(MenuList * list, char *id);
+extern int setMenuItem(MenuItem *item, char *type, char *line);
+extern int addMenuList(MenuList **list, char *id);
+extern int getMenuN(MenuList *list, char *id);
 
 extern void popupMenu(int x, int y, Menu *menu);
 extern void mainMenu(int x, int y);
 extern void mainMn(void);
 extern void selMn(void);
-extern void optionMenu(int x, int y, char **label, int *variable, int initial, void (*func) ());
+extern void optionMenu(int x, int y, char **label, int *variable, int initial,
+		       void (*func) ());
 extern void initMenu(void);
 #else				/* not USE_MENU */
 #define mainMn nulcmd
@@ -534,13 +570,13 @@ extern void dictwordat(void);
 #define dictwordat nulcmd
 #endif				/* not USE_DICT */
 
-extern void reloadBuffer(Buffer * buf);
+extern void reloadBuffer(Buffer *buf);
 
 extern char *guess_save_name(Buffer *buf, char *file);
 
 extern void wrapToggle(void);
 extern void saveBufferInfo(void);
-extern char*get_os2_dft(const char*,char*);
+extern char *get_os2_dft(const char *, char *);
 
 extern void dispVer(void);