ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

random style fixes

Browse source
This commit is contained in:
Denis Vlasenko 2006-10-03 19:02:20 +00:00
parent 6edaddec02
commit cf94446af7
4 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
archival/rpm.c
View file

@ -303,7 +303,7 @@ static void fileaction_setowngrp(char *filename, int fileref)
int uid, gid; int uid, gid;
uid = bb_xgetpwnam(rpm_getstring(RPMTAG_FILEUSERNAME, fileref)); uid = bb_xgetpwnam(rpm_getstring(RPMTAG_FILEUSERNAME, fileref));
gid = bb_xgetgrnam(rpm_getstring(RPMTAG_FILEGROUPNAME, fileref)); gid = bb_xgetgrnam(rpm_getstring(RPMTAG_FILEGROUPNAME, fileref));
chown (filename, uid, gid); chown(filename, uid, gid);
} }
static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref)) static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref))

30
include/libbb.h
View file

@ -163,7 +163,6 @@ extern int recursive_action(const char *fileName, int recurse,
void* userData); void* userData);
extern int bb_parse_mode( const char* s, mode_t* theMode); extern int bb_parse_mode( const char* s, mode_t* theMode);
extern long bb_xgetlarg(const char *arg, int base, long lower, long upper);
extern unsigned int tty_baud_to_value(speed_t speed); extern unsigned int tty_baud_to_value(speed_t speed);
extern speed_t tty_value_to_baud(unsigned int value); extern speed_t tty_value_to_baud(unsigned int value);
@ -258,21 +257,24 @@ struct suffix_mult {
}; };
extern unsigned long bb_xgetularg_bnd_sfx(const char *arg, int base, extern unsigned long bb_xgetularg_bnd_sfx(const char *arg, int base,
unsigned long lower, unsigned long lower,
unsigned long upper, unsigned long upper,
const struct suffix_mult *suffixes); const struct suffix_mult *suffixes);
extern unsigned long bb_xgetularg_bnd(const char *arg, int base, extern unsigned long bb_xgetularg_bnd(const char *arg, int base,
unsigned long lower, unsigned long lower,
unsigned long upper); unsigned long upper);
extern unsigned long bb_xgetularg10_bnd(const char *arg, extern unsigned long bb_xgetularg10_bnd(const char *arg,
unsigned long lower, unsigned long lower,
unsigned long upper); unsigned long upper);
extern unsigned long bb_xgetularg10(const char *arg); extern unsigned long bb_xgetularg10(const char *arg);
extern long bb_xgetlarg(const char *arg, int base,
long lower,
long upper);
extern long bb_xgetlarg_bnd_sfx(const char *arg, int base, extern long bb_xgetlarg_bnd_sfx(const char *arg, int base,
long lower, long lower,
long upper, long upper,
const struct suffix_mult *suffixes); const struct suffix_mult *suffixes);
extern long bb_xgetlarg10_sfx(const char *arg, const struct suffix_mult *suffixes); extern long bb_xgetlarg10_sfx(const char *arg, const struct suffix_mult *suffixes);
@ -285,9 +287,9 @@ extern unsigned long bb_xparse_number(const char *numstr,
* increases target size and is often not needed on embedded systems. */ * increases target size and is often not needed on embedded systems. */
extern long bb_xgetpwnam(const char *name); extern long bb_xgetpwnam(const char *name);
extern long bb_xgetgrnam(const char *name); extern long bb_xgetgrnam(const char *name);
extern char * bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix); extern char *bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix);
extern char * bb_getpwuid(char *name, long uid, int bufsize); extern char *bb_getpwuid(char *name, long uid, int bufsize);
extern char * bb_getgrgid(char *group, long gid, int bufsize); extern char *bb_getgrgid(char *group, long gid, int bufsize);
extern char *bb_askpass(int timeout, const char * prompt); extern char *bb_askpass(int timeout, const char * prompt);
extern int device_open(const char *device, int mode); extern int device_open(const char *device, int mode);

2
libbb/bb_pwd.c
View file

@ -34,7 +34,7 @@ char * bb_getgrgid(char *group, long gid, int bufsize)
{ {
struct group *mygroup = getgrgid(gid); struct group *mygroup = getgrgid(gid);
return bb_getug(group, (mygroup) ? return bb_getug(group, (mygroup) ?
mygroup->gr_name : (char *)mygroup, gid, bufsize, 'g'); mygroup->gr_name : (char *)mygroup, gid, bufsize, 'g');
} }
#endif /* L_bb_getgrgid */ #endif /* L_bb_getgrgid */

4
libbb/parse_number.c
View file

@ -15,7 +15,7 @@
#include "libbb.h" #include "libbb.h"
unsigned long bb_xparse_number(const char *numstr, unsigned long bb_xparse_number(const char *numstr,
const struct suffix_mult *suffixes) const struct suffix_mult *suffixes)
{ {
unsigned long int r; unsigned long int r;
char *e; char *e;
@ -46,5 +46,5 @@ unsigned long bb_xparse_number(const char *numstr,
} while (suffixes->suffix); } while (suffixes->suffix);
} }
} }
bb_error_msg_and_die("invalid number `%s'", numstr); bb_error_msg_and_die("invalid number '%s'", numstr);
} }