From: Ray Strode <rstrode@redhat.com>
Date: Mon, 9 Apr 2012 18:34:46 +0000 (-0400)
Subject: main: rename remaining_command_line to remaining_file_contents
X-Git-Tag: 0.8.5~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4267ec71aa94d1408e2d33bc31f803c5082cd9d;p=thirdparty%2Fplymouth.git

main: rename remaining_command_line to remaining_file_contents

add_consoles_from_file suffers from a sever case of
cut-and-paste-itis.  This commit renames its variable
"remaining_command_line" to "remaining_file_contents" so that
the variable name actually makes sense.
---

diff --git a/src/main.c b/src/main.c
index 250e7fba..13d5f592 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1879,7 +1879,7 @@ add_consoles_from_file (state_t         *state,
 {
   int fd;
   char contents[512] = "";
-  const char *remaining_command_line;
+  const char *remaining_file_contents;
   char *console;
 
   ply_trace ("opening %s", path);
@@ -1900,23 +1900,23 @@ add_consoles_from_file (state_t         *state,
     }
   close (fd);
 
-  remaining_command_line = contents;
+  remaining_file_contents = contents;
 
   console = NULL;
-  while (remaining_command_line != '\0')
+  while (remaining_file_contents != '\0')
     {
       char *end;
       char *console_device;
 
-      console = strdup (remaining_command_line);
-      remaining_command_line += strlen (console);
+      console = strdup (remaining_file_contents);
+      remaining_file_contents += strlen (console);
 
       end = strpbrk (console, " ");
 
       if (end != NULL)
         {
           *end = '\0';
-          remaining_command_line++;
+          remaining_file_contents++;
         }
 
       if (console[0] == '\0')