cleanup, fix uninitialized variable warning

diff --git a/util_attr.cpp b/util_attr.cpp
index 76468f9..41a2736 100644 (file)
--- a/util_attr.cpp
+++ b/util_attr.cpp
@@ -282,12 +282,14 @@ gss_eap_attr_ctx::initFromGssContext(const gss_cred_id_t cred,
 bool
 gss_eap_attr_ctx::initFromBuffer(const gss_buffer_t buffer)
 {
-    bool ret;
+    bool ret = false;
     size_t remain = buffer->length;
     unsigned char *p = (unsigned char *)buffer->value;
     bool didInit[ATTR_TYPE_MAX + 1];
+    unsigned int type;
 
-    memset(didInit, 0, sizeof(didInit));
+    for (type = ATTR_TYPE_MIN; type <= ATTR_TYPE_MAX; type++)
+        didInit[type] = false;
 
     /* flags */
     CHECK_REMAIN(4);
@@ -336,7 +338,7 @@ gss_eap_attr_ctx::initFromBuffer(const gss_buffer_t buffer)
      * providers that can initialize themselves from other
      * providers.
      */
-    for (size_t type = ATTR_TYPE_MIN; type <= ATTR_TYPE_MAX; type++) {
+    for (type = ATTR_TYPE_MIN; type <= ATTR_TYPE_MAX; type++) {
         gss_eap_attr_provider *provider;
 
         if (didInit[type])
@@ -604,10 +606,14 @@ gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const
     gss_buffer_desc providerTokens[ATTR_TYPE_MAX + 1];
     size_t length = 4; /* m_flags */
     unsigned char *p;
+    unsigned int i;
 
-    memset(providerTokens, 0, sizeof(providerTokens));
+    for (i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) {
+        providerTokens[i].length = 0;
+        providerTokens[i].value = NULL;
+    }
 
-    for (size_t i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) {
+    for (i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) {
         gss_eap_attr_provider *provider = m_providers[i];
 
         if (provider == NULL)
@@ -628,7 +634,7 @@ gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const
     store_uint32_be(m_flags, p);
     p += 4;
 
-    for (size_t i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) {
+    for (i = ATTR_TYPE_MIN; i <= ATTR_TYPE_MAX; i++) {
         if (providerTokens[i].value == NULL)
             continue;