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

Assorted warning fixes and added a comment, no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-01-16 17:31:05 +01:00
parent 936e83e694
commit 4e08a123b0
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
networking/wget.c
View File

@ -1092,6 +1092,9 @@ static void download_one_url(const char *url)
fflush(sfp); fflush(sfp);
/* Tried doing this unconditionally.
* Cloudflare and nginx/1.11.5 are shocked to see SHUT_WR on non-HTTPS.
*/
#if SSL_SUPPORTED #if SSL_SUPPORTED
if (target.protocol == P_HTTPS) { if (target.protocol == P_HTTPS) {
/* If we use SSL helper, keeping our end of the socket open for writing /* If we use SSL helper, keeping our end of the socket open for writing

8
procps/ps.c
View File

@ -608,7 +608,9 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
procps_status_t *p; procps_status_t *p;
llist_t* opt_o = NULL; llist_t* opt_o = NULL;
char default_o[sizeof(DEFAULT_O_STR)]; char default_o[sizeof(DEFAULT_O_STR)];
#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS
int opt; int opt;
#endif
enum { enum {
OPT_Z = (1 << 0), OPT_Z = (1 << 0),
OPT_o = (1 << 1), OPT_o = (1 << 1),
@ -638,7 +640,11 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
* procps v3.2.7 supports -T and shows tids as SPID column, * procps v3.2.7 supports -T and shows tids as SPID column,
* it also supports -L where it shows tids as LWP column. * it also supports -L where it shows tids as LWP column.
*/ */
opt = getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o); #if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS
opt =
#endif
getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o);
if (opt_o) { if (opt_o) {
do { do {
parse_o(llist_pop(&opt_o)); parse_o(llist_pop(&opt_o));

4
procps/pstree.c
View File

@ -357,7 +357,9 @@ static void handle_thread(const char *comm, pid_t pid, pid_t ppid, uid_t uid)
static void mread_proc(void) static void mread_proc(void)
{ {
procps_status_t *p = NULL; procps_status_t *p = NULL;
#if ENABLE_FEATURE_SHOW_THREADS
pid_t parent = 0; pid_t parent = 0;
#endif
int flags = PSSCAN_COMM | PSSCAN_PID | PSSCAN_PPID | PSSCAN_UIDGID | PSSCAN_TASKS; int flags = PSSCAN_COMM | PSSCAN_PID | PSSCAN_PPID | PSSCAN_UIDGID | PSSCAN_TASKS;
while ((p = procps_scan(p, flags)) != NULL) { while ((p = procps_scan(p, flags)) != NULL) {
@ -368,7 +370,9 @@ static void mread_proc(void)
#endif #endif
{ {
add_proc(p->comm, p->pid, p->ppid, p->uid/*, 0*/); add_proc(p->comm, p->pid, p->ppid, p->uid/*, 0*/);
#if ENABLE_FEATURE_SHOW_THREADS
parent = p->pid; parent = p->pid;
#endif
} }
} }
} }