diff --git a/ChangeLog b/ChangeLog
index 92b9abf15..173480ccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-22  Hollis Blanchard  <hollis@penguinppc.org>
+
+	* term/tparm.c (get_space): Remove empty `if' statement.
+
+	* fs/ufs.c (grub_ufs_find_file): Remove `grub_le_to_cpu32'.
+
+	* kern/parser.c (check_varstate): Rename `state' to 's'.
+
 2005-11-22  Hollis Blanchard  <hollis@penguinppc.org>
 
 	* partmap/acorn.c: Change `unsigned' to `unsigned int'.  Move all
diff --git a/fs/ufs.c b/fs/ufs.c
index 0215d2c41..ab25a67d0 100644
--- a/fs/ufs.c
+++ b/fs/ufs.c
@@ -471,7 +471,7 @@ grub_ufs_find_file (struct grub_ufs_data *data, const char *path)
       }
       
       pos += grub_le_to_cpu16 (dirent.direntlen);
-    } while (pos < grub_le_to_cpu32 (INODE_SIZE (data)));
+    } while (pos < INODE_SIZE (data));
   
   grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
   return grub_errno;
diff --git a/kern/parser.c b/kern/parser.c
index fe854be49..abe25c5a9 100644
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -115,14 +115,14 @@ grub_parser_split_cmdline (const char *cmdline, grub_err_t (*getline) (char **),
   char *args;
   int i;
 
-  auto int check_varstate (grub_parser_state_t state);
+  auto int check_varstate (grub_parser_state_t s);
 
-  int check_varstate (grub_parser_state_t state)
+  int check_varstate (grub_parser_state_t s)
     {
-      return (state == GRUB_PARSER_STATE_VARNAME
-	      || state == GRUB_PARSER_STATE_VARNAME2
-	      || state == GRUB_PARSER_STATE_QVARNAME
-	      || state == GRUB_PARSER_STATE_QVARNAME2);
+      return (s == GRUB_PARSER_STATE_VARNAME
+	      || s == GRUB_PARSER_STATE_VARNAME2
+	      || s == GRUB_PARSER_STATE_QVARNAME
+	      || s == GRUB_PARSER_STATE_QVARNAME2);
     }
 
   auto void add_var (grub_parser_state_t newstate);
diff --git a/term/tparm.c b/term/tparm.c
index 8272d66fe..55955b639 100644
--- a/term/tparm.c
+++ b/term/tparm.c
@@ -164,9 +164,7 @@ get_space(grub_size_t need)
     if (need > out_size) {
 	out_size = need * 2;
 	out_buff = grub_realloc(out_buff, out_size*sizeof(char));
-	if (out_buff == 0)
-	    // FIX ME! OOM, what now?
-	    ;
+	/* FIX ME! handle out_buff == 0.  */
     }
 }