--- trunk/mkinitrd-magellan/grubby/grubby.c	2010/12/15 21:16:32	1177
+++ trunk/mkinitrd-magellan/grubby/grubby.c	2011/05/27 16:19:11	1304
@@ -1979,7 +1979,7 @@
     const char ** arg;
     int useKernelArgs, useRoot;
     int firstElement;
-    int *usedElements, *usedArgs;
+    int *usedElements;
     int doreplace;
 
     if (!image) return 0;
@@ -2014,9 +2014,6 @@
     useRoot = (getKeywordByType(LT_ROOT, cfg->cfi)
 	       && !multibootArgs);
 
-    for (k = 0, arg = newArgs; *arg; arg++, k++) ;
-    usedArgs = calloc(k, sizeof(*usedArgs));
-
     for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
 
 	if (multibootArgs && !entry->multiboot)
@@ -2092,7 +2089,6 @@
         usedElements = calloc(line->numElements, sizeof(*usedElements));
 
 	for (k = 0, arg = newArgs; *arg; arg++, k++) {
-            if (usedArgs[k]) continue;
 
 	    doreplace = 1;
 	    for (i = firstElement; i < line->numElements; i++) {
@@ -2107,7 +2103,6 @@
                     continue;
 		if (!argMatch(line->elements[i].item, *arg)) {
                     usedElements[i]=1;
-                    usedArgs[k]=1;
 		    break;
                 }
             }
@@ -2177,7 +2172,6 @@
 	}
     }
 
-    free(usedArgs);
     free(newArgs);
     free(oldArgs);