diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /libkdenetwork/libgpgme-copy/gpgme/memrchr.c | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdenetwork/libgpgme-copy/gpgme/memrchr.c')
-rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/memrchr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c index 4f91ef2b..83d66169 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c +++ b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c @@ -70,7 +70,7 @@ __memrchr (s, c_in, n) { const unsigned char *char_ptr; const unsigned long int *longword_ptr; - unsigned long int longword, magic_bits, charmask; + unsigned long int longword, magic_bits, chartqmask; unsigned reg_char c; c = (unsigned char) c_in; @@ -109,10 +109,10 @@ __memrchr (s, c_in, n) #endif /* Set up a longword, each of whose bytes is C. */ - charmask = c | (c << 8); - charmask |= charmask << 16; + chartqmask = c | (c << 8); + chartqmask |= chartqmask << 16; #if LONG_MAX > LONG_MAX_32_BITS - charmask |= charmask << 32; + chartqmask |= chartqmask << 32; #endif /* Instead of the traditional loop which tests each character, @@ -154,7 +154,7 @@ __memrchr (s, c_in, n) each of whose bytes is C. This turns each byte that is C into a zero. */ - longword = *--longword_ptr ^ charmask; + longword = *--longword_ptr ^ chartqmask; /* Add MAGIC_BITS to LONGWORD. */ if ((((longword + magic_bits) |