d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The scandir(3) function expects fourth parameter, compar, be in type of:

Browse Source 
int (*compar)(const struct dirent **, const struct dirent **)

The current code defines sortq() to accept two void *, then cast them
to const struct dirent **.  Because the code does not really need this
cast, we can eliminate the casts by changing the function prototype
to match scandir(3) expectation.

MFC after:	1 month
This commit is contained in:
Xin LI 2012-04-13 22:34:01 +00:00
parent ce2cb79269
commit 2c81fb6a72
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=234244
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/lpr/lpc/cmds.c
View File

@ -79,7 +79,7 @@ static char *args2line(int argc, char **argv);
static int doarg(char *_job);
static int doselect(const struct dirent *_d);
static int kill_qtask(const char *lf);
static int sortq(const void *_a, const void *_b);
static int sortq(const struct dirent **a, const struct dirent **b);
static int touch(struct jobqueue *_jq);
static void unlinkf(char *_name);
static void upstat(struct printer *_pp, const char *_msg, int _notify);
@ -486,14 +486,14 @@ doselect(const struct dirent *d)
* filenames (they will have datafile names which start with `dfB*').
*/
static int
sortq(const void *a, const void *b)
sortq(const struct dirent **a, const struct dirent **b)
{
const int a_lt_b = -1, a_gt_b = 1, cat_other = 10;
const char *fname_a, *fname_b, *jnum_a, *jnum_b;
int cat_a, cat_b, ch, res, seq_a, seq_b;
fname_a = (*(const struct dirent * const *)a)->d_name;
fname_b = (*(const struct dirent * const *)b)->d_name;
fname_a = (*a)->d_name;
fname_b = (*b)->d_name;
/*
* First separate filenames into categories. Categories are