formatting & ordering

source/display.c

@@ -35,6 +35,10 @@
  *    display functions
  */
 
+#include <ncurses.h>
+#include <time.h>
+#include <errno.h>
+
 #include "global.h"
 #include "build.h"
 #include "colors.h"
@@ -45,20 +49,14 @@
 # include "version.inc"
 #endif
 
-#include <ncurses.h>
-#include <stdarg.h> /* va_list stuff */
-#include <time.h>
-#include <errno.h>
-#include <stdarg.h>
-
 /* XXX */
 #define MSGLINE 0							/* message line */
 #define MSGCOL	0							/* message column */
 static int * displine; /* screen line of displayed reference */
 
-int filelen		 = sizeof("File") - 1;		/* file name display field length */
+int filelen = sizeof("File") - 1;		/* file name display field length */
-int fcnlen		 = sizeof("Function") - 1;	/* function name display field length */
+int fcnlen  = sizeof("Function") - 1;	/* function name display field length */
-int numlen		 = 0;						/* line number display field length */
+int numlen  = 0;						/* line number display field length */
 
 unsigned int disprefs;						/* displayed references */
 int			 field;							/* input field */

source/global.h

@@ -216,9 +216,7 @@ void	   verswp_window(void);
 bool	   interpret(int c);	// XXX: probably rename
 int		   handle_input(const int c);
 int		   dispchar2int(const char c);
-int		   process_mouse();
+int		   changestring(const char *from, const char *to, const bool *const change, const int change_len);
-int		   changestring(const char *from, const char *to, const bool *const change,
-		   const int change_len);
 
 void init_temp_files(void);
 void deinit_temp_files(void);
@@ -229,51 +227,51 @@ void PCS_reset(void);
 
 void rlinit(void);
 
-void		addsrcfile(char *path);
+void addsrcfile(char *path);
-void		askforchar(void);
+void askforchar(void);
-void		askforreturn(void);
+void askforreturn(void);
-void		cannotwrite(const char *const file);
+void cannotwrite(const char *const file);
-void		cannotopen(const char *const file);
+void cannotopen(const char *const file);
-void		clearmsg(void);
+void clearmsg(void);
-void		clearmsg2(void);
+void clearmsg2(void);
-void		countrefs(void);
+void countrefs(void);
-void		crossref(char *srcfile);
+void crossref(char *srcfile);
-void		dispinit(void);
+void edit(const char * filename, const char *const linenum);
-void		display(void);
+void editall(void);
-void		redisplay(void);
+void editref(int);
-void		drawscrollbar(int top, int bot);
+void force_window(void);
-void		edit(const char * filename, const char *const linenum);
+void findcleanup(void);
-void		editall(void);
+void freesrclist(void);
-void		editref(int);
+void freeinclist(void);
-void		entercurses(void);
+void freecrossref(void);
-void		exitcurses(void);
+void freefilelist(void);
-void		force_window(void);
+void incfile(char *file, char *type);
-void		findcleanup(void);
+void includedir(const char *dirname);
-void		freesrclist(void);
+void initsymtab(void);
-void		freeinclist(void);
+void makefilelist(const char * const * const argv);
-void		freecrossref(void);
+void myexit(int sig);
-void		freefilelist(void);
+void myperror(char *text);
-const char *help(void);
+void progress(char *what, long current, long max);
-void		incfile(char *file, char *type);
+void putfilename(char *srcfile);
-void		includedir(const char *dirname);
+void postmsg(char *msg);
-void		initsymtab(void);
+void postmsg2(char *msg);
-void		makefilelist(const char * const * const argv);
+void posterr(char *msg, ...);
-void		mousecleanup(void);
+void postfatal(const char *msg, ...);
-void		myexit(int sig);
+void putposting(char *term, int type);
-void		myperror(char *text);
+void fetch_string_from_dbase(char *, size_t);
-void		progress(char *what, long current, long max);
+void sourcedir(const char * dirlist);
-void		putfilename(char *srcfile);
+void myungetch(int c);
-void		postmsg(char *msg);
+void warning(char *text);
-void		postmsg2(char *msg);
+void writestring(char *s);
-void		posterr(char *msg, ...);
+
-void		postfatal(const char *msg, ...);
+void entercurses(void);
-void		putposting(char *term, int type);
+void exitcurses(void);
-void		fetch_string_from_dbase(char *, size_t);
+void drawscrollbar(int top, int bot);
-void		shellpath(char *out, int limit, char *in);
+void dispinit(void);
-void		sourcedir(const char * dirlist);
+void display(void);
-void		myungetch(int c);
+void redisplay(void);
-void		warning(char *text);
+
-void		writestring(char *s);
+void shellpath(char *out, int limit, char *in);
 
 bool infilelist(const char * file);
 bool readrefs(char *filename);
@@ -287,5 +285,7 @@ int	 hash(const char * ss);
 int	 execute(char *a, ...);
 long dbseek(long offset);
 
+void mousecleanup(void);
+int process_mouse();
 
 #endif /* CSCOPE_GLOBAL_H */

source/help.c

@@ -80,7 +80,8 @@ static char help_msg[] =
 	"^D\t\tExit the program.\n"
 	"\nNote: If the first character of the pattern you want to search for matches\n"
 	"a command, type a \\ character first.\n"
-	"Note: Some ctrl keys may be occupied by your terminal configuration.\n";
+	"Note: Some ctrl keys may be occupied by your terminal configuration.\n"
+;
 
 static char changeing_help_msg[] =
 	"When changing text, you can use these single-character commands:\n\n"
@@ -94,9 +95,10 @@ static char changeing_help_msg[] =
 	"ESC\t\tExit without changing the marked lines.\n"
 	"!\t\tStart an interactive shell (type ^D to return).\n"
 	"^L\t\tRedraw the screen.\n"
-	"?\t\tDisplay this list of commands.\n";
+	"?\t\tDisplay this list of commands.\n"
+;
 
-const char *help(void) {
+const char * help(void) {
 	switch (input_mode) {
 		case INPUT_CHANGE:
 		case INPUT_CHANGE_TO: