diff options
| author | Fritz Elfert <felfert@to.com> | 2001-02-04 04:23:06 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2001-02-04 04:23:06 +0000 |
| commit | a7e4250b20fa5012942c4fe05ee0c7f701c5799f (patch) | |
| tree | 087ef59c3c88713aa8c7b3150a2ae114c04a929e /kde2 | |
| parent | 1664530e8f0e1ac6e762a1c79629fcec86f68724 (diff) | |
| download | plptools-a7e4250b20fa5012942c4fe05ee0c7f701c5799f.tar.gz plptools-a7e4250b20fa5012942c4fe05ee0c7f701c5799f.tar.bz2 plptools-a7e4250b20fa5012942c4fe05ee0c7f701c5799f.zip | |
Cleaned up ppsocket.
More 64bit-related stuff.
Diffstat (limited to 'kde2')
| -rw-r--r-- | kde2/Makefile.am | 3 | ||||
| -rw-r--r-- | kde2/kioslave/kio_plp.cpp | 30 |
2 files changed, 18 insertions, 15 deletions
diff --git a/kde2/Makefile.am b/kde2/Makefile.am index 4c8fb84..fe79aad 100644 --- a/kde2/Makefile.am +++ b/kde2/Makefile.am @@ -10,3 +10,6 @@ TMPDEST= # maintainer-clean-local: rm -f Makefile.in + +am_edit: + perl ../conf/am_edit diff --git a/kde2/kioslave/kio_plp.cpp b/kde2/kioslave/kio_plp.cpp index 72b1060..e0464bd 100644 --- a/kde2/kioslave/kio_plp.cpp +++ b/kde2/kioslave/kio_plp.cpp @@ -247,21 +247,21 @@ openConnection() { } } - long devbits; + u_int32_t devbits; Enum<rfsv::errs> res; if ((res = plpRfsv->devlist(devbits)) == rfsv::E_PSI_GEN_NONE) { for (int i = 0; i < 26; i++) { - char vname[256]; - long vtotal, vfree, vattr, vuniqueid; + string vname; + u_int32_t vtotal, vfree, vattr, vuniqueid; if ((devbits & 1) != 0) { if (plpRfsv->devinfo(i, vfree, vtotal, vattr, vuniqueid, vname) == rfsv::E_PSI_GEN_NONE) { QString name; - if (strlen(vname)) - name = QString(vname); + if (!vname.empty()) + name = QString(vname.c_str()); else name.sprintf("%c", 'A' + i); drives.append(name); @@ -688,10 +688,10 @@ get( const KURL& url ) { convertName(name); Enum<rfsv::errs> res; - long handle; - long len; - long size; - long total = 0; + u_int32_t handle; + u_int32_t len; + u_int32_t size; + u_int32_t total = 0; if (emitTotalSize(name)) return; @@ -738,7 +738,7 @@ put( const KURL& url, int _mode, bool _overwrite, bool /*_resume*/ ) { convertName(name); Enum<rfsv::errs> res; - long handle; + u_int32_t handle; int result; res = plpRfsv->fcreatefile(plpRfsv->opMode(rfsv::PSI_O_RDWR), name, handle); @@ -756,8 +756,8 @@ put( const KURL& url, int _mode, bool _overwrite, bool /*_resume*/ ) { if (result > 0) do { - long written; - int count = (len > RFSV_SENDLEN) ? RFSV_SENDLEN : len; + u_int32_t written; + u_int32_t count = (len > RFSV_SENDLEN) ? RFSV_SENDLEN : len; res = plpRfsv->fwrite(handle, data, count, written); if (checkForError(res)) { plpRfsv->fclose(handle); @@ -820,7 +820,7 @@ rename(const KURL &src, const KURL &dest, bool _overwrite) { convertName(from); convertName(to); if (!_overwrite) { - long attr; + u_int32_t attr; if ((res = plpRfsv->fgetattr(to, attr)) == rfsv::E_PSI_GEN_NONE) { error(ERR_FILE_ALREADY_EXIST, to); @@ -836,7 +836,7 @@ rename(const KURL &src, const KURL &dest, bool _overwrite) { extern "C" { static int -progresswrapper(void *ptr, long total) { +progresswrapper(void *ptr, u_int32_t total) { ((PLPProtocol *)ptr)->calcprogress(total); return 1; @@ -877,7 +877,7 @@ copy( const KURL &src, const KURL &dest, int _mode, bool _overwrite ) { convertName(to); Enum <rfsv::errs> res; if (!_overwrite) { - long attr; + u_int32_t attr; if ((res = plpRfsv->fgetattr(to, attr)) == rfsv::E_PSI_GEN_NONE) { error(ERR_FILE_ALREADY_EXIST, to); return; |