From owner-svn-src-head@FreeBSD.ORG Sat Nov 5 07:18:53 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5573106564A; Sat, 5 Nov 2011 07:18:53 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A38868FC14; Sat, 5 Nov 2011 07:18:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA57Irq1053811; Sat, 5 Nov 2011 07:18:53 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA57Ir75053803; Sat, 5 Nov 2011 07:18:53 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111050718.pA57Ir75053803@svn.freebsd.org> From: Ed Schouten Date: Sat, 5 Nov 2011 07:18:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227101 - in head/games: bcd caesar fortune/fortune fortune/unstr grdc morse number X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2011 07:18:53 -0000 Author: ed Date: Sat Nov 5 07:18:53 2011 New Revision: 227101 URL: http://svn.freebsd.org/changeset/base/227101 Log: Add static keywords to variables and functions where possible in games/. This allows us to detect unused functions and variables and allows the compiler to do a better job at optimisation. Modified: head/games/bcd/bcd.c head/games/caesar/caesar.c head/games/fortune/fortune/fortune.c head/games/fortune/unstr/unstr.c head/games/grdc/grdc.c head/games/morse/morse.c head/games/number/number.c Modified: head/games/bcd/bcd.c ============================================================================== --- head/games/bcd/bcd.c Sat Nov 5 01:42:54 2011 (r227100) +++ head/games/bcd/bcd.c Sat Nov 5 07:18:53 2011 (r227101) @@ -82,7 +82,7 @@ static const char rcsid[] = #include #include -u_short holes[256] = { +static u_short holes[256] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, @@ -117,7 +117,7 @@ u_short holes[256] = { 0x202, 0x201, 0x082, 0x806, 0x822, 0x600, 0x282, 0x0 }; -void printcard(char *); +static void printcard(char *); /* * i'th bit of w. @@ -148,7 +148,7 @@ main(int argc, char **argv) #define COLUMNS 48 -void +static void printcard(char *str) { static char rowchars[] = " 123456789"; Modified: head/games/caesar/caesar.c ============================================================================== --- head/games/caesar/caesar.c Sat Nov 5 01:42:54 2011 (r227100) +++ head/games/caesar/caesar.c Sat Nov 5 07:18:53 2011 (r227101) @@ -67,13 +67,13 @@ __FBSDID("$FreeBSD$"); * letter frequencies (taken from some unix(tm) documentation) * (unix is a trademark of Bell Laboratories) */ -double stdf[26] = { +static double stdf[26] = { 7.97, 1.35, 3.61, 4.78, 12.37, 2.01, 1.46, 4.49, 6.39, 0.04, 0.42, 3.81, 2.69, 5.92, 6.96, 2.91, 0.08, 6.63, 8.77, 9.68, 2.62, 0.81, 1.88, 0.23, 2.07, 0.06, }; -void printit(char *); +static void printit(char *); int main(int argc, char **argv) @@ -147,7 +147,7 @@ main(int argc, char **argv) exit(0); } -void +static void printit(char *arg) { int ch, rot; Modified: head/games/fortune/fortune/fortune.c ============================================================================== --- head/games/fortune/fortune/fortune.c Sat Nov 5 01:42:54 2011 (r227100) +++ head/games/fortune/fortune/fortune.c Sat Nov 5 07:18:53 2011 (r227101) @@ -97,73 +97,71 @@ typedef struct fd { struct fd *next, *prev; } FILEDESC; -bool Found_one; /* did we find a match? */ -bool Find_files = FALSE; /* just find a list of proper fortune files */ -bool Fortunes_only = FALSE; /* check only "fortunes" files */ -bool Wait = FALSE; /* wait desired after fortune */ -bool Short_only = FALSE; /* short fortune desired */ -bool Long_only = FALSE; /* long fortune desired */ -bool Offend = FALSE; /* offensive fortunes only */ -bool All_forts = FALSE; /* any fortune allowed */ -bool Equal_probs = FALSE; /* scatter un-allocted prob equally */ -bool Match = FALSE; /* dump fortunes matching a pattern */ +static bool Found_one; /* did we find a match? */ +static bool Find_files = FALSE; /* just find a list of proper fortune files */ +static bool Fortunes_only = FALSE; /* check only "fortunes" files */ +static bool Wait = FALSE; /* wait desired after fortune */ +static bool Short_only = FALSE; /* short fortune desired */ +static bool Long_only = FALSE; /* long fortune desired */ +static bool Offend = FALSE; /* offensive fortunes only */ +static bool All_forts = FALSE; /* any fortune allowed */ +static bool Equal_probs = FALSE; /* scatter un-allocted prob equally */ +static bool Match = FALSE; /* dump fortunes matching a pattern */ #ifdef DEBUG -bool Debug = FALSE; /* print debug messages */ +static bool Debug = FALSE; /* print debug messages */ #endif -char *Fortbuf = NULL; /* fortune buffer for -m */ +static char *Fortbuf = NULL; /* fortune buffer for -m */ -int Fort_len = 0; +static int Fort_len = 0; -off_t Seekpts[2]; /* seek pointers to fortunes */ +static off_t Seekpts[2]; /* seek pointers to fortunes */ -FILEDESC *File_list = NULL, /* Head of file list */ +static FILEDESC *File_list = NULL, /* Head of file list */ *File_tail = NULL; /* Tail of file list */ -FILEDESC *Fortfile; /* Fortune file to use */ +static FILEDESC *Fortfile; /* Fortune file to use */ -STRFILE Noprob_tbl; /* sum of data for all no prob files */ +static STRFILE Noprob_tbl; /* sum of data for all no prob files */ -const char *Fortune_path; -char **Fortune_path_arr; +static const char *Fortune_path; +static char **Fortune_path_arr; -int add_dir(FILEDESC *); -int add_file(int, const char *, const char *, FILEDESC **, FILEDESC **, - FILEDESC *); -void all_forts(FILEDESC *, char *); -char *copy(const char *, u_int); -void display(FILEDESC *); -void do_free(void *); -void *do_malloc(u_int); -int form_file_list(char **, int); -int fortlen(void); -void get_fort(void); -void get_pos(FILEDESC *); -void get_tbl(FILEDESC *); -void getargs(int, char *[]); -void getpath(void); -void init_prob(void); -int is_dir(const char *); -int is_fortfile(const char *, char **, char **, int); -int is_off_name(const char *); -int max(int, int); -FILEDESC * - new_fp(void); -char *off_name(const char *); -void open_dat(FILEDESC *); -void open_fp(FILEDESC *); -FILEDESC * - pick_child(FILEDESC *); -void print_file_list(void); -void print_list(FILEDESC *, int); -void sum_noprobs(FILEDESC *); -void sum_tbl(STRFILE *, STRFILE *); -void usage(void); -void zero_tbl(STRFILE *); - -char *conv_pat(char *); -int find_matches(void); -void matches_in_list(FILEDESC *); -int maxlen_in_list(FILEDESC *); +static int add_dir(FILEDESC *); +static int add_file(int, const char *, const char *, FILEDESC **, + FILEDESC **, FILEDESC *); +static void all_forts(FILEDESC *, char *); +static char *copy(const char *, u_int); +static void display(FILEDESC *); +static void do_free(void *); +static void *do_malloc(u_int); +static int form_file_list(char **, int); +static int fortlen(void); +static void get_fort(void); +static void get_pos(FILEDESC *); +static void get_tbl(FILEDESC *); +static void getargs(int, char *[]); +static void getpath(void); +static void init_prob(void); +static int is_dir(const char *); +static int is_fortfile(const char *, char **, char **, int); +static int is_off_name(const char *); +static int max(int, int); +static FILEDESC *new_fp(void); +static char *off_name(const char *); +static void open_dat(FILEDESC *); +static void open_fp(FILEDESC *); +static FILEDESC *pick_child(FILEDESC *); +static void print_file_list(void); +static void print_list(FILEDESC *, int); +static void sum_noprobs(FILEDESC *); +static void sum_tbl(STRFILE *, STRFILE *); +static void usage(void); +static void zero_tbl(STRFILE *); + +static char *conv_pat(char *); +static int find_matches(void); +static void matches_in_list(FILEDESC *); +static int maxlen_in_list(FILEDESC *); static regex_t Re_pat; @@ -219,7 +217,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void display(FILEDESC *fp) { char *p; @@ -252,7 +250,7 @@ display(FILEDESC *fp) * fortlen: * Return the length of the fortune. */ -int +static int fortlen(void) { int nchar; @@ -276,7 +274,7 @@ fortlen(void) /* * This routine evaluates the arguments on the command line */ -void +static void getargs(int argc, char *argv[]) { int ignore_case; @@ -362,7 +360,7 @@ getargs(int argc, char *argv[]) * form_file_list: * Form the file list from the file specifications. */ -int +static int form_file_list(char **files, int file_cnt) { int i, percent; @@ -456,7 +454,7 @@ form_file_list(char **files, int file_cn * add_file: * Add a file to the file list. */ -int +static int add_file(int percent, const char *file, const char *dir, FILEDESC **head, FILEDESC **tail, FILEDESC *parent) { @@ -598,7 +596,7 @@ over: * new_fp: * Return a pointer to an initialized new FILEDESC. */ -FILEDESC * +static FILEDESC * new_fp(void) { FILEDESC *fp; @@ -624,7 +622,7 @@ new_fp(void) * off_name: * Return a pointer to the offensive version of a file of this name. */ -char * +static char * off_name(const char *file) { char *new; @@ -638,7 +636,7 @@ off_name(const char *file) * is_off_name: * Is the file an offensive-style name? */ -int +static int is_off_name(const char *file) { int len; @@ -653,7 +651,7 @@ is_off_name(const char *file) * Modify a FILEDESC element to be the parent of two children if * there are two children to be a parent of. */ -void +static void all_forts(FILEDESC *fp, char *offensive) { char *sp; @@ -701,7 +699,7 @@ all_forts(FILEDESC *fp, char *offensive) * add_dir: * Add the contents of an entire directory. */ -int +static int add_dir(FILEDESC *fp) { DIR *dir; @@ -740,7 +738,7 @@ add_dir(FILEDESC *fp) * is_dir: * Return TRUE if the file is a directory, FALSE otherwise. */ -int +static int is_dir(const char *file) { struct stat sbuf; @@ -759,7 +757,7 @@ is_dir(const char *file) * suffixes, as contained in suflist[], are ruled out. */ /* ARGSUSED */ -int +static int is_fortfile(const char *file, char **datp, char **posp, int check_for_offend) { int i; @@ -840,7 +838,7 @@ is_fortfile(const char *file, char **dat * copy: * Return a malloc()'ed copy of the string */ -char * +static char * copy(const char *str, unsigned int len) { char *new, *sp; @@ -858,7 +856,7 @@ copy(const char *str, unsigned int len) * do_malloc: * Do a malloc, checking for NULL return. */ -void * +static void * do_malloc(unsigned int size) { void *new; @@ -875,7 +873,7 @@ do_malloc(unsigned int size) * do_free: * Free malloc'ed space, if any. */ -void +static void do_free(void *ptr) { if (ptr != NULL) @@ -886,7 +884,7 @@ do_free(void *ptr) * init_prob: * Initialize the fortune probabilities. */ -void +static void init_prob(void) { FILEDESC *fp, *last = NULL; @@ -955,7 +953,7 @@ init_prob(void) * get_fort: * Get the fortune data file's seek pointer for the next fortune. */ -void +static void get_fort(void) { FILEDESC *fp; @@ -1018,7 +1016,7 @@ get_fort(void) * pick_child * Pick a child from a chosen parent. */ -FILEDESC * +static FILEDESC * pick_child(FILEDESC *parent) { FILEDESC *fp; @@ -1054,7 +1052,7 @@ pick_child(FILEDESC *parent) * sum_noprobs: * Sum up all the noprob probabilities, starting with fp. */ -void +static void sum_noprobs(FILEDESC *fp) { static bool did_noprobs = FALSE; @@ -1070,7 +1068,7 @@ sum_noprobs(FILEDESC *fp) did_noprobs = TRUE; } -int +static int max(int i, int j) { return (i >= j ? i : j); @@ -1080,7 +1078,7 @@ max(int i, int j) * open_fp: * Assocatiate a FILE * with the given FILEDESC. */ -void +static void open_fp(FILEDESC *fp) { if (fp->inf == NULL && (fp->inf = fdopen(fp->fd, "r")) == NULL) { @@ -1093,7 +1091,7 @@ open_fp(FILEDESC *fp) * open_dat: * Open up the dat file if we need to. */ -void +static void open_dat(FILEDESC *fp) { if (fp->datfd < 0 && (fp->datfd = open(fp->datfile, O_RDONLY)) < 0) { @@ -1107,7 +1105,7 @@ open_dat(FILEDESC *fp) * Get the position from the pos file, if there is one. If not, * return a random number. */ -void +static void get_pos(FILEDESC *fp) { #ifdef OK_TO_WRITE_DISK @@ -1137,7 +1135,7 @@ get_pos(FILEDESC *fp) * get_tbl: * Get the tbl data file the datfile. */ -void +static void get_tbl(FILEDESC *fp) { int fd; @@ -1176,7 +1174,7 @@ get_tbl(FILEDESC *fp) * zero_tbl: * Zero out the fields we care about in a tbl structure. */ -void +static void zero_tbl(STRFILE *tp) { tp->str_numstr = 0; @@ -1188,7 +1186,7 @@ zero_tbl(STRFILE *tp) * sum_tbl: * Merge the tbl data of t2 into t1. */ -void +static void sum_tbl(STRFILE *t1, STRFILE *t2) { t1->str_numstr += t2->str_numstr; @@ -1204,7 +1202,7 @@ sum_tbl(STRFILE *t1, STRFILE *t2) * print_file_list: * Print out the file list */ -void +static void print_file_list(void) { print_list(File_list, 0); @@ -1214,7 +1212,7 @@ print_file_list(void) * print_list: * Print out the actual list, recursively. */ -void +static void print_list(FILEDESC *list, int lev) { while (list != NULL) { @@ -1237,7 +1235,7 @@ print_list(FILEDESC *list, int lev) * conv_pat: * Convert the pattern to an ignore-case equivalent. */ -char * +static char * conv_pat(char *orig) { char *sp; @@ -1280,7 +1278,7 @@ conv_pat(char *orig) * find_matches: * Find all the fortunes which match the pattern we've been given. */ -int +static int find_matches(void) { Fort_len = maxlen_in_list(File_list); @@ -1298,7 +1296,7 @@ find_matches(void) * maxlen_in_list * Return the maximum fortune len in the file list. */ -int +static int maxlen_in_list(FILEDESC *list) { FILEDESC *fp; @@ -1324,7 +1322,7 @@ maxlen_in_list(FILEDESC *list) * matches_in_list * Print out the matches from the files in the list. */ -void +static void matches_in_list(FILEDESC *list) { char *sp, *p; @@ -1375,7 +1373,7 @@ matches_in_list(FILEDESC *list) } } -void +static void usage(void) { (void) fprintf(stderr, "fortune [-a"); @@ -1394,7 +1392,7 @@ usage(void) * if not set, use the compiled in FORTDIR. */ -void +static void getpath(void) { int nstr, foundenv; Modified: head/games/fortune/unstr/unstr.c ============================================================================== --- head/games/fortune/unstr/unstr.c Sat Nov 5 01:42:54 2011 (r227100) +++ head/games/fortune/unstr/unstr.c Sat Nov 5 07:18:53 2011 (r227101) @@ -67,13 +67,13 @@ __FBSDID("$FreeBSD$"); #include "strfile.h" -char *Infile, /* name of input file */ - Datafile[MAXPATHLEN], /* name of data file */ - Delimch; /* delimiter character */ +static char *Infile, /* name of input file */ + Datafile[MAXPATHLEN], /* name of data file */ + Delimch; /* delimiter character */ -FILE *Inf, *Dataf; +static FILE *Inf, *Dataf; -void order_unstr(STRFILE *); +static void order_unstr(STRFILE *); /* ARGSUSED */ int @@ -107,7 +107,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void order_unstr(STRFILE *tbl) { uint32_t i; Modified: head/games/grdc/grdc.c ============================================================================== --- head/games/grdc/grdc.c Sat Nov 5 01:42:54 2011 (r227100) +++ head/games/grdc/grdc.c Sat Nov 5 07:18:53 2011 (r227101) @@ -26,29 +26,30 @@ #define XLENGTH 58 #define YDEPTH 7 -struct timespec now; -struct tm *tm; +static struct timespec now; +static struct tm *tm; -short disp[11] = { +static short disp[11] = { 075557, 011111, 071747, 071717, 055711, 074717, 074757, 071111, 075757, 075717, 002020 }; -long old[6], next[6], new[6], mask; +static long old[6], next[6], new[6], mask; -volatile sig_atomic_t sigtermed; +static volatile sig_atomic_t sigtermed; -int hascolor = 0; +static int hascolor = 0; -void set(int, int); -void standt(int); -void movto(int, int); -void sighndl(int); -void usage(void); +static void set(int, int); +static void standt(int); +static void movto(int, int); +static void sighndl(int); +static void usage(void); -void +static void sighndl(int signo) { - sigtermed=signo; + + sigtermed = signo; } int @@ -225,7 +226,7 @@ main(int argc, char *argv[]) return(0); } -void +static void set(int t, int n) { int i, m; @@ -239,7 +240,7 @@ set(int t, int n) mask |= m; } -void +static void standt(int on) { if (on) { @@ -257,13 +258,13 @@ standt(int on) } } -void +static void movto(int line, int col) { move(line, col); } -void +static void usage(void) { Modified: head/games/morse/morse.c ============================================================================== --- head/games/morse/morse.c Sat Nov 5 01:42:54 2011 (r227100) +++ head/games/morse/morse.c Sat Nov 5 07:18:53 2011 (r227101) @@ -261,33 +261,33 @@ static const struct morsetab koi8rtab[] {'\0', ""} }; -void show(const char *), play(const char *), morse(char); -void ttyout(const char *); -void sighandler(int); +static void show(const char *), play(const char *), morse(char); +static void ttyout(const char *); +static void sighandler(int); #define GETOPTOPTS "c:d:ef:lsw:" #define USAGE \ "usage: morse [-els] [-d device] [-w speed] [-c speed] [-f frequency] [string ...]\n" -static int pflag, lflag, sflag, eflag; -static int wpm = 20; /* effective words per minute */ -static int cpm; /* effective words per minute between +static int pflag, lflag, sflag, eflag; +static int wpm = 20; /* effective words per minute */ +static int cpm; /* effective words per minute between * characters */ #define FREQUENCY 600 -static int freq = FREQUENCY; +static int freq = FREQUENCY; static char *device; /* for tty-controlled generator */ #define DASH_LEN 3 #define CHAR_SPACE 3 #define WORD_SPACE (7 - CHAR_SPACE - 1) -static float dot_clock; -static float cdot_clock; -int spkr, line; -struct termios otty, ntty; -int olflags; +static float dot_clock; +static float cdot_clock; +static int spkr, line; +static struct termios otty, ntty; +static int olflags; #ifdef SPEAKER -tone_t sound; +static tone_t sound; #undef GETOPTOPTS #define GETOPTOPTS "c:d:ef:lpsw:" #undef USAGE @@ -439,7 +439,7 @@ main(int argc, char **argv) exit(0); } -void +static void morse(char c) { const struct morsetab *m; @@ -473,7 +473,7 @@ morse(char c) } } -void +static void show(const char *s) { if (lflag) { @@ -488,7 +488,7 @@ show(const char *s) } } -void +static void play(const char *s) { #ifdef SPEAKER @@ -530,7 +530,7 @@ play(const char *s) #endif } -void +static void ttyout(const char *s) { const char *c; @@ -572,7 +572,7 @@ ttyout(const char *s) usleep(duration); } -void +static void sighandler(int signo) { Modified: head/games/number/number.c ============================================================================== --- head/games/number/number.c Sat Nov 5 01:42:54 2011 (r227100) +++ head/games/number/number.c Sat Nov 5 07:18:53 2011 (r227101) @@ -74,14 +74,13 @@ static const char *name1[] = { "novemdecillion", "vigintillion", }; -void convert(char *); -int number(char *, int); -void pfract(int); -void toobig(void); -int unit(int, char *); -void usage(void); +static void convert(char *); +static int number(char *, int); +static void pfract(int); +static int unit(int, char *); +static void usage(void); -int lflag; +static int lflag; int main(int argc, char *argv[]) @@ -120,7 +119,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void convert(char *line) { int flen, len, rval; @@ -188,7 +187,7 @@ badnum: errx(1, "illegal number: %s", (void)printf("\n"); } -int +static int unit(int len, char *p) { int off, rval; @@ -222,7 +221,7 @@ unit(int len, char *p) return (rval); } -int +static int number(char *p, int len) { int val, rval; @@ -260,7 +259,7 @@ number(char *p, int len) return (rval); } -void +static void pfract(int len) { static char const * const pref[] = { "", "ten-", "hundred-" }; @@ -278,7 +277,7 @@ pfract(int len) } } -void +static void usage(void) { (void)fprintf(stderr, "usage: number [-l] [# ...]\n");