Skip to content

uniq: remove write_line_terminator macro #13632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cakebaker wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −12
Open

uniq: remove write_line_terminator macro #13632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions src/uu/uniq/src/uniq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ struct LineMeta {
key_end: usize,
}

macro_rules! write_line_terminator {
($writer:expr, $line_terminator:expr) => {
$writer
.write_all(&[$line_terminator])
.map_err_context(|| translate!("uniq-error-write-line-terminator"))
};
}

impl Uniq {
pub fn write_uniq(&self, mut reader: impl BufRead, mut writer: impl Write) -> UResult<()> {
let mut first_line_printed = false;
Expand Down Expand Up @@ -144,7 +136,9 @@ impl Uniq {
if (self.delimiters == Delimiters::Append || self.delimiters == Delimiters::Both)
&& first_line_printed
{
write_line_terminator!(writer, line_terminator)?;
writer
.write_all(&[line_terminator])
.map_err_context(|| translate!("uniq-error-write-line-terminator"))?;
}
writer
.flush()
Expand Down Expand Up @@ -291,12 +285,12 @@ impl Uniq {
) -> UResult<()> {
let line_terminator = self.get_line_terminator();

line_out.clear();

if self.should_print_delimiter(count, first_line_printed) {
write_line_terminator!(writer, line_terminator)?;
line_out.push(line_terminator);
}

line_out.clear();

if self.show_counts {
let mut count_buf = [0u8; Self::COUNT_PREFIX_BUF_SIZE];
let prefix = Self::build_count_prefix(count, &mut count_buf);
Expand Down
Loading