Resolve warnings on Windows
Appease the compiler by resolving some of the reported warnings, including: - Control paths that don't return. - Potentially uninitialized variables. - Unused local variables. - Unreachable code. - Type safety. - Synchronize declarations with definitions for functions.
This commit is contained in:
@@ -175,6 +175,7 @@ _hx509_expr_eval(hx509_context context, hx509_env env, struct hx_expr *expr)
|
|||||||
return eval_comp(context, env, expr->arg1);
|
return eval_comp(context, env, expr->arg1);
|
||||||
default:
|
default:
|
||||||
_hx509_abort("hx509 eval expr with unknown op: %d", (int)expr->op);
|
_hx509_abort("hx509 eval expr with unknown op: %d", (int)expr->op);
|
||||||
|
UNREACHABLE(return 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -477,7 +477,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
|
|||||||
krb5_cc_set_default_name(krb5_context context, const char *name)
|
krb5_cc_set_default_name(krb5_context context, const char *name)
|
||||||
{
|
{
|
||||||
krb5_error_code ret = 0;
|
krb5_error_code ret = 0;
|
||||||
char *p, *exp_p = NULL;
|
char *p = NULL, *exp_p = NULL;
|
||||||
|
|
||||||
if (name == NULL) {
|
if (name == NULL) {
|
||||||
const char *e = NULL;
|
const char *e = NULL;
|
||||||
|
@@ -104,8 +104,6 @@ krb5_error_code
|
|||||||
_krb5_get_default_principal_local(krb5_context context,
|
_krb5_get_default_principal_local(krb5_context context,
|
||||||
krb5_principal *princ)
|
krb5_principal *princ)
|
||||||
{
|
{
|
||||||
krb5_error_code ret = 0;
|
|
||||||
|
|
||||||
/* See if we can get the principal first. We only expect this to
|
/* See if we can get the principal first. We only expect this to
|
||||||
work if logged into a domain. */
|
work if logged into a domain. */
|
||||||
{
|
{
|
||||||
|
@@ -222,8 +222,6 @@ ret_string(krb5_storage *sp, int ucs2, struct sec_buffer *desc, char **s)
|
|||||||
ret = 0;
|
ret = 0;
|
||||||
out:
|
out:
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static krb5_error_code
|
static krb5_error_code
|
||||||
@@ -485,6 +483,10 @@ heim_ntlm_encode_type1(const struct ntlm_type1 *type1, struct ntlm_buf *data)
|
|||||||
domain.offset = base;
|
domain.offset = base;
|
||||||
domain.length = len_string(0, type1->domain);
|
domain.length = len_string(0, type1->domain);
|
||||||
domain.allocated = domain.length;
|
domain.allocated = domain.length;
|
||||||
|
} else {
|
||||||
|
domain.offset = 0;
|
||||||
|
domain.length = 0;
|
||||||
|
domain.allocated = 0;
|
||||||
}
|
}
|
||||||
if (type1->hostname) {
|
if (type1->hostname) {
|
||||||
hostname.offset = domain.allocated + domain.offset;
|
hostname.offset = domain.allocated + domain.offset;
|
||||||
|
@@ -93,7 +93,7 @@ base64_encode(const void *data, int size, char **str)
|
|||||||
}
|
}
|
||||||
*p = 0;
|
*p = 0;
|
||||||
*str = s;
|
*str = s;
|
||||||
return strlen(s);
|
return (int) strlen(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DECODE_ERROR 0xffffffff
|
#define DECODE_ERROR 0xffffffff
|
||||||
|
@@ -100,7 +100,7 @@ roken_vmconcat (char **s, size_t max_len, va_list args)
|
|||||||
ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
|
ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
|
||||||
roken_mconcat (char **s, size_t max_len, ...)
|
roken_mconcat (char **s, size_t max_len, ...)
|
||||||
{
|
{
|
||||||
int ret;
|
size_t ret;
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
va_start(args, max_len);
|
va_start(args, max_len);
|
||||||
|
@@ -87,7 +87,7 @@ opendir(const char * filespec)
|
|||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
long len = strlen(fd.name);
|
size_t len = strlen(fd.name);
|
||||||
struct dirent * e;
|
struct dirent * e;
|
||||||
|
|
||||||
if (dp->n_entries == dp->nc_entries) {
|
if (dp->n_entries == dp->nc_entries) {
|
||||||
|
@@ -80,7 +80,6 @@ wait_for_process_timed(pid_t pid, time_t (*func)(void *),
|
|||||||
hProcess = OpenProcess(SYNCHRONIZE, FALSE, pid);
|
hProcess = OpenProcess(SYNCHRONIZE, FALSE, pid);
|
||||||
|
|
||||||
if (hProcess == NULL) {
|
if (hProcess == NULL) {
|
||||||
DWORD dw = GetLastError();
|
|
||||||
return SE_E_WAITPIDFAILED;
|
return SE_E_WAITPIDFAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -498,7 +498,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'p' : {
|
case 'p' : {
|
||||||
unsigned long arg = (unsigned long)va_arg(ap, void*);
|
u_longest arg = (u_longest)va_arg(ap, void*);
|
||||||
|
|
||||||
len += append_number (state, arg, 0x10, "0123456789ABCDEF",
|
len += append_number (state, arg, 0x10, "0123456789ABCDEF",
|
||||||
width, prec, flags, 0);
|
width, prec, flags, 0);
|
||||||
|
@@ -126,7 +126,7 @@ rk_unvis(char *cp, int c, int *astate, int flag)
|
|||||||
*astate = S_OCTAL2;
|
*astate = S_OCTAL2;
|
||||||
return (0);
|
return (0);
|
||||||
case 'M':
|
case 'M':
|
||||||
*cp = (char)0200;
|
*cp = (u_char)0200;
|
||||||
*astate = S_META;
|
*astate = S_META;
|
||||||
return (0);
|
return (0);
|
||||||
case '^':
|
case '^':
|
||||||
|
@@ -49,7 +49,7 @@ error_entry_cmp(const void *a, const void *b)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
_wind_stringprep_error(uint32_t cp, wind_profile_flags flags)
|
_wind_stringprep_error(const uint32_t cp, wind_profile_flags flags)
|
||||||
{
|
{
|
||||||
struct error_entry ee = {cp};
|
struct error_entry ee = {cp};
|
||||||
const struct error_entry *s;
|
const struct error_entry *s;
|
||||||
|
Reference in New Issue
Block a user