do it more efficiently.

diff --git a/src/apprentice.c b/src/apprentice.c
index 273b4fd975cc111284325a539c63e16da8d90c10..7db3b650826a67cf5363e0ce31b758f9c1bb4734 100644 (file)
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef        lint
-FILE_RCSID("@(#)$Id: apprentice.c,v 1.61 2003/08/10 14:25:14 christos Exp $")
+FILE_RCSID("@(#)$Id: apprentice.c,v 1.62 2003/09/12 19:08:48 christos Exp $")
 #endif /* lint */
 
 #define        EATAB {while (isascii((unsigned char) *l) && \
@@ -914,7 +914,6 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
        char buf[MAXPATHLEN];
        char *dbname = mkdbname(fn, buf, sizeof(buf));
        void *mm;
-       int rv;
 
        if (dbname == NULL)
                return -1;
@@ -934,7 +933,7 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
                file_error(ms, "Cannot map `%s' (%s)", dbname, strerror(errno));
                goto error;
        }
-       rv = 2;
+#define RET    2
 #else
        if ((mm = malloc((size_t)st.st_size)) == NULL) {
                file_oomem(ms);
@@ -944,7 +943,7 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
                file_error(ms, "Read failed (%s)", strerror(errno));
                goto error;
        }
-       rv = 1;
+#define RET    1
 #endif
        *magicp = mm;
        (void)close(fd);
@@ -971,7 +970,7 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
        (*magicp)++;
        if (needsbyteswap)
                byteswap(*magicp, *nmagicp);
-       return rv;
+       return RET;
 
 error:
        if (fd != -1)