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

Unneeded code removed, usused field "unsigned pscpu" removed

Browse Source
This commit is contained in:
Denis Vlasenko 2006-11-01 20:20:37 +00:00
parent 9225854144
commit dd539f7687
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/libbb.h
View File

@ -501,13 +501,12 @@ void reset_ino_dev_hashtable(void);
#endif #endif
#endif #endif
typedef struct { typedef struct {
pid_t pid, ppid; int pid, ppid;
char user[9]; char user[9];
char state[4]; char state[4];
unsigned long rss; unsigned long rss;
#ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE #ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
unsigned pcpu; unsigned pcpu;
unsigned pscpu;
unsigned long stime, utime; unsigned long stime, utime;
#endif #endif
char *cmd; char *cmd;
@ -525,7 +524,7 @@ extern const char bb_uuenc_tbl_base64[];
extern const char bb_uuenc_tbl_std[]; extern const char bb_uuenc_tbl_std[];
void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl); void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);
typedef struct _sha1_ctx_t_ { typedef struct sha1_ctx_t {
uint32_t count[2]; uint32_t count[2];
uint32_t hash[5]; uint32_t hash[5];
uint32_t wbuf[16]; uint32_t wbuf[16];
@ -534,7 +533,7 @@ void sha1_begin(sha1_ctx_t *ctx);
void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx); void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx);
void *sha1_end(void *resbuf, sha1_ctx_t *ctx); void *sha1_end(void *resbuf, sha1_ctx_t *ctx);
typedef struct _md5_ctx_t_ { typedef struct md5_ctx_t {
uint32_t A; uint32_t A;
uint32_t B; uint32_t B;
uint32_t C; uint32_t C;

8
libbb/procps.c
View File

@ -36,13 +36,13 @@ procps_status_t * procps_scan(int save_user_arg0)
struct dirent *entry; struct dirent *entry;
char *name; char *name;
int n;
char status[32];
char *status_tail;
char buf[PROCPS_BUFSIZE]; char buf[PROCPS_BUFSIZE];
char status[sizeof("/proc//cmdline") + sizeof(int)*3];
char *status_tail;
procps_status_t curstatus; procps_status_t curstatus;
int pid;
long tasknice; long tasknice;
int pid;
int n;
struct stat sb; struct stat sb;
if (!dir) { if (!dir) {

7
procps/kill.c
View File

@ -84,9 +84,10 @@ do_it_now:
pid_t sid; pid_t sid;
procps_status_t* p; procps_status_t* p;
/* kill(-1, sig) on Linux (at least 2.1.x) // Cannot happen anyway? We don't TERM ourself, we STOP
* might send signal to the calling process too */ // /* kill(-1, sig) on Linux (at least 2.1.x)
signal(SIGTERM, SIG_IGN); // * might send signal to the calling process too */
// signal(SIGTERM, SIG_IGN);
/* Now stop all processes */ /* Now stop all processes */
kill(-1, SIGSTOP); kill(-1, SIGSTOP);
/* Find out our own session id */ /* Find out our own session id */

4
procps/ps.c
View File

@ -25,7 +25,7 @@ int ps_main(int argc, char **argv)
#if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
#if ENABLE_FEATURE_PS_WIDE #if ENABLE_FEATURE_PS_WIDE
opt_complementary = "-:ww"; opt_complementary = "-:ww";
USE_SELINUX(i =) getopt32(argc, argv, "w" USE_SELINUX("c"), &w_count); USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("c") "w", &w_count);
/* if w is given once, GNU ps sets the width to 132, /* if w is given once, GNU ps sets the width to 132,
* if w is given more than once, it is "unlimited" * if w is given more than once, it is "unlimited"
*/ */
@ -40,7 +40,7 @@ int ps_main(int argc, char **argv)
i = getopt32(argc, argv, "c"); i = getopt32(argc, argv, "c");
#endif #endif
#if ENABLE_SELINUX #if ENABLE_SELINUX
if ((i & (1+ENABLE_FEATURE_PS_WIDE)) && is_selinux_enabled()) if ((i & 1) && is_selinux_enabled())
use_selinux = 1; use_selinux = 1;
#endif #endif
#endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */ #endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */

2
util-linux/hwclock.c
View File

@ -106,7 +106,7 @@ static int show_clock(int utc)
if (buffer[0]) if (buffer[0])
buffer[strlen(buffer) - 1] = 0; buffer[strlen(buffer) - 1] = 0;
//printf("%s %.6f seconds %s\n", buffer, 0.0, utc ? "" : (ptm->tm_isdst ? tzname [1] : tzname [0])); //printf("%s %.6f seconds %s\n", buffer, 0.0, utc ? "" : (ptm->tm_isdst ? tzname[1] : tzname[0]));
printf( "%s %.6f seconds\n", buffer, 0.0); printf( "%s %.6f seconds\n", buffer, 0.0);
RELEASE_CONFIG_BUFFER(buffer); RELEASE_CONFIG_BUFFER(buffer);