d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In alloc_pread() and kern_pread(), print errors only when DEBUG is

Browse Source 
defined. An error is not fatal and is supposed to be handled by the
caller.

Obtained from:	Juniper Networks, Inc.
This commit is contained in:
Marcel Moolenaar 2014-11-05 04:18:41 +00:00
parent bf0df86979
commit 6d426c10fb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=274127
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/boot/common/misc.c
View File

@ -121,12 +121,16 @@ kern_pread(int fd, vm_offset_t dest, size_t len, off_t off)
ssize_t nread;
if (lseek(fd, off, SEEK_SET) == -1) {
#ifdef DEBUG
printf("\nlseek failed\n");
#endif
return (-1);
}
nread = archsw.arch_readin(fd, dest, len);
if (nread != len) {
#ifdef DEBUG
printf("\nreadin failed\n");
#endif
return (-1);
}
return (0);
@ -144,17 +148,23 @@ alloc_pread(int fd, off_t off, size_t len)
buf = malloc(len);
if (buf == NULL) {
#ifdef DEBUG
printf("\nmalloc(%d) failed\n", (int)len);
#endif
return (NULL);
}
if (lseek(fd, off, SEEK_SET) == -1) {
#ifdef DEBUG
printf("\nlseek failed\n");
#endif
free(buf);
return (NULL);
}
nread = read(fd, buf, len);
if (nread != len) {
#ifdef DEBUG
printf("\nread failed\n");
#endif
free(buf);
return (NULL);
}