From feb47a9f450e17818da09306e5a23b9d5060254d Mon Sep 17 00:00:00 2001
From: Daniel Brahneborg <basic@chello.se>
Date: Sat, 9 Mar 2002 10:00:29 +0000
Subject: Fix copyFrom() protos to agree better with the parent.

---
 lib/rfsv16.cc | 4 ++--
 lib/rfsv16.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

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);
-- 
cgit v1.2.3