From 59a357dfbe786ef1d2dca575f3fb025f06357b78 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 3 Mar 2010 09:13:26 -0800 Subject: [PATCH] Merged some lemon diffs from sqlite's fossil repo: Visual Studio compile fixes. --- misc/lemon.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/misc/lemon.c b/misc/lemon.c index 31efa0ea..5b0fcf3a 100644 --- a/misc/lemon.c +++ b/misc/lemon.c @@ -51,7 +51,6 @@ static void LemonAtExit(void) if (!successful_exit) { remove(made_files[i]); } - free((void *) made_files[i]); } free(made_files); made_files_count = 0; @@ -408,7 +407,7 @@ static int actioncmp( rc = ap1->x.rp->index - ap2->x.rp->index; } if( rc==0 ){ - rc = ap2 - ap1; + rc = (int) (ap2 - ap1); } return rc; } @@ -2817,10 +2816,9 @@ PRIVATE FILE *file_open( if(( *mode=='w' ) && (strcmp(suffix, ".out") != 0)){ const char **ptr = (const char **) realloc(made_files, sizeof (const char **) * (made_files_count + 1)); - char *fname = strdup(lemp->outname); + const char *fname = Strsafe(lemp->outname); if ((ptr == NULL) || (fname == NULL)) { free(ptr); - free(fname); memory_error(); } made_files = ptr;