diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 21:22:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 21:22:33 +0100 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /scripts/conmakehash.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'scripts/conmakehash.c')
| -rw-r--r-- | scripts/conmakehash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/conmakehash.c b/scripts/conmakehash.c index e0c6891a9ad..263a44d57fa 100644 --- a/scripts/conmakehash.c +++ b/scripts/conmakehash.c @@ -24,14 +24,14 @@ typedef unsigned short unicode; -void usage(char *argv0) +static void usage(char *argv0) { fprintf(stderr, "Usage: \n" " %s chartable [hashsize] [hashstep] [maxhashlevel]\n", argv0); exit(EX_USAGE); } -int getunicode(char **p0) +static int getunicode(char **p0) { char *p = *p0; @@ -49,7 +49,7 @@ unicode unitable[MAX_FONTLEN][255]; /* Massive overkill, but who cares? */ int unicount[MAX_FONTLEN]; -void addpair(int fp, int un) +static void addpair(int fp, int un) { int i; |