aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDaniel Brahneborg <basic@chello.se>2002-03-09 10:00:29 +0000
committerDaniel Brahneborg <basic@chello.se>2002-03-09 10:00:29 +0000
commitfeb47a9f450e17818da09306e5a23b9d5060254d (patch)
tree7ae16e5fcd296514b30f0ca8d1f1c038938fea01 /lib
parentffb722c76a449356c59c62cd4611c5e8f42047f8 (diff)
downloadplptools-feb47a9f450e17818da09306e5a23b9d5060254d.tar.gz
plptools-feb47a9f450e17818da09306e5a23b9d5060254d.tar.bz2
plptools-feb47a9f450e17818da09306e5a23b9d5060254d.zip
Fix copyFrom() protos to agree better with the parent.
Diffstat (limited to 'lib')
-rw-r--r--lib/rfsv16.cc4
-rw-r--r--lib/rfsv16.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/rfsv16.cc b/lib/rfsv16.cc
index e920698..2474060 100644
--- a/lib/rfsv16.cc
+++ b/lib/rfsv16.cc
@@ -641,7 +641,7 @@ copyFromPsion(const char *from, const char *to, void *ptr, cpCallback_t cb)
}
Enum<rfsv::errs> rfsv16::
-copyFromPsion(const char *from, int fd, void *ptr, cpCallback_t cb)
+copyFromPsion(const char *from, int fd, cpCallback_t cb)
{
Enum<rfsv::errs> res;
u_int32_t handle;
@@ -656,7 +656,7 @@ copyFromPsion(const char *from, int fd, void *ptr, cpCallback_t cb)
if (len > 0)
write(fd, buf, len);
total += len;
- if (cb && !cb(ptr, total))
+ if (cb && !cb(NULL, total))
res = E_PSI_FILE_CANCEL;
}
} while (len > 0 && (res == E_PSI_GEN_NONE));
diff --git a/lib/rfsv16.h b/lib/rfsv16.h
index dad9650..b0f5e98 100644
--- a/lib/rfsv16.h
+++ b/lib/rfsv16.h
@@ -60,7 +60,7 @@ public:
Enum<rfsv::errs> fread(const u_int32_t, unsigned char * const, const u_int32_t, u_int32_t &);
Enum<rfsv::errs> fwrite(const u_int32_t, const unsigned char * const, const u_int32_t, u_int32_t &);
Enum<rfsv::errs> copyFromPsion(const char * const, const char * const, void *, cpCallback_t);
- Enum<rfsv::errs> copyFromPsion(const char *from, int fd, void *ptr, cpCallback_t cb);
+ Enum<rfsv::errs> copyFromPsion(const char *from, int fd, cpCallback_t cb);
Enum<rfsv::errs> copyToPsion(const char * const, const char * const, void *, cpCallback_t);
Enum<rfsv::errs> copyOnPsion(const char *, const char *, void *, cpCallback_t);
Enum<rfsv::errs> fsetsize(const u_int32_t, const u_int32_t);