projects
/
debian
/
cpmtools
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New upstream version 2.20
[debian/cpmtools]
/
device_posix.c
diff --git
a/device_posix.c
b/device_posix.c
index 0393eed716f39ae3c0edc9634c10d465166a7570..5a28dcdc5ecb4c0be201c81c0bd14081bcb05072 100644
(file)
--- a/
device_posix.c
+++ b/
device_posix.c
@@
-3,6
+3,7
@@
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-22,12
+23,13
@@
const char *Device_open(struct Device *this, const char *filename, int mode, con
}
/*}}}*/
/* Device_setGeometry -- Set disk geometry */ /*{{{*/
}
/*}}}*/
/* Device_setGeometry -- Set disk geometry */ /*{{{*/
-
void Device_setGeometry(struct Device *this, int secLength, int sectrk, int tracks, off_t offset
)
+
const char *Device_setGeometry(struct Device *this, int secLength, int sectrk, int tracks, off_t offset, const char *libdskGeometry
)
{
this->secLength=secLength;
this->sectrk=sectrk;
this->tracks=tracks;
this->offset=offset;
{
this->secLength=secLength;
this->sectrk=sectrk;
this->tracks=tracks;
this->offset=offset;
+ return NULL;
}
/*}}}*/
/* Device_close -- Close an image file */ /*{{{*/
}
/*}}}*/
/* Device_close -- Close an image file */ /*{{{*/
@@
-42,10
+44,12
@@
const char *Device_readSector(const struct Device *this, int track, int sector,
{
int res;
{
int res;
+ assert(this);
assert(sector>=0);
assert(sector<this->sectrk);
assert(track>=0);
assert(track<this->tracks);
assert(sector>=0);
assert(sector<this->sectrk);
assert(track>=0);
assert(track<this->tracks);
+ assert(buf);
if (lseek(this->fd,(off_t)(((sector+track*this->sectrk)*this->secLength)+this->offset),SEEK_SET)==-1)
{
return strerror(errno);
if (lseek(this->fd,(off_t)(((sector+track*this->sectrk)*this->secLength)+this->offset),SEEK_SET)==-1)
{
return strerror(errno);