fix changelog and doc

diff --git a/ChangeLog b/ChangeLog
index 29eb61fd5cebc6e1b94952dd50d4120c064cfea2..e13489f153211f5fe28fd29acdc6261ecdf68d36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,12 +6,9 @@
        * grub-core/commands/menuentry.c (setparams_prefix): Use single
        quotes for arguments.
        * grub-core/lib/legacy_parse.c (grub_legacy_escape): Use
-       grub_script_escape_squotes function instead.
+       grub_strchrsub function instead.
 
-       * include/grub/script_sh.h (grub_script_escape_squotes): New
-       prototype.
-       * grub-core/script/script.c (grub_script_escape_squotes): New
-       function.
+       * include/grub/misc.h (grub_strchrsub): New function.
 
 2010-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 

diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index c0743d1ed51ee26da074ab656b07727fcebd2210..4dab1783a2e9bad98b75a1fe168c01894f5a12f5 100644 (file)
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -24,7 +24,6 @@
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 #include <grub/normal.h>
-#include <grub/script_sh.h>
 
 static const struct grub_arg_option options[] =
   {

diff --git a/grub-core/lib/legacy_parse.c b/grub-core/lib/legacy_parse.c
index d3a133591c2de801cec0628f2d752a9d46833c92..f7f86c105243af850b6696efd081968ea6a3e5ad 100644 (file)
--- a/grub-core/lib/legacy_parse.c
+++ b/grub-core/lib/legacy_parse.c
@@ -20,7 +20,6 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/err.h>
-#include <grub/script_sh.h>
 #include <grub/legacy_parse.h>
 #include <grub/i386/pc/vesa_modes_table.h>
 
@@ -323,24 +322,24 @@ struct legacy_command legacy_commands[] =
 char *
 grub_legacy_escape (const char *in, grub_size_t len)
 {
-  char saved;
   char *ptr;
-  char *outptr;
+  char saved;
+  char *ret;
   int overhead = 0;
 
   for (ptr = (char*)in; ptr < in + len && *ptr; ptr++)
     if (*ptr == '\'')
       overhead += 3;
-  outptr = grub_malloc (ptr - in + overhead + 1);
-  if (!outptr)
+  ret = grub_malloc (ptr - in + overhead + 1);
+  if (!ret)
     return NULL;
 
   ptr = (char*)in;
   saved = ptr[len];
   ptr[len] = '\0';
-  grub_strchrsub (outptr, in, '\'', "'\\''");
+  grub_strchrsub (ret, ptr, '\'', "'\\''");
   ptr[len] = saved;
-  return outptr;
+  return ret;
 }
 
 static char *

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 4980281a6bf6f888c87ad9e01732847abccfb0d7..6fcaa148ba3ef5a30b8b01df427db1b442c7aaa6 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -194,7 +194,7 @@ grub_strncasecmp (const char *s1, const char *s2, grub_size_t n)
 }
 
 /* Replace all `ch' characters of `input' with `with' and copy the
-   result into `output'; return address of the end in `output'. */
+   result into `output'; return EOS address of `output'. */
 static inline char *
 grub_strchrsub (char *output, const char *input, char ch, const char *with)
 {