cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix display of search results in amulecmd

Browse Source 
Uses correct integer conversion identifiers in Printf
(upstream svn revision r10987)
This commit is contained in:
dcoppa 2017-08-11 11:23:57 +00:00
parent fc2065fce0
commit 4e2fcd1ed8
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/amule/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.62 2017/07/26 22:45:27 sthen Exp $
# $OpenBSD: Makefile,v 1.63 2017/08/11 11:23:57 dcoppa Exp $
COMMENT-main = another eDonkey P2P file sharing client
COMMENT-web = webserver interface to amuled
@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdline for amule
V = 2.3.2
DISTNAME = aMule-$V
REVISION = 4
REVISION = 5
CATEGORIES = net
HOMEPAGE = http://www.amule.org/

27
net/amule/patches/patch-src_TextClient_cpp Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_TextClient_cpp,v 1.1 2017/08/11 11:23:57 dcoppa Exp $
commit eaa61e41dbfe4a83f29969d8d32b68b4c24f2e6e (tag: amule-svn-r10987)
Author: upstream svn <svn@amule.org>
Date: Sun May 21 17:44:03 2017 +0000
Fix display of search results in amulecmd
Uses correct integer conversion identifiers in Printf
Index: src/TextClient.cpp
--- src/TextClient.cpp.orig
+++ src/TextClient.cpp
@@ -611,10 +611,10 @@ void CamulecmdApp::ShowResults(CResultMap results_map)
id = (*iter).first;
SearchFile* file = (*iter).second;
- output.Printf(wxT("%i. "), id);
+ output.Printf(wxT("%lu. "), id);
output = output.SubString(0, nr_max).Append(file->sFileName).Append(' ', name_max);
- mb.Printf(wxT(" %d"), file->lFileSize/1024/1024);
- kb.Printf(wxT(".%d"), file->lFileSize/1024%1024);
+ mb.Printf(wxT(" %ld"), file->lFileSize/1024/1024);
+ kb.Printf(wxT(".%03ld"), file->lFileSize/1024%1024);
output = output.SubString(0, nr_max + name_max + mb_max - mb.Length() ).Append(mb).Append(kb);
printf("%s %ld\n",(const char*)unicode2char(output), file->lSourceCount );
}