IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use portable format specifiers: Remove branching with LONG_LONG_OFF_T.

Browse Source 
After previous commits, branching code by using macro LONG_LONG_OFF_T
becomes unneccesary. Remove it.
This commit is contained in:
Eliseo Martínez 2014-04-19 20:07:05 +02:00 committed by Thiago de Arruda
parent e4a1ea9e02
commit f916cf067d
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fileio.c
View File

@ -4147,12 +4147,7 @@ void msg_add_lines(int insert_space, long lnum, off_t nchars)
if (insert_space) if (insert_space)
*p++ = ' '; *p++ = ' ';
if (shortmess(SHM_LINES)) { if (shortmess(SHM_LINES)) {
#ifdef LONG_LONG_OFF_T
sprintf((char *)p, "%ldL, %" PRId64 "C", lnum, (int64_t)nchars); 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 { else {
if (lnum == 1) if (lnum == 1)
@ -4163,11 +4158,7 @@ void msg_add_lines(int insert_space, long lnum, off_t nchars)
if (nchars == 1) if (nchars == 1)
STRCPY(p, _("1 character")); STRCPY(p, _("1 character"));
else { else {
#ifdef LONG_LONG_OFF_T
sprintf((char *)p, _("%" PRId64 " characters"), nchars); sprintf((char *)p, _("%" PRId64 " characters"), nchars);
#else
sprintf((char *)p, _("%ld characters"), (long)nchars);
#endif
} }
} }
} }

10
src/vim.h
View File

@ -93,16 +93,6 @@ typedef long __w64 long_i;
# define PRINTF_HEX_LONG_U "0x%lx" # define PRINTF_HEX_LONG_U "0x%lx"
#define PRINTF_DECIMAL_LONG_U SCANF_DECIMAL_LONG_U #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. * The characters and attributes cached for the screen.
*/ */