aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.2.3641: xxd code has duplicate expressions

Browse Source 
Problem:    Xxd code has duplicate expressions.
Solution:   Refactor to avoid duplication. (closes #9185)
This commit is contained in:
DungSaga 2021-11-22 11:57:31 +00:00 committed by Bram Moolenaar
parent 88a4205f1c
commit 581f41adb3
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3641,
/**/
3640,
/**/

20
src/xxd/xxd.c
View File

@ -811,24 +811,16 @@ main(int argc, char *argv[])
{
if (p == 0)
{
if (decimal_offset)
addrlen = sprintf(l, "%08ld:",
((unsigned long)(n + seekoff + displayoff)));
else
addrlen = sprintf(l, "%08lx:",
addrlen = sprintf(l, decimal_offset ? "%08ld:" : "%08lx:",
((unsigned long)(n + seekoff + displayoff)));
for (c = addrlen; c < LLEN; l[c++] = ' ');
}
if (hextype == HEX_NORMAL)
if (hextype == HEX_NORMAL || hextype == HEX_LITTLEENDIAN)
{
l[c = (addrlen + 1 + (grplen * p) / octspergrp)] = hexx[(e >> 4) & 0xf];
l[++c] = hexx[ e & 0xf];
}
else if (hextype == HEX_LITTLEENDIAN)
{
int x = p ^ (octspergrp-1);
l[c = (addrlen + 1 + (grplen * x) / octspergrp)] = hexx[(e >> 4) & 0xf];
l[++c] = hexx[ e & 0xf];
int x = hextype == HEX_NORMAL ? p : p ^ (octspergrp-1);
l[c = (addrlen + 1 + (grplen * x) / octspergrp)]
= hexx[(e >> 4) & 0xf];
l[++c] = hexx[e & 0xf];
}
else /* hextype == HEX_BITS */
{