From cf6de2541be94dfd89071bfa77327074e1077ad7 Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Wed, 26 Jul 2006 00:54:33 +0000 Subject: [PATCH] (get_empobj_chr): Removed local cp. Return the result directly. --- src/lib/common/empobj.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/lib/common/empobj.c b/src/lib/common/empobj.c index 63a43331..fdad3ae7 100644 --- a/src/lib/common/empobj.c +++ b/src/lib/common/empobj.c @@ -85,30 +85,21 @@ put_empobj(struct empobj *gp) void * get_empobj_chr(struct empobj *gp) { - void *cp; - switch (gp->ef_type) { case EF_LAND: - cp = &lchr[(int)gp->type]; - break; + return &lchr[(int)gp->type]; case EF_SHIP: - cp = &mchr[(int)gp->type]; - break; + return &mchr[(int)gp->type]; case EF_PLANE: - cp = &plchr[(int)gp->type]; - break; + return &plchr[(int)gp->type]; case EF_NUKE: - cp = &nchr[(int)gp->type]; - break; + return &nchr[(int)gp->type]; case EF_SECTOR: - cp = &dchr[(int)gp->type]; - break; + return &dchr[(int)gp->type]; default: CANT_HAPPEN("unsupported TYPE"); - cp = NULL; - break; } - return cp; + return NULL; } char *