(get_empobj_chr): Removed local cp. Return the result directly.

diff --git a/src/lib/common/empobj.c b/src/lib/common/empobj.c
index 63a43331179b23fa09df493b17533bfa8387aa2b..fdad3ae76956113f7fedfce375d022e2f42f9a34 100644 (file)
--- 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 *