github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-21 15:03:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't use printf("%d") just to convert an int to a string.

Browse Source 
std::to_string, std::to_wstring are more appropriate
This commit is contained in:
Aaron Gyes 2019-02-18 23:12:03 -08:00
parent 59cb2d02a8
commit c2bc0c67f2
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common.cpp
View File

@ -1796,16 +1796,13 @@ static void validate_new_termsize(struct winsize *new_termsize, const environmen
/// Export the new terminal size as env vars and to the kernel if possible.
static void export_new_termsize(struct winsize *new_termsize, env_stack_t &vars) {
wchar_t buf[64];
auto cols = vars.get(L"COLUMNS", ENV_EXPORT);
swprintf(buf, 64, L"%d", (int)new_termsize->ws_col);
vars.set_one(L"COLUMNS", ENV_GLOBAL | (cols.missing_or_empty() ? ENV_DEFAULT : ENV_EXPORT),
buf);
std::to_wstring(int(new_termsize->ws_col)));
auto lines = vars.get(L"LINES", ENV_EXPORT);
swprintf(buf, 64, L"%d", (int)new_termsize->ws_row);
vars.set_one(L"LINES", ENV_GLOBAL | (lines.missing_or_empty() ? ENV_DEFAULT : ENV_EXPORT), buf);
vars.set_one(L"LINES", ENV_GLOBAL | (lines.missing_or_empty() ? ENV_DEFAULT : ENV_EXPORT),
std::to_wstring(int(new_termsize->ws_row)));
#ifdef HAVE_WINSIZE
// Only write the new terminal size if we are in the foreground (#4477)

2
src/fish_tests.cpp
View File

@ -1545,7 +1545,7 @@ static void test_lru() {
auto commajoin = [](const std::vector<int> &vs) {
wcstring ret;
for (int v : vs) {
append_format(ret, L"%d,", v);
ret.append(std::to_wstring(v));
}
if (!ret.empty()) ret.pop_back();
return ret;

4
src/reader.cpp
View File

@ -2013,15 +2013,13 @@ bool reader_get_selection(size_t *start, size_t *len) {
void set_env_cmd_duration(struct timeval *after, struct timeval *before, env_stack_t &vars) {
time_t secs = after->tv_sec - before->tv_sec;
suseconds_t usecs = after->tv_usec - before->tv_usec;
wchar_t buf[16];
if (after->tv_usec < before->tv_usec) {
usecs += 1000000;
secs -= 1;
}
swprintf(buf, 16, L"%d", (secs * 1000) + (usecs / 1000));
vars.set_one(ENV_CMD_DURATION, ENV_UNEXPORT, buf);
vars.set_one(ENV_CMD_DURATION, ENV_UNEXPORT, std::to_wstring((secs * 1000) + (usecs / 1000)));
}
void reader_run_command(parser_t &parser, const wcstring &cmd) {