From e2f71ce46db640add7f71652f60f08bf8c02e6f8 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Tue, 2 Jun 2020 22:12:31 -0400 Subject: [PATCH] Improved the conditional compilation to save a few bytes --- sortdir.c | 7 ++++++- sortdir.po | Bin 143360 -> 143360 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sortdir.c b/sortdir.c index aac12a1..f158353 100644 --- a/sortdir.c +++ b/sortdir.c @@ -29,6 +29,7 @@ * v0.67 Fixed bug in v0.66 where garbage was written to end of directory. * v0.68 Cleaned up error msgs. * v0.69 Fixed support for drive number >2. (cc65 needs to be fixed too!) + * v0.70 ... */ //#pragma debug 9 @@ -234,14 +235,18 @@ static const char err_used2[] = "Blks used %u is wrong, should be %u"; static const char err_many[] = "Too many files to sort"; static const char err_count2[] = "Filecount %u wrong, should be %u"; static const char err_nosort[] = "Errors ... will not sort"; +#ifdef FREELIST static const char err_rdfl[] = "Can't read free list"; static const char err_blfree1[] = "In use blk %u is marked free"; static const char err_blfree2[] = "%s blk %u is marked free"; static const char err_blused1[] = "Unused blk %u is not marked free"; static const char err_blused2[] = "%s blk %u used elsewhere"; +#endif static const char err_updsdir1[] = "Can't update subdir entry (%s)"; static const char err_invopt[] = "Invalid %s option"; +#ifdef CMDLINE static const char err_usage[] = "Usage error"; +#endif static const char err_80col[] = "Need 80 cols"; static const char err_128K[] = "Need 128K"; @@ -1878,7 +1883,7 @@ void interactive(void) { doverbose = 1; - puts("S O R T D I R v0.69 alpha Use ^ to return to previous question"); + puts("S O R T D I R v0.70 alpha Use ^ to return to previous question"); q1: fputs("\nEnter path (e.g.: /H1) of starting directory> ", stdout); diff --git a/sortdir.po b/sortdir.po index 8459c0065b9a8a35d751cb5209c63131c3662aff..1832d32dda60d3d1a77c10e2661186d3e0cb6343 100644 GIT binary patch delta 8052 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 G9`_$oFS3vT delta 8194 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 L*nBlU{p9}uo#XxB