mirror/diffutils
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/diffutils.git synced 2026-01-27 01:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

diff: prefer functions in io.c

Browse Source 
* src/io.c (HASH_VALUE_WIDTH): New constant.
(rol, hash): New static functions, replacing ...
(ROL, HASH): ... these macros.  All uses changed.
This commit is contained in:
Paul Eggert 2023-05-21 18:50:40 -07:00
parent 844c45fd72
commit efec6cce91
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/io.c
View File

@ -24,17 +24,26 @@
#include <file-type.h>
#include <stdckdint.h>
#include <xalloc.h>
/* Rotate an unsigned value to the left. */
#define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n)))
/* Given a hash value and a new character, return a new hash value. */
#define HASH(h, c) ((c) + ROL (h, 7))
/* The type of a hash value. */
typedef size_t hash_value;
enum { HASH_VALUE_WIDTH = SIZE_WIDTH };
verify (! TYPE_SIGNED (hash_value));
/* Rotate a hash value to the left. */
static hash_value
rol (hash_value v, int n)
{
return v << n | v >> (HASH_VALUE_WIDTH - n);
}
/* Given a hash value and a new character, return a new hash value. */
static hash_value
hash (hash_value h, unsigned char c)
{
return rol (h, 7) + c;
}
/* Lines are put into equivalence classes of lines that match in lines_differ.
Each equivalence class is represented by one of these structures,
but only while the classes are being computed.
@ -262,7 +271,7 @@ find_and_hash_each_line (struct file_data *current)
case IGNORE_ALL_SPACE:
while ((c = *p++) != '\n')
if (! isspace (c))
h = HASH (h, ig_case ? tolower (c) : c);
h = hash (h, ig_case ? tolower (c) : c);
break;
case IGNORE_SPACE_CHANGE:
@ -275,11 +284,11 @@ find_and_hash_each_line (struct file_data *current)
goto hashing_done;
while (isspace (c));
h = HASH (h, ' ');
h = hash (h, ' ');
}
/* C is now the first non-space. */
h = HASH (h, ig_case ? tolower (c) : c);
h = hash (h, ig_case ? tolower (c) : c);
}
break;
@ -334,7 +343,7 @@ find_and_hash_each_line (struct file_data *current)
c = tolower (c);
do
h = HASH (h, c);
h = hash (h, c);
while (--repetitions != 0);
}
}
@ -343,10 +352,10 @@ find_and_hash_each_line (struct file_data *current)
default:
if (ig_case)
while ((c = *p++) != '\n')
h = HASH (h, tolower (c));
h = hash (h, tolower (c));
else
while ((c = *p++) != '\n')
h = HASH (h, c);
h = hash (h, c);
break;
}