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

*: compile fixes for 64-bit build

Browse Source
This commit is contained in:
Denis Vlasenko 2007-08-23 10:52:52 +00:00
parent de4c5d3d8c
commit 6ee023cf62
6 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
console-tools/chvt.c
View File

@ -25,8 +25,9 @@ int chvt_main(int argc, char **argv)
}
fd = get_console_fd();
num = xatoul_range(argv[1], 1, 63);
xioctl(fd, VT_ACTIVATE, (void *)num);
xioctl(fd, VT_WAITACTIVE, (void *)num);
num = xatou_range(argv[1], 1, 63);
/* double cast suppresses "cast to ptr from int of different size */
xioctl(fd, VT_ACTIVATE, (void *)(ptrdiff_t)num);
xioctl(fd, VT_WAITACTIVE, (void *)(ptrdiff_t)num);
return EXIT_SUCCESS;
}

5
console-tools/deallocvt.c
View File

@ -23,7 +23,7 @@ int deallocvt_main(int argc, char **argv)
switch (argc) {
case 2:
num = xatoul_range(argv[1], 1, 63);
num = xatou_range(argv[1], 1, 63);
/* Fallthrough */
case 1:
break;
@ -31,6 +31,7 @@ int deallocvt_main(int argc, char **argv)
bb_show_usage();
}
xioctl(get_console_fd(), VT_DISALLOCATE, (void *)num);
/* double cast suppresses "cast to ptr from int of different size */
xioctl(get_console_fd(), VT_DISALLOCATE, (void *)(ptrdiff_t)num);
return EXIT_SUCCESS;
}

4
findutils/find.c
View File

@ -881,7 +881,9 @@ USE_FEATURE_FIND_MAXDEPTH(OPT_MAXDEPTH,)
fileAction, /* file action */
fileAction, /* dir action */
#if ENABLE_FEATURE_FIND_MAXDEPTH
(void*)maxdepth,/* user data */
/* double cast suppresses
* "cast to ptr from int of different size" */
(void*)(ptrdiff_t)maxdepth,/* user data */
#else
NULL, /* user data */
#endif

2
networking/udhcp/socket.c
View File

@ -91,7 +91,7 @@ int listen_socket(/*uint32_t ip,*/ int port, const char *inf)
struct ifreq interface;
struct sockaddr_in addr;
DEBUG("Opening listen socket on 0x%08x:%d %s", ip, port, inf);
DEBUG("Opening listen socket on *:%d %s", port, inf);
fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
setsockopt_reuseaddr(fd);

34
procps/top.c
View File

@ -212,30 +212,17 @@ static void do_stats(void)
}
#endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */
/* display generic info (meminfo / loadavg) */
static unsigned long display_generic(int scr_width)
{
FILE *fp;
char buf[80];
char scrbuf[80];
unsigned long total, used, mfree, shared, buffers, cached;
#if ENABLE_FEATURE_TOP_DECIMALS || ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS
unsigned total_diff;
#endif
#if ENABLE_FEATURE_TOP_DECIMALS
#if ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS && ENABLE_FEATURE_TOP_DECIMALS
/* formats 7 char string (8 with terminating NUL) */
/* using GCCism (nested function) - we need to access total_diff */
/* This produces more than 100 bytes smaller code */
char *fmt_100percent_8(char pbuf[8], unsigned value)
static char *fmt_100percent_8(char pbuf[8], unsigned value, unsigned total)
{
unsigned t;
if (value >= total_diff) { /* 100% ? */
if (value >= total) { /* 100% ? */
strcpy(pbuf, " 100% ");
return pbuf;
}
/* else generate " [N/space]N.N% " string */
value = 1000 * value / total_diff;
value = 1000 * value / total;
t = value / 100;
value = value % 100;
pbuf[0] = ' ';
@ -250,6 +237,17 @@ static unsigned long display_generic(int scr_width)
}
#endif
/* display generic info (meminfo / loadavg) */
static unsigned long display_generic(int scr_width)
{
FILE *fp;
char buf[80];
char scrbuf[80];
unsigned long total, used, mfree, shared, buffers, cached;
#if ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS
unsigned total_diff;
#endif
/* read memory info */
fp = xfopen("meminfo", "r");
@ -316,7 +314,7 @@ static unsigned long display_generic(int scr_width)
#if ENABLE_FEATURE_TOP_DECIMALS
/* Generated code is approx +0.3k */
#define CALC_STAT(xxx) char xxx[8]
#define SHOW_STAT(xxx) fmt_100percent_8(xxx, (unsigned)(jif.xxx - prev_jif.xxx))
#define SHOW_STAT(xxx) fmt_100percent_8(xxx, (unsigned)(jif.xxx - prev_jif.xxx), total_diff)
#define FMT "%s"
#else
#define CALC_STAT(xxx) unsigned xxx = 100 * (unsigned)(jif.xxx - prev_jif.xxx) / total_diff

6
runit/runit_lib.h
View File

@ -86,9 +86,9 @@ extern unsigned pmatch(const char *, const char *, unsigned);
* runsv / supervise / sv stuff
*/
typedef struct svstatus_t {
uint64_t time_be64;
uint32_t time_nsec_be32;
uint32_t pid_le32;
uint64_t time_be64 ATTRIBUTE_PACKED;
uint32_t time_nsec_be32 ATTRIBUTE_PACKED;
uint32_t pid_le32 ATTRIBUTE_PACKED;
uint8_t paused;
uint8_t want;
uint8_t got_term;