From: Michal Čihař <nijel@debian.org>
Subject: Printing of size_t type should use %zd.
--- a/src/libwrapper.cpp
+++ b/src/libwrapper.cpp
@@ -337,13 +337,13 @@
}//if (!force)
if (!show_all_results && !force) {
- printf(_("Found %d items, similar to %s.\n"), res_list.size(),
+ printf(_("Found %zd items, similar to %s.\n"), res_list.size(),
utf8_output ? str : utf8_to_locale_ign_err(str).c_str());
for (size_t i=0; i<res_list.size(); ++i) {
string loc_bookname, loc_def;
loc_bookname=utf8_to_locale_ign_err(res_list[i].bookname);
loc_def=utf8_to_locale_ign_err(res_list[i].def);
- printf("%d)%s-->%s\n", i,
+ printf("%zd)%s-->%s\n", i,
utf8_output ? res_list[i].bookname.c_str() : loc_bookname.c_str(),
utf8_output ? res_list[i].def.c_str() : loc_def.c_str());
}
@@ -364,12 +364,12 @@
} else if (choise==-1)
break;
else
- printf(_("Invalid choice.\nIt must be from 0 to %d or -1.\n"),
+ printf(_("Invalid choice.\nIt must be from 0 to %zd or -1.\n"),
res_list.size()-1);
}
} else {
sdcv_pager pager(force);
- fprintf(pager.get_stream(), _("Found %d items, similar to %s.\n"),
+ fprintf(pager.get_stream(), _("Found %zd items, similar to %s.\n"),
res_list.size(), utf8_output ? str : utf8_to_locale_ign_err(str).c_str());
for (PSearchResult ptr=res_list.begin(); ptr!=res_list.end(); ++ptr)
print_search_result(pager.get_stream(), *ptr);
|
