X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fnvramtool%2Fcommon.c;h=45338ec4de01d4cf8652fea1061ff8fa3b00c60f;hb=6e9ab97106925f74b993ddf66db0b6525dc71580;hp=cb9e9c817b017561873f2e41a4d7e35ec693b09a;hpb=cbb5ba8633c2ad143366c3bc367f8c4f6434c084;p=coreboot.git diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c index cb9e9c817..45338ec4d 100644 --- a/util/nvramtool/common.c +++ b/util/nvramtool/common.c @@ -1,6 +1,5 @@ /*****************************************************************************\ * common.c - * $Id$ ***************************************************************************** * Copyright (C) 2002-2005 The Regents of the University of California. * Produced at the Lawrence Livermore National Laboratory. @@ -26,7 +25,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. \*****************************************************************************/ #include "common.h" @@ -35,7 +34,7 @@ const char prog_name[] = "nvramtool"; /* version of this program */ -const char prog_version[] = "2.0.1"; +const char prog_version[] = "2.1"; /**************************************************************************** * get_line_from_file @@ -43,27 +42,29 @@ const char prog_version[] = "2.0.1"; * Get a line of input from file 'f'. Store result in 'line' which is an * array of 'line_buf_size' bytes. ****************************************************************************/ -int get_line_from_file (FILE *f, char line[], int line_buf_size) - { if (fgets(line, line_buf_size, f) == NULL) - return LINE_EOF; +int get_line_from_file(FILE * f, char line[], int line_buf_size) +{ + if (fgets(line, line_buf_size, f) == NULL) + return LINE_EOF; - /* If the file contains a line that is too long, then it's best to let the - * user know right away rather than passing back a truncated result that - * will lead to problems later on. - */ - return (strlen(line) == ((size_t) (line_buf_size - 1))) ? - LINE_TOO_LONG : OK; - } + /* If the file contains a line that is too long, then it's best + * to let the user know right away rather than passing back a + * truncated result that will lead to problems later on. + */ + return (strlen(line) == ((size_t) (line_buf_size - 1))) ? + LINE_TOO_LONG : OK; +} /**************************************************************************** * out_of_memory * * We ran out of memory. Print an error message and die. ****************************************************************************/ -void out_of_memory (void) - { fprintf(stderr, "%s: Out of memory.\n", prog_name); - exit(1); - } +void out_of_memory(void) +{ + fprintf(stderr, "%s: Out of memory.\n", prog_name); + exit(1); +} /**************************************************************************** * usage @@ -71,36 +72,37 @@ void out_of_memory (void) * Write a usage message to 'outfile'. If 'outfile' is 'stderr' then exit * with a value of 1. Otherwise exit with a value of 0. ****************************************************************************/ -void usage (FILE *outfile) - { fprintf(outfile, - "Usage: %s [-y LAYOUT_FILE | -t] PARAMETER ...\n\n" - " Read/write coreboot parameters or show info from " - "coreboot table.\n\n" - " -y LAYOUT_FILE: Use CMOS layout specified by " - "LAYOUT_FILE.\n" - " -t: Use CMOS layout specified by CMOS option " - "table.\n" - " [-n] -r NAME: Show parameter NAME. If -n is given, " - "show value only.\n" - " -e NAME: Show all possible values for parameter " - "NAME.\n" - " -a: Show names and values for all " - "parameters.\n" - " -w NAME=VALUE: Set parameter NAME to VALUE.\n" - " -p INPUT_FILE: Set parameters according to INPUT_FILE.\n" - " -i: Same as -p but file contents taken from " - "standard input.\n" - " -c [VALUE]: Show CMOS checksum or set checksum to " - "VALUE.\n" - " -l [ARG]: Show coreboot table info for ARG, or " - "all ARG choices.\n" - " -d: Show low-level dump of coreboot table.\n" - " -Y: Show CMOS layout info.\n" - " -b OUTPUT_FILE: Dump CMOS memory contents to file.\n" - " -B INPUT_FILE: Write file contents to CMOS memory.\n" - " -x: Show hex dump of CMOS memory.\n" - " -X DUMPFILE: Show hex dump of CMOS dumpfile.\n" - " -v: Show version info for this program.\n" - " -h: Show this message.\n", prog_name); - exit(outfile == stderr); - } +void usage(FILE * outfile) +{ + fprintf(outfile, + "Usage: %s [-y LAYOUT_FILE | -t] PARAMETER ...\n\n" + " Read/write coreboot parameters or show info from " + "coreboot table.\n\n" + " -y LAYOUT_FILE: Use CMOS layout specified by " + "LAYOUT_FILE.\n" + " -t: Use CMOS layout specified by CMOS option " + "table.\n" + " [-n] -r NAME: Show parameter NAME. If -n is given, " + "show value only.\n" + " -e NAME: Show all possible values for parameter " + "NAME.\n" + " -a: Show names and values for all " + "parameters.\n" + " -w NAME=VALUE: Set parameter NAME to VALUE.\n" + " -p INPUT_FILE: Set parameters according to INPUT_FILE.\n" + " -i: Same as -p but file contents taken from " + "standard input.\n" + " -c [VALUE]: Show CMOS checksum or set checksum to " + "VALUE.\n" + " -l [ARG]: Show coreboot table info for ARG, or " + "all ARG choices.\n" + " -d: Show low-level dump of coreboot table.\n" + " -Y: Show CMOS layout info.\n" + " -b OUTPUT_FILE: Dump CMOS memory contents to file.\n" + " -B INPUT_FILE: Write file contents to CMOS memory.\n" + " -x: Show hex dump of CMOS memory.\n" + " -X DUMPFILE: Show hex dump of CMOS dumpfile.\n" + " -v: Show version info for this program.\n" + " -h: Show this message.\n", prog_name); + exit(outfile == stderr); +}