From fd1ccafe0b9b33e460947487858371daec26f9a9 Mon Sep 17 00:00:00 2001
From: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>
Date: Mon, 7 Jul 2014 14:18:27 -0500
Subject: [PATCH 12/22] Variable "needed" should be of type ssize_t as that's
how it's used.
Signed-off-by: Daniel Jared Dominguez <Jared_Dominguez@Dell.com>
---
src/lib/efi.c | 8 ++++----
src/lib/unparse_path.c | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/lib/efi.c b/src/lib/efi.c
index 7b5e7fd..74df42a 100644
--- a/src/lib/efi.c
+++ b/src/lib/efi.c
@@ -309,7 +309,7 @@ make_pci_device_path(uint8_t bus, uint8_t device, uint8_t function,
struct pci_access *pacc;
struct list_head *pos, *n;
LIST_HEAD(pci_parent_list);
- size_t needed;
+ ssize_t needed;
off_t buf_offset = 0;
pacc = pci_alloc();
@@ -436,7 +436,7 @@ make_edd30_device_path(int fd, uint8_t *buf, size_t size)
Scsi_Idlun idlun;
uint32_t ns_id;
unsigned char host=0, channel=0, id=0, lun=0;
- size_t needed;
+ ssize_t needed;
off_t buf_offset = 0;
rc = disk_get_pci(fd, &interface_type, &bus, &device, &function);
@@ -508,7 +508,7 @@ make_disk_load_option(char *disk, uint8_t *buf, size_t size)
uint8_t mbr_type=0, signature_type=0;
uint64_t part_start=0, part_size=0;
efi_char16_t *os_loader_path;
- size_t needed = 0;
+ ssize_t needed = 0;
off_t buf_offset = 0;
memset(signature, 0, sizeof(signature));
@@ -615,7 +615,7 @@ make_net_load_option(char *iface, uint8_t *buf, size_t size)
unsigned char bus, slot, func;
struct ifreq ifr;
struct ethtool_drvinfo drvinfo;
- size_t needed;
+ ssize_t needed;
off_t buf_offset;
memset(&ifr, 0, sizeof(ifr));
diff --git a/src/lib/unparse_path.c b/src/lib/unparse_path.c
index 030e7c8..c39a49a 100644
--- a/src/lib/unparse_path.c
+++ b/src/lib/unparse_path.c
@@ -43,7 +43,7 @@ unparse_raw(char *buffer, size_t buffer_size, uint8_t *p, uint64_t length)
uint64_t i;
char a[1];
- size_t needed;
+ ssize_t needed;
off_t buf_offset = 0;
for (i=0; i < length; i++) {
@@ -62,7 +62,7 @@ unparse_raw_text(char *buffer, size_t buffer_size, uint8_t *p, uint64_t length)
{
uint64_t i; unsigned char c;
- size_t needed;
+ ssize_t needed;
size_t buf_offset = 0;
for (i=0; i < length; i++) {
@@ -116,7 +116,7 @@ unparse_vendor_path(char *buffer, size_t buffer_size, char *prefix,
unsigned char *q = (uint8_t *)path + 20;
int rc;
- size_t needed;
+ ssize_t needed;
off_t buf_offset = 0;
rc = efi_guid_to_str(&path->vendor_guid, &text_guid);
@@ -199,7 +199,7 @@ unparse_messaging_path(char *buffer, size_t buffer_size, EFI_DEVICE_PATH *path)
NVME_DEVICE_PATH *nvme = (NVME_DEVICE_PATH *)path;
char a[16], b[16], c[16], d[16], e[16];
- size_t needed;
+ ssize_t needed;
off_t buf_offset = 0;
switch (path->subtype) {
@@ -417,7 +417,7 @@ unparse_bios_path(char *buffer, size_t buffer_size, EFI_DEVICE_PATH *path)
unsigned char *q = (uint8_t *)path + 8;
char a[16], b[16];
- size_t needed;
+ ssize_t needed;
off_t buf_offset = 0;
needed = snprintf(p + buf_offset,
@@ -451,7 +451,7 @@ unparse_path(char *buffer, size_t buffer_size,
{
uint16_t parsed_length = 0;
char *p = buffer;
- size_t needed;
+ ssize_t needed;
off_t buf_offset = 0;
int exit_now = 0;
--
1.9.3