emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: fix fallout from -Wunused-parameter

Browse Source 
function                                             old     new   delta
bbunpack                                             358     366      +8
passwd_main                                         1070    1072      +2
handle_incoming_and_exit                            2651    2653      +2
getpty                                                88      86      -2
script_main                                          975     972      -3
inetd_main                                          2036    2033      -3
dname_enc                                            377     373      -4
make_new_session                                     474     462     -12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/5 up/down: 12/-24)            Total: -12 bytes
   text    data     bss     dec     hex filename
 797429     658    7428  805515   c4a8b busybox_old
 797417     658    7428  805503   c4a7f busybox_unstripped
This commit is contained in:
Denis Vlasenko
2008-03-17 09:04:04 +00:00
parent 081eb71ebd
commit 85c247161b
36 changed files with 160 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
util-linux/fbset.c
View File

@@ -170,10 +170,10 @@ enum {
};
#endif
#if ENABLE_FEATURE_FBSET_READMODE
static int readmode(struct fb_var_screeninfo *base, const char *fn,
const char *mode)
{
#if ENABLE_FEATURE_FBSET_READMODE
FILE *f;
char buf[256];
char *p = buf;
@@ -257,11 +257,9 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
return 1;
}
}
#else
bb_error_msg("mode reading not compiled in");
#endif
return 0;
}
#endif
static inline void setmode(struct fb_var_screeninfo *base,
struct fb_var_screeninfo *set)
@@ -389,9 +387,13 @@ int fbset_main(int argc, char **argv)
fh = xopen(fbdev, O_RDONLY);
xioctl(fh, FBIOGET_VSCREENINFO, &var);
if (g_options & OPT_READMODE) {
#if !ENABLE_FEATURE_FBSET_READMODE
bb_show_usage();
#else
if (!readmode(&var, modefile, mode)) {
bb_error_msg_and_die("unknown video mode '%s'", mode);
}
#endif
}
setmode(&var, &varset);

12
util-linux/fdisk.c
View File

@@ -128,7 +128,11 @@ static unsigned read_int(unsigned low, unsigned dflt, unsigned high, unsigned ba
#endif
static const char *partition_type(unsigned char type);
static void get_geometry(void);
#if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE
static int get_boot(enum action what);
#else
static int get_boot(void);
#endif
#define PLURAL 0
#define SINGULAR 1
@@ -1237,8 +1241,12 @@ get_geometry(void)
* 0: found or created label
* 1: I/O error
*/
static int
get_boot(enum action what)
#if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE
static int get_boot(enum action what)
#else
static int get_boot(void)
#define get_boot(what) get_boot()
#endif
{
int i;

4
util-linux/script.c
View File

@@ -29,7 +29,7 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv)
int attr_ok; /* NB: 0: ok */
int winsz_ok;
int pty;
char pty_line[32];
char pty_line[GETPTY_BUFSIZE];
struct termios tt, rtt;
struct winsize win;
const char *fname = "typescript";
@@ -69,7 +69,7 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv)
shell = DEFAULT_SHELL;
}
pty = getpty(pty_line, sizeof(pty_line));
pty = getpty(pty_line);
if (pty < 0) {
bb_perror_msg_and_die("can't get pty");
}

8
util-linux/volume_id/get_devname.c
View File

@@ -26,6 +26,10 @@ static struct uuidCache_s {
} *uuidCache;
/* for now, only ext2, ext3 and xfs are supported */
#if !ENABLE_FEATURE_VOLUMEID_ISO9660
#define get_label_uuid(device, label, uuid, iso_only) \
get_label_uuid(device, label, uuid)
#endif
static int
get_label_uuid(const char *device, char **label, char **uuid, int iso_only)
{
@@ -83,6 +87,10 @@ uuidcache_addentry(char * device, int major, int minor, char *label, char *uuid)
memcpy(last->uuid, uuid, sizeof(last->uuid));
}
#if !ENABLE_FEATURE_VOLUMEID_ISO9660
#define uuidcache_check_device(device_name, ma, mi, iso_only) \
uuidcache_check_device(device_name, ma, mi)
#endif
static void
uuidcache_check_device(const char *device_name, int ma, int mi, int iso_only)
{