empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(as_extend, as_costcomp, gen_power, powcmp): Fix non-portable function

Browse source 
cast.
(qsort_func_t): Unused, remove.
This commit is contained in:
Markus Armbruster 2005-02-24 18:47:26 +00:00
parent b360d076d3
commit 0aaf0084aa
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/misc.h
View file

@ -132,8 +132,6 @@ extern int debug;
*/ */
#define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__) : 0) #define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__) : 0)
typedef int (*qsort_func_t) (const void *, const void *);
/* return codes from command routines */ /* return codes from command routines */
#define RET_OK 0 /* command completed sucessfully */ #define RET_OK 0 /* command completed sucessfully */
#define RET_FAIL 1 /* command completed unsucessfully [?] */ #define RET_FAIL 1 /* command completed unsucessfully [?] */

2
src/lib/as/as.h
View file

@ -172,7 +172,7 @@ extern void as_disable_cachepath(void);
extern void as_makepath(struct as_data *adp); extern void as_makepath(struct as_data *adp);
extern void as_free_path(struct as_path *pp); extern void as_free_path(struct as_path *pp);
extern int as_costcomp(struct as_node **n1, struct as_node **n2); extern int as_costcomp(const void *, const void *);
extern struct as_queue *as_extend(struct as_data *adp); extern struct as_queue *as_extend(struct as_data *adp);
extern struct as_queue *as_merge(struct as_data *adp, extern struct as_queue *as_merge(struct as_data *adp,
struct as_queue *head, struct as_queue *head,

4
src/lib/as/as_costcomp.c
View file

@ -25,8 +25,10 @@
* Used as comparision function for qsort. * Used as comparision function for qsort.
*/ */
int int
as_costcomp(struct as_node **n1, struct as_node **n2) as_costcomp(const void *p1, const void *p2)
{ {
struct as_node *const *n1 = p1;
struct as_node *const *n2 = p2;
double diff; double diff;
diff = (*n1)->lbcost - (*n2)->lbcost; diff = (*n1)->lbcost - (*n2)->lbcost;

2
src/lib/as/as_extend.c
View file

@ -50,7 +50,7 @@ as_extend(struct as_data *adp)
return (NULL); return (NULL);
if (i > 1) if (i > 1)
qsort(adp->neighbor_nodes, i, qsort(adp->neighbor_nodes, i,
sizeof(*adp->neighbor_nodes), (qsort_func_t)as_costcomp); sizeof(*adp->neighbor_nodes), as_costcomp);
/* remove old coord from head of queue and add to list of tried */ /* remove old coord from head of queue and add to list of tried */
qp = head; qp = head;

14
src/lib/commands/powe.c
View file

@ -60,7 +60,7 @@ struct powsort {
static void addtopow(short *vec, struct powstr *pow); static void addtopow(short *vec, struct powstr *pow);
static void gen_power(void); static void gen_power(void);
static void out5(double value, int round_val, int round_flag); static void out5(double value, int round_val, int round_flag);
static int powcmp(struct powsort *p1, struct powsort *p2); static int powcmp(const void *, const void *);
static int set_target(s_char *, int *); static int set_target(s_char *, int *);
int int
@ -325,19 +325,16 @@ gen_power(void)
for (i = 1; i < MAXNOC; i++) { for (i = 1; i < MAXNOC; i++) {
struct natstr *np; struct natstr *np;
int maxpop; int maxpop;
float f = 1.0;
if (opt_RES_POP) { if (opt_RES_POP) {
np = getnatp(i); np = getnatp(i);
maxpop = max_population(np->nat_level[NAT_RLEV], SCT_MINE, 0); maxpop = max_population(np->nat_level[NAT_RLEV], SCT_MINE, 0);
f = 1.0 + (((float)maxpop) / 10000.0); powbuf[i].p_power *= 1.0 + maxpop / 10000.0;
} }
powbuf[i].p_power *= f;
order[i].powval = powbuf[i].p_power; order[i].powval = powbuf[i].p_power;
order[i].cnum = i; order[i].cnum = i;
} }
qsort((s_char *)&order[1], MAXNOC - 1, sizeof(*order), qsort(&order[1], MAXNOC - 1, sizeof(*order), powcmp);
(qsort_func_t)powcmp);
putpower(0, &powbuf[0]); putpower(0, &powbuf[0]);
for (i = 1; i < MAXNOC; i++) { for (i = 1; i < MAXNOC; i++) {
putpower(i, &powbuf[order[i].cnum]); putpower(i, &powbuf[order[i].cnum]);
@ -353,8 +350,11 @@ gen_power(void)
} }
static int static int
powcmp(struct powsort *p1, struct powsort *p2) powcmp(const void *a, const void *b)
{ {
const struct powsort *p1 = a;
const struct powsort *p2 = b;
if (p1->powval > p2->powval) if (p1->powval > p2->powval)
return -1; return -1;
if (p1->powval < p2->powval) if (p1->powval < p2->powval)