h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-05 00:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

printf: rename direc -> directive

Browse Source 
The abbreviation is ambiguous, which makes the code unnecessarily hard
to read. (possible misleading expansions: direct, direction, director,
...)

Part of #11858
This commit is contained in:
Daniel Rainer
2025-10-02 01:27:44 +02:00
committed by Johannes Altmanninger
parent 6b66c2bc1d
commit 77fee9acb9
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/builtins/printf.rs
View File

@@ -252,7 +252,7 @@ fn handle_sprintf_error(&mut self, err: fish_printf::Error) {
/// `field_width` and `precision` are the field width and precision for '*' values, if any.
/// `argument` is the argument to be formatted.
#[allow(clippy::collapsible_else_if, clippy::too_many_arguments)]
fn print_direc(
fn print_directive(
&mut self,
spec: &wstr,
conversion: char,
@@ -407,8 +407,8 @@ fn print_formatted(&mut self, format: &wstr, mut argv: &[&wstr]) -> usize {
let mut argc = argv.len();
let save_argc = argc; /* Preserve original value. */
let mut f: &wstr; /* Pointer into `format'. */
let mut direc_start: &wstr; /* Start of % directive. */
let mut direc_length: usize; /* Length of % directive. */
let mut directive_start: &wstr; /* Start of % directive. */
let mut directive_length: usize; /* Length of % directive. */
let mut field_width: Option<i64>; /* Arg to first '*'. */
let mut precision: Option<i64>; /* Arg to second '*'. */
let mut ok = [false; 256]; /* ok['x'] is true if %x is allowed. */
@@ -429,9 +429,9 @@ fn print_formatted(&mut self, format: &wstr, mut argv: &[&wstr]) -> usize {
match f.char_at(0) {
'%' => {
direc_start = f;
directive_start = f;
f = &f[1..];
direc_length = 1;
directive_length = 1;
field_width = None;
precision = None;
if f.char_at(0) == '%' {
@@ -475,13 +475,13 @@ fn print_formatted(&mut self, format: &wstr, mut argv: &[&wstr]) -> usize {
}
if continue_looking_for_flags {
f = &f[1..];
direc_length += 1;
directive_length += 1;
}
}
if f.char_at(0) == '*' {
f = &f[1..];
direc_length += 1;
directive_length += 1;
if argc > 0 {
let width: i64 = string_to_scalar_type(argv[0], self);
if (c_int::MIN as i64) <= width && width <= (c_int::MAX as i64) {
@@ -500,17 +500,17 @@ fn print_formatted(&mut self, format: &wstr, mut argv: &[&wstr]) -> usize {
} else {
while iswdigit(f.char_at(0)) {
f = &f[1..];
direc_length += 1;
directive_length += 1;
}
}
if f.char_at(0) == '.' {
f = &f[1..];
direc_length += 1;
directive_length += 1;
modify_allowed_format_specifiers(&mut ok, "c", false);
if f.char_at(0) == '*' {
f = &f[1..];
direc_length += 1;
directive_length += 1;
if argc > 0 {
let prec: i64 = string_to_scalar_type(argv[0], self);
if prec < 0 {
@@ -533,7 +533,7 @@ fn print_formatted(&mut self, format: &wstr, mut argv: &[&wstr]) -> usize {
} else {
while iswdigit(f.char_at(0)) {
f = &f[1..];
direc_length += 1;
directive_length += 1;
}
}
}
@@ -546,8 +546,8 @@ fn print_formatted(&mut self, format: &wstr, mut argv: &[&wstr]) -> usize {
if (conversion as usize) > 0xFF || !ok[conversion as usize] {
self.fatal_error(wgettext_fmt!(
"%.*ls: invalid conversion specification",
wstr_offset_in(f, direc_start) + 1,
direc_start
wstr_offset_in(f, directive_start) + 1,
directive_start
));
return 0;
}
@@ -558,8 +558,8 @@ fn print_formatted(&mut self, format: &wstr, mut argv: &[&wstr]) -> usize {
argv = &argv[1..];
argc -= 1;
}
self.print_direc(
&direc_start[..direc_length],
self.print_directive(
&directive_start[..directive_length],
f.char_at(0),
field_width,
precision,