mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-13 18:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings

Browse Source
This commit is contained in:
Rubasri Kalidas
2018-12-18 11:30:57 -06:00
parent 6460446aa6
commit 3003161eff
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linkhash.c
View File

@@ -36,6 +36,10 @@ static unsigned long lh_char_hash(const void *k);
static unsigned long lh_perllike_str_hash(const void *k); static unsigned long lh_perllike_str_hash(const void *k);
static lh_hash_fn *char_hash_fn = lh_char_hash; static lh_hash_fn *char_hash_fn = lh_char_hash;
/* comparison functions */
int lh_char_equal(const void *k1, const void *k2);
int lh_ptr_equal(const void *k1, const void *k2);
int int
json_global_set_string_hash(const int h) json_global_set_string_hash(const int h)
{ {

24
random_seed.c
View File

@@ -53,7 +53,7 @@ static void do_cpuid(int regs[], int h)
#if HAS_X86_CPUID #if HAS_X86_CPUID
static int has_rdrand() static int has_rdrand(void)
{ {
// CPUID.01H:ECX.RDRAND[bit 30] == 1 // CPUID.01H:ECX.RDRAND[bit 30] == 1
int regs[4]; int regs[4];
@@ -69,7 +69,7 @@ static int has_rdrand()
#define HAVE_RDRAND 1 #define HAVE_RDRAND 1
static int get_rdrand_seed() static int get_rdrand_seed(void)
{ {
DEBUG_SEED("get_rdrand_seed"); DEBUG_SEED("get_rdrand_seed");
int _eax; int _eax;
@@ -91,7 +91,7 @@ static int get_rdrand_seed()
/* get_rdrand_seed - Visual Studio 2012 and above */ /* get_rdrand_seed - Visual Studio 2012 and above */
static int get_rdrand_seed() static int get_rdrand_seed(void)
{ {
DEBUG_SEED("get_rdrand_seed"); DEBUG_SEED("get_rdrand_seed");
int r; int r;
@@ -104,7 +104,7 @@ static int get_rdrand_seed()
/* get_rdrand_seed - Visual Studio 2010 and below - x86 only */ /* get_rdrand_seed - Visual Studio 2010 and below - x86 only */
static int get_rdrand_seed() static int get_rdrand_seed(void)
{ {
DEBUG_SEED("get_rdrand_seed"); DEBUG_SEED("get_rdrand_seed");
int _eax; int _eax;
@@ -136,7 +136,7 @@ retry:
static const char *dev_random_file = "/dev/urandom"; static const char *dev_random_file = "/dev/urandom";
static int has_dev_urandom() static int has_dev_urandom(void)
{ {
struct stat buf; struct stat buf;
if (stat(dev_random_file, &buf)) { if (stat(dev_random_file, &buf)) {
@@ -148,7 +148,7 @@ static int has_dev_urandom()
/* get_dev_random_seed */ /* get_dev_random_seed */
static int get_dev_random_seed() static int get_dev_random_seed(void)
{ {
DEBUG_SEED("get_dev_random_seed"); DEBUG_SEED("get_dev_random_seed");
@@ -184,7 +184,7 @@ static int get_dev_random_seed()
#pragma comment(lib, "advapi32.lib") #pragma comment(lib, "advapi32.lib")
#endif #endif
static int get_cryptgenrandom_seed() static int get_cryptgenrandom_seed(void)
{ {
HCRYPTPROV hProvider = 0; HCRYPTPROV hProvider = 0;
int r; int r;
@@ -213,7 +213,7 @@ static int get_cryptgenrandom_seed()
#include <time.h> #include <time.h>
static int get_time_seed() static int get_time_seed(void)
{ {
DEBUG_SEED("get_time_seed"); DEBUG_SEED("get_time_seed");
@@ -223,15 +223,15 @@ static int get_time_seed()
/* json_c_get_random_seed */ /* json_c_get_random_seed */
int json_c_get_random_seed() int json_c_get_random_seed(void)
{ {
#if HAVE_RDRAND #if defined HAVE_RDRAND && HAVE_RDRAND
if (has_rdrand()) return get_rdrand_seed(); if (has_rdrand()) return get_rdrand_seed();
#endif #endif
#if HAVE_DEV_RANDOM #if defined HAVE_DEV_RANDOM && HAVE_DEV_RANDOM
if (has_dev_urandom()) return get_dev_random_seed(); if (has_dev_urandom()) return get_dev_random_seed();
#endif #endif
#if HAVE_CRYPTGENRANDOM #if defined HAVE_CRYPTGENRANDOM && HAVE_CRYPTGENRANDOM
return get_cryptgenrandom_seed(); return get_cryptgenrandom_seed();
#endif #endif
return get_time_seed(); return get_time_seed();

2
random_seed.h
View File

@@ -20,7 +20,7 @@
extern "C" { extern "C" {
#endif #endif
extern int json_c_get_random_seed(); extern int json_c_get_random_seed(void);
#ifdef __cplusplus #ifdef __cplusplus
} }