style fixes, no code changes

This commit is contained in:
Denis Vlasenko 2007-04-16 22:32:04 +00:00
parent 17e3c34aa7
commit ac678ec2f1
13 changed files with 34 additions and 17 deletions

View File

@ -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 * 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. * 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; int i, j;
common_node_t *p; common_node_t *p;
for (i = start_at + 1; i < PACKAGE_HASH_PRIME; i++) { for (i = start_at + 1; i < PACKAGE_HASH_PRIME; i++) {

View File

@ -185,7 +185,8 @@ int rpm_main(int argc, char **argv)
return 0; return 0;
} }
static void extract_cpio_gz(int fd) { static void extract_cpio_gz(int fd)
{
archive_handle_t *archive_handle; archive_handle_t *archive_handle;
unsigned char magic[2]; unsigned char magic[2];

View File

@ -35,7 +35,8 @@ static const struct option install_long_options[] = {
#if ENABLE_SELINUX #if ENABLE_SELINUX
static bool use_default_selinux_context = 1; static bool use_default_selinux_context = 1;
static void setdefaultfilecon(const char *path) { static void setdefaultfilecon(const char *path)
{
struct stat s; struct stat s;
security_context_t scontext = NULL; security_context_t scontext = NULL;

View File

@ -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 const char header_fmt[] = "\n==> %s <==\n";
static unsigned eat_num(const char *p) { static unsigned eat_num(const char *p)
{
if (*p == '-') p++; if (*p == '-') p++;
else if (*p == '+') { p++; G.status = EXIT_FAILURE; } else if (*p == '+') { p++; G.status = EXIT_FAILURE; }
return xatou_sfx(p, tail_suffixes); return xatou_sfx(p, tail_suffixes);

View File

@ -234,7 +234,8 @@ typedef unsigned smalluint;
#endif #endif
#if defined(__dietlibc__) #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; while (*s && *s != c) ++s;
return (char*)s; return (char*)s;
} }

View File

@ -22,7 +22,8 @@ static const struct {
{SCHED_RR, "SCHED_RR"} {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"; const char *fmt = "%s min/max priority\t: %d/%d\n\0%s not supported?\n";
int max, min; int max, min;
max = sched_get_priority_max(pol); max = sched_get_priority_max(pol);

View File

@ -517,7 +517,8 @@ static uint8_t mode_loop(uint16_t mode_sup, uint16_t mode_sel, int cc, uint8_t *
return err_dma; 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; uint8_t ii;
char cl; char cl;

View File

@ -43,7 +43,8 @@ Cf:
#define TIMEOUT_LONG 10 #define TIMEOUT_LONG 10
#define MAXERRORS 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]; char buf[1];
int n; int n;

View File

@ -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. * Check the matching between a pattern and a module name.
* We need this as *_* is equivalent to *-*, even in pattern matching. * 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; int ret;
if (ENABLE_FEATURE_MODPROBE_FANCY_ALIAS) { if (ENABLE_FEATURE_MODPROBE_FANCY_ALIAS) {

View File

@ -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 > */ 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; int i, cmp_val;
for (i = 0; i < SORT_DEPTH; i++) { for (i = 0; i < SORT_DEPTH; i++) {

View File

@ -183,23 +183,28 @@ static void out(const char *p, const char *m1)
#define WARN "warning: " #define WARN "warning: "
#define OK "ok: " #define OK "ok: "
static void fail(const char *m1) { static void fail(const char *m1)
{
++rc; ++rc;
out("fail: ", m1); out("fail: ", m1);
} }
static void failx(const char *m1) { static void failx(const char *m1)
{
errno = 0; errno = 0;
fail(m1); fail(m1);
} }
static void warn_cannot(const char *m1) { static void warn_cannot(const char *m1)
{
++rc; ++rc;
out("warning: cannot ", m1); out("warning: cannot ", m1);
} }
static void warnx_cannot(const char *m1) { static void warnx_cannot(const char *m1)
{
errno = 0; errno = 0;
warn_cannot(m1); warn_cannot(m1);
} }
static void ok(const char *m1) { static void ok(const char *m1)
{
errno = 0; errno = 0;
out(OK, m1); out(OK, m1);
} }

View File

@ -92,7 +92,8 @@ static void fatalx(const char *m0)
{ {
bb_error_msg_and_die(FATAL"%s", 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); bb_perror_msg(WARNING"%s", m0);
} }
static void warn2(const char *m0, const char *m1) static void warn2(const char *m0, const char *m1)

View File

@ -1953,7 +1953,8 @@ static int setup_redirect(struct p_context *ctx, int fd, redir_type style,
return 0; return 0;
} }
static struct pipe *new_pipe(void) { static struct pipe *new_pipe(void)
{
struct pipe *pi; struct pipe *pi;
pi = xmalloc(sizeof(struct pipe)); pi = xmalloc(sizeof(struct pipe));
pi->num_progs = 0; pi->num_progs = 0;