qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up after removal of uint32.h

Browse source 
I guess I forgot to check for its usage in header files, and the fact that
it didn't get cleaned out from being installed hid the error.
This commit is contained in:
Bill Currie 2020-02-29 16:11:07 +09:00
parent ae532870c4
commit 75f4cebf0e
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/QF/mdfour.h
View file

@ -29,17 +29,17 @@
#ifndef __QF_mdfour_h #ifndef __QF_mdfour_h
#define __QF_mdfour_h #define __QF_mdfour_h
#include "QF/qtypes.h"
/** \addtogroup crc /** \addtogroup crc
*/ */
///@{ ///@{
#include "QF/uint32.h"
#define MDFOUR_DIGEST_BYTES 16 #define MDFOUR_DIGEST_BYTES 16
struct mdfour { struct mdfour {
uint32 A, B, C, D; uint32_t A, B, C, D;
uint32 totalN; uint32_t totalN;
}; };
void mdfour_begin(struct mdfour *md); // old: MD4Init void mdfour_begin(struct mdfour *md); // old: MD4Init

19
libs/util/mdfour.c
View file

@ -37,7 +37,6 @@
#endif #endif
#include "QF/mdfour.h" #include "QF/mdfour.h"
#include "QF/uint32.h"
/* NOTE: This code makes no attempt to be fast! /* NOTE: This code makes no attempt to be fast!
It assumes that a int is at least 32 bits long It assumes that a int is at least 32 bits long
@ -62,12 +61,12 @@ static struct mdfour *m;
/* this applies md4 to 64 byte chunks */ /* this applies md4 to 64 byte chunks */
static void static void
mdfour64 (uint32 * M) mdfour64 (uint32_t * M)
{ {
int j; int j;
uint32 AA, BB, CC, DD; uint32_t AA, BB, CC, DD;
uint32 X[16]; uint32_t X[16];
uint32 A, B, C, D; uint32_t A, B, C, D;
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
X[j] = M[j]; X[j] = M[j];
@ -154,7 +153,7 @@ mdfour64 (uint32 * M)
} }
static void static void
copy64 (uint32 * M, const unsigned char *in) copy64 (uint32_t * M, const unsigned char *in)
{ {
int i; int i;
@ -164,7 +163,7 @@ copy64 (uint32 * M, const unsigned char *in)
} }
static void static void
copy4 (unsigned char *out, uint32 x) copy4 (unsigned char *out, uint32_t x)
{ {
out[0] = x & 0xFF; out[0] = x & 0xFF;
out[1] = (x >> 8) & 0xFF; out[1] = (x >> 8) & 0xFF;
@ -186,8 +185,8 @@ static void
mdfour_tail (const unsigned char *in, int n) mdfour_tail (const unsigned char *in, int n)
{ {
unsigned char buf[128]; unsigned char buf[128];
uint32 M[16]; uint32_t M[16];
uint32 b; uint32_t b;
m->totalN += n; m->totalN += n;
@ -214,7 +213,7 @@ mdfour_tail (const unsigned char *in, int n)
VISIBLE void VISIBLE void
mdfour_update (struct mdfour *md, const unsigned char *in, int n) mdfour_update (struct mdfour *md, const unsigned char *in, int n)
{ {
uint32 M[16]; uint32_t M[16];
if (n == 0) if (n == 0)
mdfour_tail (in, n); mdfour_tail (in, n);