github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-29 21:43:55 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'fish-shell:master' into master

Browse Source
This commit is contained in:
Aaron Gyes 2021-11-06 20:03:06 -07:00 committed by GitHub
commit 64219a39a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/builtin_math.cpp
View File

@ -188,10 +188,10 @@ static const wchar_t *math_describe_error(const te_error_t &error) {
static wcstring format_double(double v, const math_cmd_opts_t &opts) { static wcstring format_double(double v, const math_cmd_opts_t &opts) {
if (opts.base == 16) { if (opts.base == 16) {
v = trunc(v); v = trunc(v);
return format_string(L"0x%x", (long)v); return format_string(L"0x%x", (unsigned int)v);
} else if (opts.base == 8) { } else if (opts.base == 8) {
v = trunc(v); v = trunc(v);
return format_string(L"0%o", (long)v); return format_string(L"0%o", (unsigned int)v);
} }
// As a special-case, a scale of 0 means to truncate to an integer // As a special-case, a scale of 0 means to truncate to an integer

7
src/builtin_status.cpp
View File

@ -147,10 +147,9 @@ static bool set_status_cmd(const wchar_t *cmd, status_cmd_opts_t &opts, status_c
/// Print the features and their values. /// Print the features and their values.
static void print_features(io_streams_t &streams) { static void print_features(io_streams_t &streams) {
size_t max_len = std::numeric_limits<size_t>::min(); auto max_len = std::numeric_limits<int>::min();
for (const auto &md : features_t::metadata) { for (const auto &md : features_t::metadata)
max_len = std::max(max_len, wcslen(md.name)); max_len = std::max(max_len, static_cast<int>(wcslen(md.name)));
}
for (const auto &md : features_t::metadata) { for (const auto &md : features_t::metadata) {
int set = feature_test(md.flag); int set = feature_test(md.flag);
streams.out.append_format(L"%-*ls%-3s %ls %ls\n", max_len + 1, md.name, set ? "on" : "off", streams.out.append_format(L"%-*ls%-3s %ls %ls\n", max_len + 1, md.name, set ? "on" : "off",

2
src/builtin_string.cpp
View File

@ -911,7 +911,7 @@ struct compiled_regex_t : noncopyable_t {
string_error(streams, _(L"%ls: Regular expression compile error: %ls\n"), argv0, string_error(streams, _(L"%ls: Regular expression compile error: %ls\n"), argv0,
pcre2_strerror(err_code).c_str()); pcre2_strerror(err_code).c_str());
string_error(streams, L"%ls: %ls\n", argv0, pattern.c_str()); string_error(streams, L"%ls: %ls\n", argv0, pattern.c_str());
string_error(streams, L"%ls: %*ls\n", argv0, err_offset, L"^"); string_error(streams, L"%ls: %*ls\n", argv0, static_cast<int>(err_offset), L"^");
return; return;
} }

4
src/builtin_ulimit.cpp
View File

@ -72,7 +72,7 @@ static void print(int resource, int hard, io_streams_t &streams) {
if (l == RLIM_INFINITY) if (l == RLIM_INFINITY)
streams.out.append(L"unlimited\n"); streams.out.append(L"unlimited\n");
else else
streams.out.append_format(L"%d\n", l / get_multiplier(resource)); streams.out.append_format(L"%lu\n", l / get_multiplier(resource));
} }
/// Print values of all resource limits. /// Print values of all resource limits.
@ -101,7 +101,7 @@ static void print_all(int hard, io_streams_t &streams) {
if (l == RLIM_INFINITY) { if (l == RLIM_INFINITY) {
streams.out.append(L"unlimited\n"); streams.out.append(L"unlimited\n");
} else { } else {
streams.out.append_format(L"%d\n", l / get_multiplier(resource_arr[i].resource)); streams.out.append_format(L"%lu\n", l / get_multiplier(resource_arr[i].resource));
} }
} }
} }