diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-30 16:17:59 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-30 16:17:59 -0700 |
| commit | 52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c (patch) | |
| tree | 0ef759bffc55ed0f7811805440f58412e6ba3d8f /com32/hdt/hdt-menu-syslinux.c | |
| parent | d6fb0861c55f062797c8706f484bd47ae0f94568 (diff) | |
| parent | dcecb9f395f3ca0da3df774cb6102d885894bf84 (diff) | |
| download | syslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.tar.gz | |
Merge branch 'master' into pathbased
Resolved Conflicts:
com32/modules/Makefile
core/comboot.inc
core/cpuinit.inc
core/idle.inc
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'com32/hdt/hdt-menu-syslinux.c')
| -rw-r--r-- | com32/hdt/hdt-menu-syslinux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/com32/hdt/hdt-menu-syslinux.c b/com32/hdt/hdt-menu-syslinux.c index c85bfbf4..02de5b31 100644 --- a/com32/hdt/hdt-menu-syslinux.c +++ b/com32/hdt/hdt-menu-syslinux.c @@ -51,9 +51,9 @@ void compute_syslinuxmenu(struct s_my_menu *menu, struct s_hardware *hardware) menu->items_count++; snprintf(buffer, sizeof buffer, "Version : %s", - hardware->sv->version_string + 2); + hardware->sv->version_string); snprintf(statbuffer, sizeof statbuffer, "Version: %s", - hardware->sv->version_string + 2); + hardware->sv->version_string); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; @@ -71,10 +71,10 @@ void compute_syslinuxmenu(struct s_my_menu *menu, struct s_hardware *hardware) add_item("", "", OPT_SEP, "", 0); - snprintf(buffer, sizeof buffer, "%s", hardware->sv->copyright_string + 1); + snprintf(buffer, sizeof buffer, "%s", hardware->sv->copyright_string); /* Remove the trailing LF in the copyright string to avoid scrolling */ snprintf(statbuffer, sizeof statbuffer, "%s", - remove_trailing_lf(hardware->sv->copyright_string + 1)); + remove_trailing_lf(hardware->sv->copyright_string)); add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0); menu->items_count++; |