diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-16 17:31:05 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-16 17:31:05 +0100 |
| commit | 4e08a123b0f8c7d2c66583e84759b0974e791ee9 (patch) | |
| tree | 3454632cecf1f6a042e6cb705432866cf83f358d | |
| parent | 936e83e694b3225dbcc14fc99ca8053e2518ab35 (diff) | |
Assorted warning fixes and added a comment, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/wget.c | 3 | ||||
| -rw-r--r-- | procps/ps.c | 8 | ||||
| -rw-r--r-- | procps/pstree.c | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/networking/wget.c b/networking/wget.c index d5a92a950..5da6481c1 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -1092,6 +1092,9 @@ static void download_one_url(const char *url) 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 (target.protocol == P_HTTPS) { /* If we use SSL helper, keeping our end of the socket open for writing diff --git a/procps/ps.c b/procps/ps.c index 1d380590d..e8b122c5a 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -608,7 +608,9 @@ int ps_main(int argc UNUSED_PARAM, char **argv) procps_status_t *p; llist_t* opt_o = NULL; char default_o[sizeof(DEFAULT_O_STR)]; +#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS int opt; +#endif enum { OPT_Z = (1 << 0), 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, * 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) { do { parse_o(llist_pop(&opt_o)); diff --git a/procps/pstree.c b/procps/pstree.c index c5fb83688..f97e99639 100644 --- a/procps/pstree.c +++ b/procps/pstree.c @@ -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) { procps_status_t *p = NULL; +#if ENABLE_FEATURE_SHOW_THREADS pid_t parent = 0; +#endif int flags = PSSCAN_COMM | PSSCAN_PID | PSSCAN_PPID | PSSCAN_UIDGID | PSSCAN_TASKS; while ((p = procps_scan(p, flags)) != NULL) { @@ -368,7 +370,9 @@ static void mread_proc(void) #endif { add_proc(p->comm, p->pid, p->ppid, p->uid/*, 0*/); +#if ENABLE_FEATURE_SHOW_THREADS parent = p->pid; +#endif } } } |