vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

definition fixes

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-23 21:15:44 +01:00
parent 937d332db3
commit 4996893238
4 changed files with 33 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

9
commands/search.c
View file

@ -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)

5
commands/search_wrap.c
View file

@ -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)
{