From edd260625eeefbc4605922aa28305b31a7f15260 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 24 Jun 2008 14:16:35 +0200 Subject: avoid warnings, adjust for const-correctness * libidu/scanners.c (long_options_c, long_options_asm) (long_options_text, long_options_perl): Add initializers. * src/fid.c (long_options): Add initializers. * src/fnid.c (long_options): Add initializers. * src/lid.c (ATTRIBUTE_UNUSED): Define. (long_options): Add initializers. (report_nothing): Mark parameter as unused. (get_editor_argv, report_edit): Adjust for const-correctness. * src/mkid.c (long_options): Add initializers. (report_statistics): Don't subtract "void*" pointers. Cast to "char*". * src/xtokid.c (long_options): Add initializers. --- src/mkid.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/mkid.c') diff --git a/src/mkid.c b/src/mkid.c index 4132f84..6e91f4a 100644 --- a/src/mkid.c +++ b/src/mkid.c @@ -142,7 +142,7 @@ static struct option const long_options[] = { "statistics", no_argument, 0, 's' }, { "help", no_argument, &show_help, 1 }, { "version", no_argument, &show_version, 1 }, - { 0 } + {NULL, 0, NULL, 0} }; static void @@ -555,8 +555,10 @@ report_statistics (void) printf (_("Tokens=%ld, "), occurrences); printf (_("Bytes=%ld Kb, "), input_chars / 1024); printf (_("Heap=%llu+%llu Kb, "), - (unsigned long long) (heap_after_scan - heap_after_walk) / 1024, - (unsigned long long) (heap_after_walk - heap_initial) / 1024); + (unsigned long long) ((char *) heap_after_scan + - (char *) heap_after_walk) / 1024, + (unsigned long long) ((char *) heap_after_walk + - (char *) heap_initial) / 1024); printf (_("Output=%ld (%ld tok, %ld hit)\n"), output_length, tokens_length, hits_length); -- cgit v1.2.3