[src/trunk]: src/usr.bin/file Make maxmagic always increase by a factor of 2.

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e349622cb6bf
branches:  trunk
changeset: 476043:e349622cb6bf
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sat Sep 04 19:51:11 1999 +0000

description:
Make maxmagic always increase by a factor of 2.

diffstat:

 usr.bin/file/apprentice.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 8515c1625d05 -r e349622cb6bf usr.bin/file/apprentice.c
--- a/usr.bin/file/apprentice.c Sat Sep 04 19:49:23 1999 +0000
+++ b/usr.bin/file/apprentice.c Sat Sep 04 19:51:11 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apprentice.c,v 1.15 1998/09/20 15:27:15 christos Exp $ */
+/*     $NetBSD: apprentice.c,v 1.16 1999/09/04 19:51:11 mycroft Exp $  */
 
 /*
  * apprentice - make one pass through /etc/magic, learning its secrets.
@@ -39,7 +39,7 @@
 #if 0
 FILE_RCSID("@(#)Id: apprentice.c,v 1.28 1998/09/12 13:17:52 christos Exp ")
 #else
-__RCSID("$NetBSD: apprentice.c,v 1.15 1998/09/20 15:27:15 christos Exp $");
+__RCSID("$NetBSD: apprentice.c,v 1.16 1999/09/04 19:51:11 mycroft Exp $");
 #endif
 #endif /* lint */
 
@@ -189,19 +189,18 @@
        struct magic *m;
        char *t, *s;
 
-#define ALLOC_INCR     20
        if (nd+1 >= maxmagic){
-           maxmagic += ALLOC_INCR;
            if ((magic = (struct magic *) realloc(magic, 
                                                  sizeof(struct magic) * 
-                                                 maxmagic)) == NULL) {
+                                                 maxmagic * 2)) == NULL) {
                (void) fprintf(stderr, "%s: Out of memory.\n", progname);
                if (check)
                        return -1;
                else
                        exit(1);
            }
-           memset(&magic[*ndx], 0, sizeof(struct magic) * ALLOC_INCR);
+           memset(&magic[maxmagic], 0, sizeof(struct magic) * maxmagic);
+           maxmagic *= 2;
        }
        m = &magic[*ndx];
        m->flag = 0;