definition fixes

diff --git a/commands/search.c b/commands/search.c
index e885391cf0fc1feed8d1db919d4ce59f5d56caf1..fc73b550e52af1ff74ce9b3a0800e00c8ad36000 100644 (file)
--- a/commands/search.c
+++ b/commands/search.c
@@ -26,6 +26,7 @@
 #include <grub/file.h>
 #include <grub/env.h>
 #include <grub/command.h>
+#include <grub/search.h>
 
 void
 FUNC_NAME (const char *key, const char *var, int no_floppy)
@@ -153,9 +154,9 @@ grub_cmd_do_search (grub_command_t cmd __attribute__ ((unused)), int argc,
 
 static grub_command_t cmd;
 
-#ifdef SEARCH_FILE
+#ifdef DO_SEARCH_FILE
 GRUB_MOD_INIT(search_file)
-#elif defined (SEARCH_FS_UUID)
+#elif defined (DO_SEARCH_FS_UUID)
 GRUB_MOD_INIT(search_fs_uuid)
 #else
 GRUB_MOD_INIT(search_fs_label)
@@ -169,9 +170,9 @@ GRUB_MOD_INIT(search_fs_label)
                          " set to a variable.");
 }
 
-#ifdef SEARCH_FILE
+#ifdef DO_SEARCH_FILE
 GRUB_MOD_FINI(search_file)
-#elif defined (SEARCH_FS_UUID)
+#elif defined (DO_SEARCH_FS_UUID)
 GRUB_MOD_FINI(search_fs_uuid)
 #else
 GRUB_MOD_FINI(search_fs_label)

diff --git a/commands/search_wrap.c b/commands/search_wrap.c
index d28bb744ed24fbae5bc685ac22447ed3e9dc9d92..8bb26cd0c46982e5543bcf27c60908a972b4eb4e 100644 (file)
--- a/commands/search_wrap.c
+++ b/commands/search_wrap.c
@@ -24,6 +24,7 @@
 #include <grub/dl.h>
 #include <grub/env.h>
 #include <grub/extcmd.h>
+#include <grub/search.h>
 
 static const struct grub_arg_option options[] =
   {
@@ -44,10 +45,6 @@ enum options
     SEARCH_NO_FLOPPY,
  };
 
-void grub_search_fs_file (const char *key, const char *var, int no_floppy);
-void grub_search_fs_uuid (const char *key, const char *var, int no_floppy);
-void grub_search_label (const char *key, const char *var, int no_floppy);
-
 static grub_err_t
 grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
 {

diff --git a/include/grub/search.h b/include/grub/search.h
new file mode 100644 (file)
index 0000000..e8f9db2
--- /dev/null
+++ b/include/grub/search.h
@@ -0,0 +1,26 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_SEARCH_HEADER
+#define GRUB_SEARCH_HEADER 1
+
+void grub_search_fs_file (const char *key, const char *var, int no_floppy);
+void grub_search_fs_uuid (const char *key, const char *var, int no_floppy);
+void grub_search_label (const char *key, const char *var, int no_floppy);
+
+#endif

diff --git a/po/ca.po b/po/ca.po
index 3f9b0ac3210407b826d2b2c1719de450c4f814b0..7c1025fdc02b8f571d76719e1e6978b38bbf8ba8 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU GRUB\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 00:16+0100\n"
+"POT-Creation-Date: 2009-11-23 21:07+0100\n"
 "PO-Revision-Date: 2009-11-17 12:26+0100\n"
 "Last-Translator: Robert Millan <rmh.grub@aybabtu.com>\n"
 "Language-Team: None <no-team-yet@li.org>\n"
@@ -22,30 +22,10 @@ msgstr ""
 msgid "cannot compress the kernel image"
 msgstr ""
 
-#: util/i386/pc/grub-mkimage.c:117
-#, c-format
-msgid "the size of memory disk is 0x%x"
-msgstr ""
-
-#: util/i386/pc/grub-mkimage.c:124
-#, c-format
-msgid "the size of config file is 0x%x"
-msgstr ""
-
-#: util/i386/pc/grub-mkimage.c:132
-#, c-format
-msgid "the total module size is 0x%x"
-msgstr ""
-
 #: util/i386/pc/grub-mkimage.c:138
 msgid "prefix is too long"
 msgstr ""
 
-#: util/i386/pc/grub-mkimage.c:199
-#, c-format
-msgid "the core size is 0x%x"
-msgstr ""
-
 #: util/i386/pc/grub-mkimage.c:206
 msgid "the core image is too big"
 msgstr ""
@@ -89,20 +69,10 @@ msgstr ""
 msgid "cannot open %s"
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:162
-#, c-format
-msgid "the first sector is <%llu,%u,%u>"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:166
 msgid "The first sector of the core file is not sector-aligned"
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:176
-#, c-format
-msgid "saving <%llu,%u,%u> with the segment 0x%x"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:180
 msgid "Non-sector-aligned data is found in the core file"
 msgstr ""
@@ -126,11 +96,6 @@ msgstr ""
 msgid "The size of `%s' is too large"
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:247
-#, c-format
-msgid "setting the root device to `%s'"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:261
 #, c-format
 msgid "Unable to identify a filesystem in %s; safety check can't be performed"
@@ -149,11 +114,6 @@ msgstr ""
 msgid "No DOS-style partitions found"
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:325
-#, c-format
-msgid "dos partition is %d, bsd partition is %d"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:330 util/i386/pc/grub-setup.c:355
 msgid ""
 "Attempting to install GRUB to a partitionless disk.  This is a BAD idea."
@@ -185,11 +145,6 @@ msgstr ""
 msgid "Your embedding area is unusually small.  core.img won't fit in it."
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:381
-#, c-format
-msgid "the core image will be embedded at sector 0x%llx"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:418
 msgid ""
 "Embedding is not possible, but this is required when the root device is on a "
@@ -217,30 +172,6 @@ msgstr ""
 msgid "attempting to read the core image `%s' from GRUB again"
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:449
-#, c-format
-msgid ""
-"succeeded in opening the core image but the size is different (%d != %d)"
-msgstr ""
-
-#: util/i386/pc/grub-setup.c:453
-#, c-format
-msgid "succeeded in opening the core image but cannot read %d bytes"
-msgstr ""
-
-#: util/i386/pc/grub-setup.c:476
-msgid "succeeded in opening the core image but the data is different"
-msgstr ""
-
-#: util/i386/pc/grub-setup.c:487
-msgid "couldn't open the core image"
-msgstr ""
-
-#: util/i386/pc/grub-setup.c:490
-#, c-format
-msgid "error message = %s"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:498
 #, c-format
 msgid "Cannot read `%s' correctly"
@@ -258,11 +189,6 @@ msgstr ""
 msgid "Failed to read the rest sectors of the core image"
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:544
-#, c-format
-msgid "opening the core image `%s'"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:547
 #, c-format
 msgid "Cannot open `%s'"
@@ -310,11 +236,6 @@ msgstr ""
 msgid "Invalid root device `%s'"
 msgstr ""
 
-#: util/i386/pc/grub-setup.c:766
-#, c-format
-msgid "guessing the root device failed, because of `%s'"
-msgstr ""
-
 #: util/i386/pc/grub-setup.c:768
 msgid "Cannot guess the root device. Specify the option ``--root-device''."
 msgstr ""