Patchwork nanddump: Qualifier Clean-up

login
register
mail settings
Submitter Grant Erickson
Date Sept. 8, 2008, 6:45 a.m.
Message ID <1220856321-22712-1-git-send-email-gerickson@nuovations.com>
Download mbox | patch
Permalink /patch/201/
State Accepted
Commit b16c1b630491a461b3ebb55d714d7bb0cd122737
Headers show

Comments

Grant Erickson - Sept. 8, 2008, 6:45 a.m.
Static-qualified all globals except 'main' because they have no use
beyond file scope.
Constant-qualified MTD device and input positional parameter globals.
Constant-qualified argv array.

Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Artem Bityutskiy - Sept. 8, 2008, 6:48 a.m.
On Sun, 2008-09-07 at 23:45 -0700, Grant Erickson wrote:
> Static-qualified all globals except 'main' because they have no use
> beyond file scope.
> Constant-qualified MTD device and input positional parameter globals.
> Constant-qualified argv array.
> 
> Signed-off-by: Grant Erickson <gerickson@nuovations.com>

Ack for whole series.
Josh Boyer - Sept. 8, 2008, 10:44 a.m.
On Sun,  7 Sep 2008 23:45:21 -0700
Grant Erickson <gerickson@nuovations.com> wrote:

> Static-qualified all globals except 'main' because they have no use
> beyond file scope.
> Constant-qualified MTD device and input positional parameter globals.
> Constant-qualified argv array.
> 
> Signed-off-by: Grant Erickson <gerickson@nuovations.com>

These all look fine.  I'll apply them in a bit.

josh

Patch

diff --git a/nanddump.c b/nanddump.c
index be40287..e35caf8 100644
--- a/nanddump.c
+++ b/nanddump.c
@@ -32,11 +32,11 @@ 
 #define PROGRAM "nanddump"
 #define VERSION "$Revision: 1.29 $"
 
-struct nand_oobinfo none_oobinfo = {
+static struct nand_oobinfo none_oobinfo = {
 	.useecc = MTD_NANDECC_OFF,
 };
 
-void display_help (void)
+static void display_help (void)
 {
 	printf("Usage: nanddump [OPTIONS] MTD-device\n"
 			"Dumps the contents of a nand mtd partition.\n"
@@ -54,7 +54,7 @@  void display_help (void)
 	exit(0);
 }
 
-void display_version (void)
+static void display_version (void)
 {
 	printf(PROGRAM " " VERSION "\n"
 			"\n"
@@ -69,17 +69,17 @@  void display_version (void)
 
 // Option variables
 
-int	ignoreerrors;		// ignore errors
-int	pretty_print;		// print nice in ascii
-int	noecc;			// don't error correct
-int	omitoob;		// omit oob data
-unsigned long	start_addr;	// start address
-unsigned long	length;		// dump length
-char    *mtddev;		// mtd device name
-char    *dumpfile;		// dump file name
-int	omitbad;
-
-void process_options (int argc, char *argv[])
+static int		ignoreerrors;	// ignore errors
+static int		pretty_print;	// print nice in ascii
+static int		noecc;		// don't error correct
+static int		omitoob;	// omit oob data
+static unsigned long	start_addr;	// start address
+static unsigned long	length;		// dump length
+static const char	*mtddev;	// mtd device name
+static const char	*dumpfile;	// dump file name
+static int		omitbad;
+
+static void process_options (int argc, char * const argv[])
 {
 	int error = 0;
 
@@ -159,13 +159,13 @@  void process_options (int argc, char *argv[])
 /*
  * Buffers for reading data from flash
  */
-unsigned char readbuf[4096];
-unsigned char oobbuf[128];
+static unsigned char readbuf[4096];
+static unsigned char oobbuf[128];
 
 /*
  * Main program
  */
-int main(int argc, char **argv)
+int main(int argc, char * const argv[])
 {
 	unsigned long ofs, end_addr = 0;
 	unsigned long long blockstart = 1;