(ontradingblock, trdswitchown): Second parameter is a generic pointer,

change it from int * to void *.  Callers changed not to cast to int *.

include/prototypes.h

@@ -77,8 +77,8 @@ extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
 extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
 extern s_char *prsub(struct shpstr *);
 extern int check_trade(void);
-extern int ontradingblock(int, int *);
+extern int ontradingblock(int, void *);
-extern void trdswitchown(int, int *, int);
+extern void trdswitchown(int, void *, int);
 /* Commands */
 int acce(void);
 int add(void);

src/lib/commands/arm.c

@@ -75,7 +75,7 @@ arm(void)
 	return RET_FAIL;
     }
     if (opt_MARKET) {
-	if (ontradingblock(EF_PLANE, (int *)&pl)) {
+	if (ontradingblock(EF_PLANE, &pl)) {
 	    pr("You cannot arm/disarm an item on the trading block!\n");
 	    return RET_FAIL;
 	}

src/lib/commands/laun.c

@@ -94,7 +94,7 @@ laun(void)
 	    continue;
 	}
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_PLANE, (int *)&plane)) {
+	    if (ontradingblock(EF_PLANE, &plane)) {
 		pr("plane #%d inelligible - it's for sale.\n",
 		   plane.pln_uid);
 		continue;

src/lib/commands/load.c

@@ -121,7 +121,7 @@ load(void)
 	    continue;
 	}
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_SHIP, (int *)&ship)) {
+	    if (ontradingblock(EF_SHIP, &ship)) {
 		pr("You cannot load/unload an item on the trading block!\n");
 		continue;
 	    }
@@ -266,7 +266,7 @@ lload(void)
 	if (sect.sct_own != player->cnum && land.lnd_own != player->cnum)
 	    continue;
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_LAND, (int *)&land)) {
+	    if (ontradingblock(EF_LAND, &land)) {
 		pr("You cannot load/unload an item on the trading block!\n");
 		continue;
 	    }

src/lib/commands/scra.c

@@ -142,7 +142,7 @@ scra(void)
 	    continue;
 
 	if (opt_MARKET) {
-	    if (ontradingblock(type, (int *)&item.ship)) {
+	    if (ontradingblock(type, &item.ship)) {
 		pr("You cannot scrap an item on the trading block!\n");
 		continue;
 	    }

src/lib/commands/scut.c

@@ -209,7 +209,7 @@ scut(void)
 	if (!player->owner)
 	    continue;
 	if (opt_MARKET) {
-	    if (ontradingblock(type, (int *)&item.ship)) {
+	    if (ontradingblock(type, &item.ship)) {
 		pr("You cannot scuttle an item on the trading block!\n");
 		continue;
 	    }

src/lib/commands/trad.c

@@ -495,8 +495,7 @@ check_trade(void)
 }
 
 int
-ontradingblock(int type, int *ptr)
+ontradingblock(int type, void *ptr)
-	  /* Generic pointer */
 {
     struct trdstr trade;
     union trdgenstr tg;
@@ -516,8 +515,7 @@ ontradingblock(int type, int *ptr)
 }
 
 void
-trdswitchown(int type, int *ptr, int newown)
+trdswitchown(int type, void *ptr, int newown)
-	  /* Generic pointer */
 {
     struct trdstr trade;
     union trdgenstr tg;

src/lib/subs/attsub.c

@@ -219,7 +219,7 @@ att_get_combat(struct combat *com, int isdef)
 	}
 	if (opt_MARKET) {
 	    if (isdef && player->owner &&
-		ontradingblock(EF_SHIP, (int *)&ship)) {
+		ontradingblock(EF_SHIP, &ship)) {
 		pr("%s is on the trading block.\n", prcom(0, com));
 		return att_combat_init(com, EF_BAD);
 	    }
@@ -983,7 +983,7 @@ ask_olist(int combat_mode, struct combat *off, struct combat *def,
 	}
 
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_LAND, (int *)&land)) {
+	    if (ontradingblock(EF_LAND, &land)) {
 		pr("%s is on the trading block, and cannot %s\n",
 		   prland(&land), att_mode[combat_mode]);
 		continue;

src/lib/subs/lndsub.c

@@ -514,7 +514,7 @@ lnd_sel(struct nstr_item *ni, struct emp_qelem *list)
 	if (!player->owner)
 	    continue;
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_LAND, (int *)&land)) {
+	    if (ontradingblock(EF_LAND, &land)) {
 		pr("unit #%d inelligible - it's for sale.\n",
 		   land.lnd_uid);
 		continue;

src/lib/subs/mission.c

@@ -1009,7 +1009,7 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags,
 	}
 
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_PLANE, (int *)pp)) {
+	    if (ontradingblock(EF_PLANE, pp)) {
 		emp_remque(qp);
 		free(qp);
 		continue;

src/lib/subs/plnsub.c

@@ -393,7 +393,7 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
 	if (plane.pln_mobil <= 0)
 	    continue;
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_PLANE, (int *)&plane)) {
+	    if (ontradingblock(EF_PLANE, &plane)) {
 		pr("plane #%d inelligible - it's for sale.\n",
 		   plane.pln_uid);
 		continue;

src/lib/subs/shpsub.c

@@ -82,7 +82,7 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list)
 	   continue;
 	 */
 	if (opt_MARKET) {
-	    if (ontradingblock(EF_SHIP, (int *)&ship)) {
+	    if (ontradingblock(EF_SHIP, &ship)) {
 		pr("ship #%d inelligible - it's for sale.\n",
 		   ship.shp_uid);
 		continue;

src/lib/subs/takeover.c

@@ -199,7 +199,7 @@ takeover_plane(struct plnstr *pp, natid newown)
 	   cname(newown), xyas(pp->pln_x, pp->pln_y, pp->pln_own));
     }
     if (opt_MARKET)
-	trdswitchown(EF_PLANE, (int *)pp, newown);
+	trdswitchown(EF_PLANE, pp, newown);
     if (pp->pln_mobil > 0)
 	pp->pln_mobil = 0;
     makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
@@ -219,7 +219,7 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
     struct lndstr llp;
 
     if (opt_MARKET)
-	trdswitchown(EF_SHIP, (int *)sp, newown);
+	trdswitchown(EF_SHIP, sp, newown);
     makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y);
     sp->shp_own = newown;
     makenotlost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y);
@@ -246,7 +246,7 @@ takeover_ship(struct shpstr *sp, natid newown, int hostile)
 	/* Keep track of when this was taken over */
 	time(&pp->pln_access);
 	if (opt_MARKET)
-	    trdswitchown(EF_PLANE, (int *)pp, newown);
+	    trdswitchown(EF_PLANE, pp, newown);
 	pp->pln_mission = 0;
 	makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
 	pp->pln_own = newown;
@@ -285,7 +285,7 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
     /* Keep track of when this was taken over */
     time(&landp->lnd_access);
     if (opt_MARKET)
-	trdswitchown(EF_LAND, (int *)landp, newown);
+	trdswitchown(EF_LAND, landp, newown);
     landp->lnd_mission = 0;
     makelost(EF_LAND, landp->lnd_own, landp->lnd_uid, landp->lnd_x,
 	     landp->lnd_y);
@@ -309,7 +309,7 @@ takeover_land(struct lndstr *landp, natid newown, int hostile)
 	/* Keep track of when this was taken over */
 	time(&pp->pln_access);
 	if (opt_MARKET)
-	    trdswitchown(EF_PLANE, (int *)pp, newown);
+	    trdswitchown(EF_PLANE, pp, newown);
 	pp->pln_mission = 0;
 	makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
 	pp->pln_own = newown;