2161bd701
Denys Vlasenko
2010-12-05
Subject
pstree: another tiny shrink
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
procps/pstree.c+6 -14
| @@ -61,7 +61,7 @@ typedef struct child { | |
| #define first_3 "-+-" | |
| struct globals { | |
| - | /* 0-based. IOW: the number of chars we printer on current line */ |
| + | /* 0-based. IOW: the number of chars we printed on current line */ |
| unsigned cur_x; | |
| unsigned output_width; | |
| @@ -95,16 +95,6 @@ static void ensure_buffer_capacity(int bufindex) | |
| } | |
| } | |
| - | #if ENABLE_FEATURE_CLEAN_UP |
| - | static void maybe_free_buffers(void) |
| - | { |
| - | free(G.width); |
| - | free(G.more); |
| - | } |
| - | #else |
| - | # define maybe_free_buffers() ((void)0) |
| - | #endif |
| - | |
| /* NB: this function is never called with "bad" chars | |
| * (control chars or chars >= 0x7f) | |
| */ | |
| @@ -385,12 +375,11 @@ int pstree_main(int argc UNUSED_PARAM, char **argv) | |
| get_terminal_width_height(1, &G.output_width, NULL); | |
| + | opt_complementary = "?1"; |
| getopt32(argv, "p"); | |
| argv += optind; | |
| if (argv[0]) { | |
| - | if (argv[1]) |
| - | bb_show_usage(); |
| if (argv[0][0] >= '0' && argv[0][0] <= '9') { | |
| pid = xatoi(argv[0]); | |
| } else { | |
| @@ -409,6 +398,9 @@ int pstree_main(int argc UNUSED_PARAM, char **argv) | |
| } | |
| } | |
| - | maybe_free_buffers(); |
| + | if (ENABLE_FEATURE_CLEAN_UP) { |
| + | free(G.width); |
| + | free(G.more); |
| + | } |
| return 0; | |
| } | |