#include "gmqcc.h"
/* TODO: remove globals ... */
-uint64_t mem_ab = 0;
-uint64_t mem_db = 0;
-uint64_t mem_at = 0;
-uint64_t mem_dt = 0;
-uint64_t mem_pk = 0;
-uint64_t mem_hw = 0;
+static uint64_t mem_ab = 0;
+static uint64_t mem_db = 0;
+static uint64_t mem_at = 0;
+static uint64_t mem_dt = 0;
+static uint64_t mem_pk = 0;
+static uint64_t mem_hw = 0;
struct memblock_t {
const char *file;
/*
* only required if big endian .. otherwise no need to swap
* data.
- */
+ */
#if PLATFORM_BYTE_ORDER == GMQCC_BYTE_ORDER_BIG
static GMQCC_INLINE void util_swap16(uint16_t *d, size_t l) {
while (l--) {
/* Non - Reflected */
uint16_t util_crc16(uint16_t current, const char *k, size_t len) {
register uint16_t h = current;
- for (; len; --len, ++k)
+ for (; len; --len, ++k)
h = util_crc16_table[(h>>8)^((unsigned char)*k)]^(h<<8);
return h;
}
#if 0
uint16_t util_crc16(const char *k, int len, const short clamp) {
register uint16_t h= (uint16_t)0xFFFFFFFF;
- for (; len; --len, ++k)
+ for (; len; --len, ++k)
h = util_crc16_table[(h^((unsigned char)*k))&0xFF]^(h>>8);
- return (~h)%clamp;
+ return (~h)%clamp;
}
#endif
const unsigned char *data = (const unsigned char*)key;
while (size >= 4) {
- alias = *(uint32_t*)data;
-
+ alias = (data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24));
alias *= mix;
alias ^= alias >> rot;
alias *= mix;
return (size_t) (hash % ht->size);
}
-hash_node_t *_util_htnewpair(const char *key, void *value) {
+static hash_node_t *_util_htnewpair(const char *key, void *value) {
hash_node_t *node;
if (!(node = (hash_node_t*)mem_a(sizeof(hash_node_t))))
return NULL;
* Portable implementation of vasprintf/asprintf. Assumes vsnprintf
* exists, otherwise compiler error.
*
- * TODO: fix for MSVC ....
+ * TODO: fix for MSVC ....
*/
int util_vasprintf(char **dat, const char *fmt, va_list args) {
int ret;
* formatted string if it overflows. However there is a MSVC
* intrinsic (which is documented wrong) called _vcsprintf which
* will return the required amount to allocate.
- */
+ */
#ifdef _MSC_VER
- char *str;
if ((len = _vscprintf(fmt, args)) < 0) {
*dat = NULL;
return -1;
}
- tmp = mem_a(len + 1);
- if ((ret = _vsnprintf(tmp, len+1, fmt, args)) != len) {
+ tmp = (char*)mem_a(len + 1);
+ if ((ret = _vsnprintf_s(tmp, len+1, len+1, fmt, args)) != len) {
mem_d(tmp);
*dat = NULL;
return -1;
return read;
}
+/*
+ * These are various re-implementations (wrapping the real ones) of
+ * string functions that MSVC consideres unsafe. We wrap these up and
+ * use the safe varations on MSVC.
+ */
+#ifdef _MSC_VER
+ static char **util_strerror_allocated() {
+ static char **data = NULL;
+ return data;
+ }
+
+ static void util_strerror_cleanup(void) {
+ size_t i;
+ char **data = util_strerror_allocated();
+ for (i = 0; i < vec_size(data); i++)
+ mem_d(data[i]);
+ vec_free(data);
+ }
+
+ const char *util_strerror(int num) {
+ char *allocated = NULL;
+ static bool install = false;
+ static size_t tries = 0;
+ char **vector = util_strerror_allocated();
+
+ /* try installing cleanup handler */
+ while (!install) {
+ if (tries == 32)
+ return "(unknown)";
+
+ install = !atexit(&util_strerror_cleanup);
+ tries ++;
+ }
+
+ allocated = (char*)mem_a(4096); /* A page must be enough */
+ strerror_s(allocated, 4096, num);
+
+ vec_push(vector, allocated);
+ return (const char *)allocated;
+ }
+
+ int util_snprintf(char *src, size_t bytes, const char *format, ...) {
+ int rt;
+ va_list va;
+ va_start(va, format);
+
+ rt = vsprintf_s(src, bytes, format, va);
+ va_end (va);
+
+ return rt;
+ }
+
+ char *util_strcat(char *dest, const char *src) {
+ strcat_s(dest, strlen(src), src);
+ return dest;
+ }
+
+ char *util_strncpy(char *dest, const char *src, size_t num) {
+ strncpy_s(dest, num, src, num);
+ return dest;
+ }
+#else
+ const char *util_strerror(int num) {
+ return strerror(num);
+ }
+
+ int util_snprintf(char *src, size_t bytes, const char *format, ...) {
+ int rt;
+ va_list va;
+ va_start(va, format);
+ rt = vsnprintf(src, bytes, format, va);
+ va_end (va);
+
+ return rt;
+ }
+
+ char *util_strcat(char *dest, const char *src) {
+ return strcat(dest, src);
+ }
+
+ char *util_strncpy(char *dest, const char *src, size_t num) {
+ return strncpy(dest, src, num);
+ }
+
+#endif /*! _MSC_VER */
+
/*
* Implementation of the Mersenne twister PRNG (pseudo random numer
* generator). Implementation of MT19937. Has a period of 2^19937-1
* a branch that is executed every iteration from [0, MT_SIZE).
*
* Please see: http://www.quadibloc.com/crypto/co4814.htm for more
- * information on how this clever trick works.
+ * information on how this clever trick works.
*/
static const uint32_t matrix[2] = {
0x00000000,