Page MenuHomeFreeBSD
Files F135534512

D14523.id39788.diff
No OneTemporary
Actions

D14523.id39788.diff
View Options

Index: head/stand/libsa/cd9660.c
===================================================================
--- head/stand/libsa/cd9660.c
+++ head/stand/libsa/cd9660.c
@@ -66,8 +66,6 @@
static int cd9660_close(struct open_file *f);
static int cd9660_read(struct open_file *f, void *buf, size_t size,
size_t *resid);
-static int cd9660_write(struct open_file *f, const void *buf, size_t size,
- size_t *resid);
static off_t cd9660_seek(struct open_file *f, off_t offset, int where);
static int cd9660_stat(struct open_file *f, struct stat *sb);
static int cd9660_readdir(struct open_file *f, struct dirent *d);
@@ -86,7 +84,7 @@
cd9660_open,
cd9660_close,
cd9660_read,
- cd9660_write,
+ null_write,
cd9660_seek,
cd9660_stat,
cd9660_readdir
@@ -554,13 +552,6 @@
fp->f_off += isonum_711(ep->length);
return (0);
-}
-
-static int
-cd9660_write(struct open_file *f __unused, const void *buf __unused,
- size_t size __unused, size_t *resid __unused)
-{
- return EROFS;
}
static off_t
Index: head/stand/libsa/nullfs.c
===================================================================
--- head/stand/libsa/nullfs.c
+++ head/stand/libsa/nullfs.c
@@ -85,7 +85,7 @@
int null_write (struct open_file *f, const void *buf, size_t size, size_t *resid)
{
- return EIO;
+ return EROFS;
}
off_t null_seek (struct open_file *f, off_t offset, int where)
Index: head/stand/libsa/tftp.c
===================================================================
--- head/stand/libsa/tftp.c
+++ head/stand/libsa/tftp.c
@@ -69,8 +69,6 @@
static int tftp_close(struct open_file *f);
static int tftp_parse_oack(struct tftp_handle *h, char *buf, size_t len);
static int tftp_read(struct open_file *f, void *buf, size_t size, size_t *resid);
-static int tftp_write(struct open_file *f, const void *buf, size_t size,
- size_t *resid);
static off_t tftp_seek(struct open_file *f, off_t offset, int where);
static int tftp_set_blksize(struct tftp_handle *h, const char *str);
static int tftp_stat(struct open_file *f, struct stat *sb);
@@ -80,7 +78,7 @@
tftp_open,
tftp_close,
tftp_read,
- tftp_write,
+ null_write,
tftp_seek,
tftp_stat,
null_readdir
@@ -572,13 +570,6 @@
}
is_open = 0;
return (0);
-}
-
-static int
-tftp_write(struct open_file *f __unused, const void *start __unused,
- size_t size __unused, size_t *resid __unused /* out */)
-{
- return (EROFS);
}
static int

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 11, 3:02 PM (7 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25111250
Default Alt Text
D14523.id39788.diff (2 KB)

Event Timeline