emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: adjust 'noop' callback definition, <PIDS> api

Browse Source 
Though all those callback's parameters are ignored and
qsort treats them as pointers to void, it's wrong when
3rd parm is 'enum pids_item', not 'struct sort_parms'.

So we will fix it in a way that lessens the likelihood
of another such a mistake when some new type is added.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2016-06-09 00:00:00 -05:00 committed by Craig Small
parent e80b48ce58
commit f897a495ee
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
proc/pids.c
View File

@ -285,16 +285,16 @@ struct sort_parms {
enum pids_sort_order order; enum pids_sort_order order;
}; };
#define srtNAME(e) sort_results_ ## e #define srtNAME(t) sort_results_ ## t
#define srtDECL(t) static int srtNAME(t) \
(const struct pids_stack **A, const struct pids_stack **B, struct sort_parms *P)
#define NUM_srt(T) static int srtNAME(T) ( \ #define NUM_srt(T) srtDECL(T) { \
const struct pids_stack **A, const struct pids_stack **B, struct sort_parms *P) { \
const struct pids_result *a = (*A)->head + P->offset; \ const struct pids_result *a = (*A)->head + P->offset; \
const struct pids_result *b = (*B)->head + P->offset; \ const struct pids_result *b = (*B)->head + P->offset; \
return P->order * (a->result. T - b->result. T); } return P->order * (a->result. T - b->result. T); }
#define REG_srt(T) static int srtNAME(T) ( \ #define REG_srt(T) srtDECL(T) { \
const struct pids_stack **A, const struct pids_stack **B, struct sort_parms *P) { \
const struct pids_result *a = (*A)->head + P->offset; \ const struct pids_result *a = (*A)->head + P->offset; \
const struct pids_result *b = (*B)->head + P->offset; \ const struct pids_result *b = (*B)->head + P->offset; \
if ( a->result. T > b->result. T ) return P->order > 0 ? 1 : -1; \ if ( a->result. T > b->result. T ) return P->order > 0 ? 1 : -1; \
@ -309,34 +309,31 @@ REG_srt(u_int)
REG_srt(ul_int) REG_srt(ul_int)
REG_srt(ull_int) REG_srt(ull_int)
static int srtNAME(str) ( srtDECL(str) {
const struct pids_stack **A, const struct pids_stack **B, struct sort_parms *P) {
const struct pids_result *a = (*A)->head + P->offset; const struct pids_result *a = (*A)->head + P->offset;
const struct pids_result *b = (*B)->head + P->offset; const struct pids_result *b = (*B)->head + P->offset;
return P->order * strcoll(a->result.str, b->result.str); return P->order * strcoll(a->result.str, b->result.str);
} }
static int srtNAME(strv) ( srtDECL(strv) {
const struct pids_stack **A, const struct pids_stack **B, struct sort_parms *P) {
const struct pids_result *a = (*A)->head + P->offset; const struct pids_result *a = (*A)->head + P->offset;
const struct pids_result *b = (*B)->head + P->offset; const struct pids_result *b = (*B)->head + P->offset;
if (!a->result.strv || !b->result.strv) return 0; if (!a->result.strv || !b->result.strv) return 0;
return P->order * strcoll((*a->result.strv), (*b->result.strv)); return P->order * strcoll((*a->result.strv), (*b->result.strv));
} }
static int srtNAME(strvers) ( srtDECL(strvers) {
const struct pids_stack **A, const struct pids_stack **B, struct sort_parms *P) {
const struct pids_result *a = (*A)->head + P->offset; const struct pids_result *a = (*A)->head + P->offset;
const struct pids_result *b = (*B)->head + P->offset; const struct pids_result *b = (*B)->head + P->offset;
return P->order * strverscmp(a->result.str, b->result.str); return P->order * strverscmp(a->result.str, b->result.str);
} }
static int srtNAME(noop) ( srtDECL(noop) {
const struct pids_stack **A, const struct pids_stack **B, enum pids_item *O) { (void)A; (void)B; (void)P;
(void)A; (void)B; (void)O;
return 0; return 0;
} }
#undef srtDECL
#undef NUM_srt #undef NUM_srt
#undef REG_srt #undef REG_srt
@ -515,12 +512,6 @@ static struct {
enum pids_item PROCPS_PIDS_logical_end = PROCPS_PIDS_WCHAN_NAME + 1; enum pids_item PROCPS_PIDS_logical_end = PROCPS_PIDS_WCHAN_NAME + 1;
#undef setNAME #undef setNAME
#undef setDECL
#undef CVT_set
#undef DUP_set
#undef REG_set
#undef STR_set
#undef VEC_set
#undef freNAME #undef freNAME
#undef srtNAME #undef srtNAME
#undef RS #undef RS