From f916cf067d42d1dfd8ed477fdd5e3f0bda665eee Mon Sep 17 00:00:00 2001 From: Eliseo Martínez Date: Sat, 19 Apr 2014 20:07:05 +0200 Subject: Use portable format specifiers: Remove branching with LONG_LONG_OFF_T. After previous commits, branching code by using macro LONG_LONG_OFF_T becomes unneccesary. Remove it. --- src/fileio.c | 9 --------- src/vim.h | 10 ---------- 2 files changed, 19 deletions(-) (limited to 'src') diff --git a/src/fileio.c b/src/fileio.c index a9d30f83db..c09a82f613 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4147,12 +4147,7 @@ void msg_add_lines(int insert_space, long lnum, off_t nchars) if (insert_space) *p++ = ' '; if (shortmess(SHM_LINES)) { -#ifdef LONG_LONG_OFF_T sprintf((char *)p, "%ldL, %" PRId64 "C", lnum, (int64_t)nchars); -#else - /* Explicit typecast avoids warning on Mac OS X 10.6 */ - sprintf((char *)p, "%ldL, %ldC", lnum, (long)nchars); -#endif } else { if (lnum == 1) @@ -4163,11 +4158,7 @@ void msg_add_lines(int insert_space, long lnum, off_t nchars) if (nchars == 1) STRCPY(p, _("1 character")); else { -#ifdef LONG_LONG_OFF_T sprintf((char *)p, _("%" PRId64 " characters"), nchars); -#else - sprintf((char *)p, _("%ld characters"), (long)nchars); -#endif } } } diff --git a/src/vim.h b/src/vim.h index 150cd8465c..d4cc7181f8 100644 --- a/src/vim.h +++ b/src/vim.h @@ -93,16 +93,6 @@ typedef long __w64 long_i; # define PRINTF_HEX_LONG_U "0x%lx" #define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U -/* - * Only systems which use configure will have SIZEOF_OFF_T and SIZEOF_LONG - * defined, which is ok since those are the same systems which can have - * varying sizes for off_t. The other systems will continue to use "%ld" to - * print off_t since off_t is simply a typedef to long for them. - */ -#if defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T > SIZEOF_LONG) -# define LONG_LONG_OFF_T -#endif - /* * The characters and attributes cached for the screen. */ -- cgit