From 24cbddd4b9c328333eca988e0106b014a4a23d73 Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Wed, 2 Jun 2010 21:23:52 -0400
Subject: [PATCH] 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.
---
 lib/hx509/sel.c                  | 1 +
 lib/krb5/cache.c                 | 2 +-
 lib/krb5/get_default_principal.c | 2 --
 lib/ntlm/ntlm.c                  | 6 ++++--
 lib/roken/base64.c               | 2 +-
 lib/roken/concat.c               | 2 +-
 lib/roken/dirent.c               | 2 +-
 lib/roken/simple_exec_w32.c      | 1 -
 lib/roken/snprintf.c             | 2 +-
 lib/roken/unvis.c                | 2 +-
 lib/wind/errorlist.c             | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/hx509/sel.c b/lib/hx509/sel.c
index 5932ce84c..561818c9f 100644
--- a/lib/hx509/sel.c
+++ b/lib/hx509/sel.c
@@ -175,6 +175,7 @@ _hx509_expr_eval(hx509_context context, hx509_env env, struct hx_expr *expr)
 	return eval_comp(context, env, expr->arg1);
     default:
 	_hx509_abort("hx509 eval expr with unknown op: %d", (int)expr->op);
+	UNREACHABLE(return 0);
     }
 }
 
diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
index f5bec46cf..09fbe1d96 100644
--- a/lib/krb5/cache.c
+++ b/lib/krb5/cache.c
@@ -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_error_code ret = 0;
-    char *p, *exp_p = NULL;
+    char *p = NULL, *exp_p = NULL;
 
     if (name == NULL) {
 	const char *e = NULL;
diff --git a/lib/krb5/get_default_principal.c b/lib/krb5/get_default_principal.c
index 539dedfa4..ba4301ce2 100644
--- a/lib/krb5/get_default_principal.c
+++ b/lib/krb5/get_default_principal.c
@@ -104,8 +104,6 @@ krb5_error_code
 _krb5_get_default_principal_local(krb5_context context,
 				  krb5_principal *princ)
 {
-    krb5_error_code ret = 0;
-
     /* See if we can get the principal first.  We only expect this to
        work if logged into a domain. */
     {
diff --git a/lib/ntlm/ntlm.c b/lib/ntlm/ntlm.c
index 71f96bfce..8390d79ac 100644
--- a/lib/ntlm/ntlm.c
+++ b/lib/ntlm/ntlm.c
@@ -222,8 +222,6 @@ ret_string(krb5_storage *sp, int ucs2, struct sec_buffer *desc, char **s)
     ret = 0;
 out:
     return ret;
-
-    return 0;
 }
 
 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.length = len_string(0, type1->domain);
 	domain.allocated = domain.length;
+    } else {
+	domain.offset = 0;
+	domain.length = 0;
+	domain.allocated = 0;
     }
     if (type1->hostname) {
 	hostname.offset = domain.allocated + domain.offset;
diff --git a/lib/roken/base64.c b/lib/roken/base64.c
index 4c06bd2d1..394e9841c 100644
--- a/lib/roken/base64.c
+++ b/lib/roken/base64.c
@@ -93,7 +93,7 @@ base64_encode(const void *data, int size, char **str)
     }
     *p = 0;
     *str = s;
-    return strlen(s);
+    return (int) strlen(s);
 }
 
 #define DECODE_ERROR 0xffffffff
diff --git a/lib/roken/concat.c b/lib/roken/concat.c
index 2ae777d5d..78d8b4f8e 100644
--- a/lib/roken/concat.c
+++ b/lib/roken/concat.c
@@ -100,7 +100,7 @@ roken_vmconcat (char **s, size_t max_len, va_list args)
 ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
 roken_mconcat (char **s, size_t max_len, ...)
 {
-    int ret;
+    size_t ret;
     va_list args;
 
     va_start(args, max_len);
diff --git a/lib/roken/dirent.c b/lib/roken/dirent.c
index 7e16bc84d..a0301e207 100644
--- a/lib/roken/dirent.c
+++ b/lib/roken/dirent.c
@@ -87,7 +87,7 @@ opendir(const char * filespec)
     }
 
     do {
-        long len = strlen(fd.name);
+        size_t len = strlen(fd.name);
         struct dirent * e;
 
         if (dp->n_entries == dp->nc_entries) {
diff --git a/lib/roken/simple_exec_w32.c b/lib/roken/simple_exec_w32.c
index ae778ce60..83ef6f9b5 100644
--- a/lib/roken/simple_exec_w32.c
+++ b/lib/roken/simple_exec_w32.c
@@ -80,7 +80,6 @@ wait_for_process_timed(pid_t pid, time_t (*func)(void *),
     hProcess = OpenProcess(SYNCHRONIZE, FALSE, pid);
 
     if (hProcess == NULL) {
-	DWORD dw = GetLastError();
         return SE_E_WAITPIDFAILED;
     }
 
diff --git a/lib/roken/snprintf.c b/lib/roken/snprintf.c
index a20054672..5fffe63ee 100644
--- a/lib/roken/snprintf.c
+++ b/lib/roken/snprintf.c
@@ -498,7 +498,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap)
 		break;
 	    }
 	    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",
 				      width, prec, flags, 0);
diff --git a/lib/roken/unvis.c b/lib/roken/unvis.c
index ed6ef9dfa..731dde06c 100644
--- a/lib/roken/unvis.c
+++ b/lib/roken/unvis.c
@@ -126,7 +126,7 @@ rk_unvis(char *cp, int c, int *astate, int flag)
 			*astate = S_OCTAL2;
 			return (0);
 		case 'M':
-			*cp = (char)0200;
+			*cp = (u_char)0200;
 			*astate = S_META;
 			return (0);
 		case '^':
diff --git a/lib/wind/errorlist.c b/lib/wind/errorlist.c
index b2e221049..c2907832a 100644
--- a/lib/wind/errorlist.c
+++ b/lib/wind/errorlist.c
@@ -49,7 +49,7 @@ error_entry_cmp(const void *a, const void *b)
 }
 
 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};
     const struct error_entry *s;