commit | 78f7aefae28bae0f88380f04269842e388c7fe1c | [log] [tgz] |
---|---|---|
author | Jon Larimer <jlarimer@google.com> | Tue Aug 14 10:38:45 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 14 10:38:45 2012 -0700 |
tree | ca1acdae9ffeeb5ff442f7ddb090de3805708cf1 | |
parent | c01ad6945371b824afc424ba8f889801a3e3ed31 [diff] | |
parent | f286dd75f6e715f900a2b2a230c8e8fb68a418a3 [diff] |
Merge "Make usage() static in du.c to avoid conflicts"
diff --git a/toolbox/du.c b/toolbox/du.c index 06374a4..fc7c943 100644 --- a/toolbox/du.c +++ b/toolbox/du.c
@@ -62,7 +62,7 @@ int linkchk(dev_t, ino_t); void prstat(const char *, int64_t); -void usage(void); +static void usage(void); long blocksize; @@ -312,7 +312,7 @@ return 0; } -void +static void usage(void) {