summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-04-16 22:32:04 +0000
committerDenis Vlasenko2007-04-16 22:32:04 +0000
commitac678ec2f127fc02a93fff2c164e0b13a94a6abf (patch)
treef1354d1d4e3ca29b1fd77698d45791e61fd7a8b1
parent17e3c34aa7abe42aa604234235338e2b8087b8a0 (diff)
downloadbusybox-ac678ec2f127fc02a93fff2c164e0b13a94a6abf.zip
busybox-ac678ec2f127fc02a93fff2c164e0b13a94a6abf.tar.gz
style fixes, no code changes
-rw-r--r--archival/dpkg.c3
-rw-r--r--archival/rpm.c3
-rw-r--r--coreutils/install.c3
-rw-r--r--coreutils/tail.c3
-rw-r--r--include/platform.h3
-rw-r--r--miscutils/chrt.c3
-rw-r--r--miscutils/hdparm.c3
-rw-r--r--miscutils/rx.c3
-rw-r--r--modutils/modprobe.c3
-rw-r--r--procps/top.c3
-rw-r--r--runit/sv.c15
-rw-r--r--runit/svlogd.c3
-rw-r--r--shell/hush.c3
13 files changed, 34 insertions, 17 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index c5deb0f..7d31ad1 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -352,7 +352,8 @@ static int search_package_hashtable(const unsigned name, const unsigned version,
* FIXME: I don't think this is very efficient, but I thought I'd keep
* it simple for now until it proves to be a problem.
*/
-static int search_for_provides(int needle, int start_at) {
+static int search_for_provides(int needle, int start_at)
+{
int i, j;
common_node_t *p;
for (i = start_at + 1; i < PACKAGE_HASH_PRIME; i++) {
diff --git a/archival/rpm.c b/archival/rpm.c
index a48dda3..654a4a3 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -185,7 +185,8 @@ int rpm_main(int argc, char **argv)
return 0;
}
-static void extract_cpio_gz(int fd) {
+static void extract_cpio_gz(int fd)
+{
archive_handle_t *archive_handle;
unsigned char magic[2];
diff --git a/coreutils/install.c b/coreutils/install.c
index c80be01..ece5b95 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -35,7 +35,8 @@ static const struct option install_long_options[] = {
#if ENABLE_SELINUX
static bool use_default_selinux_context = 1;
-static void setdefaultfilecon(const char *path) {
+static void setdefaultfilecon(const char *path)
+{
struct stat s;
security_context_t scontext = NULL;
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 67396ab..629ee21 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -65,7 +65,8 @@ static ssize_t tail_read(int fd, char *buf, size_t count)
static const char header_fmt[] = "\n==> %s <==\n";
-static unsigned eat_num(const char *p) {
+static unsigned eat_num(const char *p)
+{
if (*p == '-') p++;
else if (*p == '+') { p++; G.status = EXIT_FAILURE; }
return xatou_sfx(p, tail_suffixes);
diff --git a/include/platform.h b/include/platform.h
index 0adbed4..ad3cc93 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -234,7 +234,8 @@ typedef unsigned smalluint;
#endif
#if defined(__dietlibc__)
-static ATTRIBUTE_ALWAYS_INLINE char* strchrnul(const char *s, char c) {
+static ATTRIBUTE_ALWAYS_INLINE char* strchrnul(const char *s, char c)
+{
while (*s && *s != c) ++s;
return (char*)s;
}
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index 75d77d5..f52c3cd 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -22,7 +22,8 @@ static const struct {
{SCHED_RR, "SCHED_RR"}
};
-static void show_min_max(int pol) {
+static void show_min_max(int pol)
+{
const char *fmt = "%s min/max priority\t: %d/%d\n\0%s not supported?\n";
int max, min;
max = sched_get_priority_max(pol);
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index cc33a01..c540ff9 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -517,7 +517,8 @@ static uint8_t mode_loop(uint16_t mode_sup, uint16_t mode_sel, int cc, uint8_t *
return err_dma;
}
-static void print_ascii(uint16_t *p, uint8_t length) {
+static void print_ascii(uint16_t *p, uint8_t length)
+{
uint8_t ii;
char cl;
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 29848b1..6e79f34 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -43,7 +43,8 @@ Cf:
#define TIMEOUT_LONG 10
#define MAXERRORS 10
-static int read_byte(int fd, unsigned int timeout) {
+static int read_byte(int fd, unsigned int timeout)
+{
char buf[1];
int n;
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index d6a9553..4c5e436 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -669,7 +669,8 @@ static int mod_process(const struct mod_list_t *list, int do_insert)
* Check the matching between a pattern and a module name.
* We need this as *_* is equivalent to *-*, even in pattern matching.
*/
-static int check_pattern(const char* pat_src, const char* mod_src) {
+static int check_pattern(const char* pat_src, const char* mod_src)
+{
int ret;
if (ENABLE_FEATURE_MODPROBE_FANCY_ALIAS) {
diff --git a/procps/top.c b/procps/top.c
index ee6ee5d..7d30936 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -103,7 +103,8 @@ static int time_sort(top_status_t *P, top_status_t *Q)
return Q->ticks != P->ticks; /* 0 if ==, 1 if > */
}
-static int mult_lvl_cmp(void* a, void* b) {
+static int mult_lvl_cmp(void* a, void* b)
+{
int i, cmp_val;
for (i = 0; i < SORT_DEPTH; i++) {
diff --git a/runit/sv.c b/runit/sv.c
index d52eb6d..01488c0 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -183,23 +183,28 @@ static void out(const char *p, const char *m1)
#define WARN "warning: "
#define OK "ok: "
-static void fail(const char *m1) {
+static void fail(const char *m1)
+{
++rc;
out("fail: ", m1);
}
-static void failx(const char *m1) {
+static void failx(const char *m1)
+{
errno = 0;
fail(m1);
}
-static void warn_cannot(const char *m1) {
+static void warn_cannot(const char *m1)
+{
++rc;
out("warning: cannot ", m1);
}
-static void warnx_cannot(const char *m1) {
+static void warnx_cannot(const char *m1)
+{
errno = 0;
warn_cannot(m1);
}
-static void ok(const char *m1) {
+static void ok(const char *m1)
+{
errno = 0;
out(OK, m1);
}
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 1d66255..c2cff96 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -92,7 +92,8 @@ static void fatalx(const char *m0)
{
bb_error_msg_and_die(FATAL"%s", m0);
}
-static void warn(const char *m0) {
+static void warn(const char *m0)
+{
bb_perror_msg(WARNING"%s", m0);
}
static void warn2(const char *m0, const char *m1)
diff --git a/shell/hush.c b/shell/hush.c
index 0b5e2a5..9489fb2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1953,7 +1953,8 @@ static int setup_redirect(struct p_context *ctx, int fd, redir_type style,
return 0;
}
-static struct pipe *new_pipe(void) {
+static struct pipe *new_pipe(void)
+{
struct pipe *pi;
pi = xmalloc(sizeof(struct pipe));
pi->num_progs = 0;