61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Date: Mon, 29 Oct 2018 13:25:25 +0100
|
|
Subject: [PATCH] bufio: Use grub_size_t instead of plain int for size
|
|
|
|
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
|
|
(cherry picked from commit f3f8347569383e7f483f37ca70d41eb1af9f990f)
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
|
---
|
|
grub-core/io/bufio.c | 6 +++---
|
|
include/grub/bufio.h | 4 ++--
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
|
|
index 6118bade5..2781afe05 100644
|
|
--- a/grub-core/io/bufio.c
|
|
+++ b/grub-core/io/bufio.c
|
|
@@ -43,7 +43,7 @@ typedef struct grub_bufio *grub_bufio_t;
|
|
static struct grub_fs grub_bufio_fs;
|
|
|
|
grub_file_t
|
|
-grub_bufio_open (grub_file_t io, int size)
|
|
+grub_bufio_open (grub_file_t io, grub_size_t size)
|
|
{
|
|
grub_file_t file;
|
|
grub_bufio_t bufio = 0;
|
|
@@ -57,7 +57,7 @@ grub_bufio_open (grub_file_t io, int size)
|
|
else if (size > GRUB_BUFIO_MAX_SIZE)
|
|
size = GRUB_BUFIO_MAX_SIZE;
|
|
|
|
- if ((size < 0) || ((unsigned) size > io->size))
|
|
+ if (size > io->size)
|
|
size = ((io->size > GRUB_BUFIO_MAX_SIZE) ? GRUB_BUFIO_MAX_SIZE :
|
|
io->size);
|
|
|
|
@@ -88,7 +88,7 @@ grub_bufio_open (grub_file_t io, int size)
|
|
}
|
|
|
|
grub_file_t
|
|
-grub_buffile_open (const char *name, int size)
|
|
+grub_buffile_open (const char *name, grub_size_t size)
|
|
{
|
|
grub_file_t io, file;
|
|
|
|
diff --git a/include/grub/bufio.h b/include/grub/bufio.h
|
|
index acdd0c882..77eb8ee56 100644
|
|
--- a/include/grub/bufio.h
|
|
+++ b/include/grub/bufio.h
|
|
@@ -22,7 +22,7 @@
|
|
|
|
#include <grub/file.h>
|
|
|
|
-grub_file_t EXPORT_FUNC (grub_bufio_open) (grub_file_t io, int size);
|
|
-grub_file_t EXPORT_FUNC (grub_buffile_open) (const char *name, int size);
|
|
+grub_file_t EXPORT_FUNC (grub_bufio_open) (grub_file_t io, grub_size_t size);
|
|
+grub_file_t EXPORT_FUNC (grub_buffile_open) (const char *name, grub_size_t size);
|
|
|
|
#endif /* ! GRUB_BUFIO_H */
|