From 69f80875a6c6c00e434bddc117d9a239b138df44 Mon Sep 17 00:00:00 2001
From: unknown <reggie@fedora.(none)>
Date: Mon, 31 Oct 2005 13:31:07 -0500
Subject: [PATCH] improved previous changeset per JimW's review

server-tools/instance-manager/instance_options.cc:
  fixed to coding guidelines
server-tools/instance-manager/parse_output.cc:
  removed tabs
  and added call to trim_space
---
 .../instance-manager/instance_options.cc      |  2 +-
 server-tools/instance-manager/parse_output.cc | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc
index 850530b35fc..54ad9da6ab2 100644
--- a/server-tools/instance-manager/instance_options.cc
+++ b/server-tools/instance-manager/instance_options.cc
@@ -340,7 +340,7 @@ int Instance_options::complete_initialization(const char *default_path,
 
   // it's safe to cast this to char* since this is a buffer we are allocating
   char* end= convert_dirname((char*)mysqld_path, mysqld_path, NullS);
-  end[-1] = 0;
+  end[-1]= 0;
 
   mysqld_path_len= strlen(mysqld_path);
 
diff --git a/server-tools/instance-manager/parse_output.cc b/server-tools/instance-manager/parse_output.cc
index 96b0b0fbbc6..60b15fde22d 100644
--- a/server-tools/instance-manager/parse_output.cc
+++ b/server-tools/instance-manager/parse_output.cc
@@ -26,16 +26,16 @@
 
 void trim_space(const char **text, uint *word_len)
 {
-	const char* start = *text;
-	while (*start != 0 && *start == ' ')
-		start++;
-	*text = start;
+  const char* start = *text;
+  while (*start != 0 && *start == ' ')
+    start++;
+  *text= start;
 
-	int len= strlen(start);
-	const char* end= start + len - 1;
-	while (end > start && (*end == ' ' || *end == '\r' || *end == '\n'))
-		end--;
-	*word_len= (end - start)+1;
+  int len= strlen(start);
+  const char* end= start + len - 1;
+  while (end > start && (*end == ' ' || *end == '\r' || *end == '\n'))
+    end--;
+  *word_len= (end - start)+1;
 }
 
 /*
@@ -108,7 +108,7 @@ int parse_output_and_get_value(const char *command, const char *word,
       linep+= wordlen;                      /* swallow the previous one */
       if (flag & GET_VALUE)
       {
-        get_word((const char **) &linep, &found_word_len, NONSPACE);
+	trim_space((const char**) &linep, &found_word_len);
         if (input_buffer_len <= found_word_len)
           goto err;
         strmake(result, linep, found_word_len);