1 files changed, 10 insertions, 7 deletions
diff --git a/src/guid.c b/src/guid.c
index 31fbf00..1cd4642 100644
--- a/src/guid.c
+++ b/src/guid.c
@@ -66,14 +66,15 @@ a_to_guid (char *a, GUID * g)
 
   while (ptr->name)
     {
-      if (!strcmp (a, ptr->name)) {
-        memcpy (g, &ptr->g, sizeof (GUID));
-	      return 0;
-	}
-	ptr++;
+      if (!strcmp (a, ptr->name))
+        {
+          memcpy (g, &ptr->g, sizeof (GUID));
+          return 0;
+        }
+      ptr++;
     }
 
-  while ((*a) && (ndigits != 32))
+  while (ndigits != 32)
     {
       switch (*a)
         {
@@ -112,9 +113,11 @@ a_to_guid (char *a, GUID * g)
         case 'f':
           digit[ndigits++] = ((*a) - 'a') + 0xa;
           break;
-        defalt:
+
+        default:
           return -1;
         }
+      a++;
     }
 
   for (i = 0; i < 16; ++i)