Author: tsoome
Date: Fri Dec 13 08:41:37 2019
New Revision: 355703
URL: https://svnweb.freebsd.org/changeset/base/355703
Log:
loader: clean up devopen and devclose a bit
devopen should undo setup of f->f_dev in case of error.
devclose can just call free().
MFC after: 1 week
Modified:
head/stand/common/devopen.c
Modified: head/stand/common/devopen.c
==============================================================================
--- head/stand/common/devopen.c Fri Dec 13 08:20:20 2019 (r355702)
+++ head/stand/common/devopen.c Fri Dec 13 08:41:37 2019 (r355703)
@@ -52,6 +52,7 @@ devopen(struct open_file *f, const char *fname, const
result = dev->d_dev->dv_open(f, dev);
if (result != 0) {
f->f_devdata = NULL;
+ f->f_dev = NULL;
free(dev);
return (result);
}
@@ -74,8 +75,6 @@ int
devclose(struct open_file *f)
{
- if (f->f_devdata != NULL) {
- free(f->f_devdata);
- }
+ free(f->f_devdata);
return (0);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
