Browse Source

qsort() usage, drop cast of the first argument (which is a void *)

pre-master-46
rlar 16 years ago
parent
commit
bf0b7b4386
  1. 10
      ChangeLog
  2. 2
      src/frontend/com_ahelp.c
  3. 2
      src/frontend/com_display.c
  4. 2
      src/frontend/com_help.c
  5. 2
      src/frontend/help/readhelp.c
  6. 2
      src/frontend/variable.c
  7. 2
      src/frontend/vectors.c
  8. 2
      src/misc/wlist.c

10
ChangeLog

@ -1,3 +1,13 @@
2010-10-24 Robert Larice
* src/frontend/com_ahelp.c ,
* src/frontend/com_display.c ,
* src/frontend/com_help.c ,
* src/frontend/help/readhelp.c ,
* src/frontend/variable.c ,
* src/frontend/vectors.c ,
* src/misc/wlist.c :
qsort() usage, drop cast of the first argument (which is a void *)
2010-10-24 Robert Larice
* src/maths/sparse/spalloc.c ,
* src/maths/sparse/spbuild.c ,

2
src/frontend/com_ahelp.c

@ -66,7 +66,7 @@ com_ahelp(wordlist *wl)
for (n = 0; cp_coms[n].co_func != NULL; n++) {
cc[n] = &cp_coms[n];
}
qsort((char *) cc, n, sizeof(struct comm *), hcomp);
qsort(cc, n, sizeof(struct comm *), hcomp);
/* filter the commands */
for (i=0; i< n; i++) {

2
src/frontend/com_display.c

@ -65,7 +65,7 @@ com_display(wordlist *wl)
for (d = plot_cur->pl_dvecs, i = 0; d; d = d->v_next, i++)
dvs[i] = d;
if (!cp_getvar("nosort", CP_BOOL, NULL))
qsort((char *) dvs, len, sizeof (struct dvec *), dcomp);
qsort(dvs, len, sizeof (struct dvec *), dcomp);
out_printf("Title: %s\n", plot_cur->pl_title);
out_printf("Name: %s (%s)\nDate: %s\n\n",

2
src/frontend/com_help.c

@ -42,7 +42,7 @@ com_help(wordlist *wl)
/* Sort the commands */
for (numcoms = 0; cp_coms[numcoms].co_func != NULL; numcoms++)
ccc[numcoms] = &cp_coms[numcoms];
qsort((char *) ccc, numcoms, sizeof (struct comm *), hcomp);
qsort(ccc, numcoms, sizeof (struct comm *), hcomp);
for (i = 0; i < numcoms; i++) {
if ((ccc[i]->co_spiceonly && ft_nutmeg) ||

2
src/frontend/help/readhelp.c

@ -51,7 +51,7 @@ sortlist(toplink **tlp)
vec = (toplink **) tmalloc(sizeof (toplink *) * num);
for (tl = *tlp, i = 0; tl; tl = tl->next, i++)
vec[i] = tl;
(void) qsort((char *) vec, num, sizeof (toplink *), sortcmp);
(void) qsort(vec, num, sizeof (toplink *), sortcmp);
*tlp = vec[0];
for (i = 0; i < num - 1; i++)
vec[i]->next = vec[i + 1];

2
src/frontend/variable.c

@ -913,7 +913,7 @@ cp_vprint(void)
vars[i].x_char = '+';
}
qsort((char *) vars, i, sizeof (struct xxx), vcmp);
qsort(vars, i, sizeof (struct xxx), vcmp);
for (j = 0; j < i; j++) {
if (j && eq(vars[j].x_v->va_name, vars[j - 1].x_v->va_name))

2
src/frontend/vectors.c

@ -198,7 +198,7 @@ sortvecs(struct dvec *d)
for (t = d, i = 0; t; t = t->v_link2)
array[i++] = t;
qsort((char *) array, i, sizeof (struct dvec *), veccmp);
qsort(array, i, sizeof (struct dvec *), veccmp);
/* Now string everything back together... */
for (j = 0; j < i - 1; j++)

2
src/misc/wlist.c

@ -248,7 +248,7 @@ wl_sort(wordlist *wl)
stuff = (char **) tmalloc(i * sizeof (char *));
for (i = 0, ww = wl; ww; i++, ww = ww->wl_next)
stuff[i] = ww->wl_word;
qsort((char *) stuff, i, sizeof (char *), wlcomp);
qsort(stuff, i, sizeof (char *), wlcomp);
for (i = 0, ww = wl; ww; i++, ww = ww->wl_next)
ww->wl_word = stuff[i];
tfree(stuff);

Loading…
Cancel
Save